SOURCES: genres-itvp.patch (NEW), genres-mozilla-config.patch (NEW...

[qboosh]

Author: qboosh                       Date: Fri Apr 27 10:38:36 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- from Andrzej Hajda

---- Files affected:
SOURCES:
   genres-itvp.patch (NONE -> 1.1)  (NEW), genres-mozilla-config.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/genres-itvp.patch
diff -u /dev/null SOURCES/genres-itvp.patch:1.1
--- /dev/null	Fri Apr 27 12:38:36 2007
+++ SOURCES/genres-itvp.patch	Fri Apr 27 12:38:31 2007
@@ -0,0 +1,35 @@
+diff -ur genres-0.9.2/doc/genres.conf genres-0.9.2-ah/doc/genres.conf
+--- genres-0.9.2/doc/genres.conf	2006-05-13 21:49:44.000000000 +0200
++++ genres-0.9.2-ah/doc/genres.conf	2006-06-24 01:39:15.000000000 +0200
+@@ -1,6 +1,6 @@
+ #common configuration file for GenRes plugin
+ #put it to ~/.mozilla/genres or /etc
+ 
+-mozillastreams=1 # use mozilla streams (and cache), 0 - not use
++mozillastreams=0 # use mozilla streams (and cache), 0 - not use
+ debuglevel=10    # full debug output, 0 - quiet
+ background=-1	 # 0 - black, 1 - white, -1 - mozilla default
+diff -ur genres-0.9.2/slaves/video/mplayer.pl genres-0.9.2-ah/slaves/video/mplayer.pl
+--- genres-0.9.2/slaves/video/mplayer.pl	2006-05-13 22:57:46.000000000 +0200
++++ genres-0.9.2-ah/slaves/video/mplayer.pl	2006-06-24 01:38:58.000000000 +0200
+@@ -30,8 +30,8 @@
+ ## Parameters from the config file ##
+ $conffile="$ENV{HOME}/.mozilla/genres/mplayer.conf";
+ %cfg=(
+-  vo=>[x11, 'text', "Video output driver (see mplayer -vo help)"],
+-  ao=>["esd,arts,oss,alsa", 'text', "Audio output driver (see mplayer -ao help)"],
++  vo=>["xv,x11", 'text', "Video output driver (see mplayer -vo help)"],
++  ao=>["alsa,esd,arts,oss,null", 'text', "Audio output driver (see mplayer -ao help)"],
+   not_ask=> [0, 'checkbox', "Never show file save dialog again."],
+   out_file=>['%@-%Y-%m-%d_%H-%M-%S.avi', 'file', "Write video to file(s)",
+      "%@  in the filename will be replaced to source URL\n"
+@@ -371,7 +371,8 @@
+ 		$sl2p=open(SL2W,$cmd2);
+ 	    } else {
+ 		$OPTS.=" -ao $cfg{ao}[0]" if $cfg{ao}[0];
+-		$cmd="mplayer $OPTS -vo $cfg{vo}[0] -zoom -nojoystick -slave -nomouseinput -cookies '$href'";
++		my $pls = ($href =~ /asx$/) ? "-playlist" : "";
++		$cmd="mplayer $OPTS -vo $cfg{vo}[0] -zoom -nojoystick -slave -nomouseinput -cookies $pls '$href'";
+ 	        print "cmd=$cmd\n";
+ 	        runslv $cmd;
+ 	    }

================================================================
Index: SOURCES/genres-mozilla-config.patch
diff -u /dev/null SOURCES/genres-mozilla-config.patch:1.1
--- /dev/null	Fri Apr 27 12:38:36 2007
+++ SOURCES/genres-mozilla-config.patch	Fri Apr 27 12:38:31 2007
@@ -0,0 +1,24 @@
+diff -ur genres-0.9.2/Makefile genres-0.9.2-patch/Makefile
+--- genres-0.9.2/Makefile	2006-04-24 22:00:20.000000000 +0200
++++ genres-0.9.2-patch/Makefile	2006-06-22 23:09:14.000000000 +0200
+@@ -39,7 +39,7 @@
+ #
+ RELEASE=$(shell awk -F '[()]' '/\(.*\)/ { print $$2; exit; }' <debian/changelog)
+ PATH:=${PATH}:/usr/local/mozilla/bin:/usr/lib/mozilla/bin:/opt/mozilla/bin
+-CFLAGS= -Wall -Os -DXP_UNIX -DMOZ_X11 -DXTHREADS ` mozilla-config --cflags xpcom` -fPIC -DRELEASE="\"${RELEASE}\""
++CFLAGS= -Wall -Os -DXP_UNIX -DMOZ_X11 -DXTHREADS -I/usr/include/mozilla-firefox/plugin -I/usr/include/nspr -I/usr/include/mozilla-firefox/java -I/usr/include/mozilla-firefox/xpcom -fPIC -DRELEASE="\"${RELEASE}\""
+ OBJ=main_thread.o observer_thread.o threadqueue.o slavesdir.o storage.o settings.o
+ INSTALL=install -Dp -g root -o root
+ LIBPREFIX=$(DESTDIR)/usr/lib
+diff -ur genres-0.9.2/threadqueue.cpp genres-0.9.2-patch/threadqueue.cpp
+--- genres-0.9.2/threadqueue.cpp	2006-03-22 22:02:09.000000000 +0100
++++ genres-0.9.2-patch/threadqueue.cpp	2006-06-22 23:13:32.000000000 +0200
+@@ -18,7 +18,7 @@
+ //    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ 
+ #include "nsCOMPtr.h"
+-#include "nsIServiceManagerUtils.h"
++#include "nsServiceManagerUtils.h"
+ #include "nsIEventQueueService.h"
+ #include "nsIEventQueue.h"
+ #include <stdio.h>
================================================================