Author: rathann Update of /cvs/free/rpms/mplayer/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv18529 Modified Files: mplayer-config.patch mplayer-manlinks.patch mplayer-nodvdcss.patch mplayer-qcelp.patch Removed Files: mplayer-cflags.patch Log Message: Forgot to update patches. mplayer-config.patch: Index: mplayer-config.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/F-11/mplayer-config.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mplayer-config.patch 19 Aug 2008 12:32:35 -0000 1.2 +++ mplayer-config.patch 15 Nov 2009 21:17:13 -0000 1.3 @@ -1,6 +1,6 @@ -diff -up mplayer-export-2008-08-18/etc/example.conf.orig mplayer-export-2008-08-18/etc/example.conf ---- mplayer-export-2008-08-18/etc/example.conf.orig 2008-02-08 19:33:39.000000000 +0100 -+++ mplayer-export-2008-08-18/etc/example.conf 2008-08-19 13:47:15.000000000 +0200 +diff -up mplayer-export-2009-10-29/etc/example.conf.config mplayer-export-2009-10-29/etc/example.conf +--- mplayer-export-2009-10-29/etc/example.conf.config 2008-02-08 19:33:39.000000000 +0100 ++++ mplayer-export-2009-10-29/etc/example.conf 2009-10-29 23:54:30.000000000 +0100 @@ -1,7 +1,7 @@ # # MPlayer configuration file @@ -44,13 +44,16 @@ # cache settings # # Use 8MB input cache by default. -@@ -122,6 +131,9 @@ +@@ -122,6 +131,12 @@ # DVD: Play English audio tracks if available. #alang = en +# A plugged in joystick can interfere with keyboard shortcuts +joystick = no + ++# Inhibit (a XScrnSaver compatible) screensaver while playing a movie ++stop-xscreensaver = yes ++ ################### # DVDNAV Settings # ################### mplayer-manlinks.patch: Index: mplayer-manlinks.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/F-11/mplayer-manlinks.patch,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- mplayer-manlinks.patch 19 Aug 2008 12:32:35 -0000 1.2 +++ mplayer-manlinks.patch 15 Nov 2009 21:17:13 -0000 1.3 @@ -1,16 +1,26 @@ -diff -up mplayer-export-2008-08-18/Makefile.manlinks mplayer-export-2008-08-18/Makefile ---- mplayer-export-2008-08-18/Makefile.manlinks 2008-08-14 22:42:54.000000000 +0200 -+++ mplayer-export-2008-08-18/Makefile 2008-08-19 13:50:17.000000000 +0200 -@@ -830,7 +830,7 @@ install-mencoder-man: $(foreach lang,$(M +diff -up mplayer-export-2009-10-29/Makefile.manlinks mplayer-export-2009-10-29/Makefile +--- mplayer-export-2009-10-29/Makefile.manlinks 2009-10-19 11:56:18.000000000 +0200 ++++ mplayer-export-2009-10-29/Makefile 2009-10-30 00:42:36.000000000 +0100 +@@ -922,10 +922,10 @@ install-mencoder-man: $(foreach lang,$(M install-mplayer-man: $(foreach lang,$(MAN_LANGS),install-mplayer-man-$(lang)) + install-gui-man-en: install-mplayer-man-en +- cd $(MANDIR)/man1/ && ln -sf mplayer.1 gmplayer.1 ++ echo ".so mplayer.1" > $(MANDIR)/man1/gmplayer.1 + install-mencoder-man-en: install-mplayer-man-en - cd $(MANDIR)/man1 && ln -sf mplayer.1 mencoder.1 + echo ".so mplayer.1" > $(MANDIR)/man1/mencoder.1 install-mplayer-man-en: $(INSTALL) -d $(MANDIR)/man1 -@@ -838,7 +838,7 @@ install-mplayer-man-en: +@@ -933,12 +933,12 @@ install-mplayer-man-en: + + define GUI_MAN_RULE + install-gui-man-$(lang): install-mplayer-man-$(lang) +- cd $(MANDIR)/$(lang)/man1/ && ln -sf mplayer.1 gmplayer.1 ++ echo ".so mplayer.1" > $(MANDIR)/$(lang)/man1/gmplayer.1 + endef define MENCODER_MAN_RULE install-mencoder-man-$(lang): install-mplayer-man-$(lang) mplayer-nodvdcss.patch: Index: mplayer-nodvdcss.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/F-11/mplayer-nodvdcss.patch,v retrieving revision 1.5 retrieving revision 1.6 diff -u -r1.5 -r1.6 --- mplayer-nodvdcss.patch 31 Mar 2009 17:37:39 -0000 1.5 +++ mplayer-nodvdcss.patch 15 Nov 2009 21:17:13 -0000 1.6 @@ -1,7 +1,7 @@ -diff -up mplayer-export-2009-03-29/configure.nodvdcss mplayer-export-2009-03-29/configure ---- mplayer-export-2009-03-29/configure.nodvdcss 2009-03-29 00:21:21.000000000 +0100 -+++ mplayer-export-2009-03-29/configure 2009-03-29 11:20:11.000000000 +0200 -@@ -622,7 +622,7 @@ _dvdnavconfig=dvdnav-config +diff -up mplayer-export-2009-10-29/configure.nodvdcss mplayer-export-2009-10-29/configure +--- mplayer-export-2009-10-29/configure.nodvdcss 2009-10-28 14:55:18.000000000 +0100 ++++ mplayer-export-2009-10-29/configure 2009-10-30 00:36:25.000000000 +0100 +@@ -639,7 +639,7 @@ _dvdnavconfig=dvdnav-config _dvdreadconfig=dvdread-config _dvdread=auto _dvdread_internal=auto @@ -10,10 +10,10 @@ _xanim=auto _real=auto _live=auto -diff -up mplayer-export-2009-03-29/Makefile.nodvdcss mplayer-export-2009-03-29/Makefile ---- mplayer-export-2009-03-29/Makefile.nodvdcss 2009-03-29 11:20:11.000000000 +0200 -+++ mplayer-export-2009-03-29/Makefile 2009-03-29 11:20:55.000000000 +0200 -@@ -345,11 +345,6 @@ SRCS_COMMON-$(LIBDCA) += +diff -up mplayer-export-2009-10-29/Makefile.nodvdcss mplayer-export-2009-10-29/Makefile +--- mplayer-export-2009-10-29/Makefile.nodvdcss 2009-10-19 11:56:18.000000000 +0200 ++++ mplayer-export-2009-10-29/Makefile 2009-10-30 00:37:10.000000000 +0100 +@@ -150,11 +150,6 @@ SRCS_COMMON-$(LIBDCA) += SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ libmpcodecs/vd_libdv.c \ libmpdemux/demux_rawdv.c @@ -24,20 +24,20 @@ - libdvdcss/libdvdcss.c \ SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c - SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \ -@@ -745,7 +740,6 @@ DIRS = . \ - libavcodec/x86 \ - libavformat \ - libavutil \ + +@@ -752,7 +747,6 @@ DIRS = . \ + libavutil/ppc \ + libavutil/sh4 \ + libavutil/x86 \ - libdvdcss \ libdvdnav \ libdvdnav/vm \ libdvdread4 \ -@@ -852,7 +846,6 @@ version.h: version.sh - # Make sure all generated header files are created. - $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): codecs.conf.h help_mp.h version.h +@@ -871,7 +865,6 @@ codec-cfg.d codec-cfg.o: codecs.conf.h + $(DEPS) $(MENCODER_DEPS) $(MPLAYER_DEPS): help_mp.h + $(call ADDSUFFIXES,.d .o,mpcommon vobsub stream/stream_cddb stream/network libmpdemux/muxer_avi gui/win32/gui): version.h --libdvdcss/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) - libdvdnav/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" - libdvdnav/% stream/stream_dvdnav%: CFLAGS += $(CFLAGS_LIBDVDNAV) - libdvdread4/%: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD) +-libdvdcss/%: CFLAGS := -Ilibdvdcss -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.10\" $(CFLAGS_LIBDVDCSS) $(CFLAGS) + libdvdnav/%: CFLAGS := -Ilibdvdnav -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" $(CFLAGS) + libdvdread4/%: CFLAGS := -Ilibdvdread4 -D__USE_UNIX98 -D_GNU_SOURCE $(CFLAGS_LIBDVDCSS_DVDREAD) $(CFLAGS) + libfaad2/%: CFLAGS := -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) $(CFLAGS) mplayer-qcelp.patch: Index: mplayer-qcelp.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/F-11/mplayer-qcelp.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- mplayer-qcelp.patch 9 Aug 2008 09:32:32 -0000 1.1 +++ mplayer-qcelp.patch 15 Nov 2009 21:17:13 -0000 1.2 @@ -1,8 +1,8 @@ -diff -up mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c.qclp mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c ---- mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c.qclp 2008-01-13 17:00:39.000000000 +0100 -+++ mplayer-export-2008-02-11/libmpdemux/demux_nemesi.c 2008-02-22 21:19:57.000000000 +0100 -@@ -40,6 +40,7 @@ MIMEto4CC supported_audio[NMS_MAX_FORMAT - {"MPA", 0x55}, +diff -up mplayer-export-2009-10-29/libmpdemux/demux_nemesi.c.qcelp mplayer-export-2009-10-29/libmpdemux/demux_nemesi.c +--- mplayer-export-2009-10-29/libmpdemux/demux_nemesi.c.qcelp 2009-05-13 04:58:57.000000000 +0200 ++++ mplayer-export-2009-10-29/libmpdemux/demux_nemesi.c 2009-10-30 00:36:02.000000000 +0100 +@@ -42,6 +42,7 @@ MIMEto4CC supported_audio[NMS_MAX_FORMAT + {"MPA", 0x55}, {"vorbis", mmioFOURCC('v','r','b','s')}, {"mpeg4-generic", mmioFOURCC('M','P','4','A')}, + {"x-Purevoice", mmioFOURCC('Q','c','l','p')}, --- mplayer-cflags.patch DELETED ---