Author: rathann Update of /cvs/free/rpms/mplayer/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv1782 Modified Files: .cvsignore mplayer-nodvdcss.patch mplayer.spec sources Added Files: mplayer-htmldocs.patch Log Message: * Thu Mar 19 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.107.20091319svn - 20090319 snapshot - fix HTML docs generation mplayer-htmldocs.patch: --- NEW FILE mplayer-htmldocs.patch --- diff -up mplayer-export-2009-03-19/DOCS/xml/configure.htmldocs mplayer-export-2009-03-19/DOCS/xml/configure --- mplayer-export-2009-03-19/DOCS/xml/configure.htmldocs 2009-03-17 12:47:27.000000000 +0100 +++ mplayer-export-2009-03-19/DOCS/xml/configure 2009-03-19 21:48:30.000000000 +0100 @@ -187,7 +187,7 @@ then then echo "Found xsltproc. If it works, it's probably the best choice." # HACK: xslt always need a target file if a doctype is set - _xsltcommand="OUTPUT=\"\$1\"; if test -d \"\$OUTPUT\" ; then OUTPUT=\"$OUTPUT/dummy.html\" ; fi;" + _xsltcommand="OUTPUT=\"\$1\"; if test -d \"\$OUTPUT\" ; then OUTPUT=\"\$OUTPUT/dummy.html\" ; fi;" if test -n "$_catalog" then _xsltcommand="$_xsltcommand xsltproc --catalogs -o \$OUTPUT \$2 \$3" Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 11 Feb 2009 17:46:38 -0000 1.10 +++ .cvsignore 19 Mar 2009 21:29:11 -0000 1.11 @@ -1,2 +1,2 @@ Blue-1.7.tar.bz2 -mplayer-export-2009-02-04.tar.bz2 +mplayer-export-2009-03-19.tar.bz2 mplayer-nodvdcss.patch: Index: mplayer-nodvdcss.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer-nodvdcss.patch,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- mplayer-nodvdcss.patch 11 Feb 2009 17:46:38 -0000 1.3 +++ mplayer-nodvdcss.patch 19 Mar 2009 21:29:11 -0000 1.4 @@ -1,7 +1,7 @@ -diff -up mplayer-export-2009-02-02/configure.nodvdcss mplayer-export-2009-02-02/configure ---- mplayer-export-2009-02-02/configure.nodvdcss 2009-02-02 01:15:29.000000000 +0100 -+++ mplayer-export-2009-02-02/configure 2009-02-02 01:15:29.000000000 +0100 -@@ -617,7 +617,7 @@ _dvdnavconfig=dvdnav-config +diff -up mplayer-export-2009-03-19/configure.nodvdcss mplayer-export-2009-03-19/configure +--- mplayer-export-2009-03-19/configure.nodvdcss 2009-03-18 22:48:35.000000000 +0100 ++++ mplayer-export-2009-03-19/configure 2009-03-19 00:16:32.000000000 +0100 +@@ -623,7 +623,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-02-02/Makefile.nodvdcss mplayer-export-2009-02-02/Makefile ---- mplayer-export-2009-02-02/Makefile.nodvdcss 2009-02-02 01:15:29.000000000 +0100 -+++ mplayer-export-2009-02-02/Makefile 2009-02-02 01:15:56.000000000 +0100 -@@ -347,11 +347,6 @@ SRCS_COMMON-$(LIBDCA) += +diff -up mplayer-export-2009-03-19/Makefile.nodvdcss mplayer-export-2009-03-19/Makefile +--- mplayer-export-2009-03-19/Makefile.nodvdcss 2009-03-19 00:16:32.000000000 +0100 ++++ mplayer-export-2009-03-19/Makefile 2009-03-19 00:17:04.000000000 +0100 +@@ -345,11 +345,6 @@ SRCS_COMMON-$(LIBDCA) += SRCS_COMMON-$(LIBDV) += libmpcodecs/ad_libdv.c \ libmpcodecs/vd_libdv.c \ libmpdemux/demux_rawdv.c @@ -25,7 +25,7 @@ SRCS_COMMON-$(LIBMAD) += libmpcodecs/ad_libmad.c SRCS_COMMON-$(LIBMPEG2) += libmpcodecs/vd_libmpeg2.c \ -@@ -743,7 +738,6 @@ DIRS = . \ +@@ -745,7 +740,6 @@ DIRS = . \ libavcodec/x86 \ libavformat \ libavutil \ @@ -33,11 +33,11 @@ libdvdnav \ libdvdnav/vm \ libdvdread4 \ -@@ -851,7 +845,6 @@ codec-cfg.d: codecs.conf.h - mpcommon.d vobsub.d gui/win32/gui.d libmpdemux/muxer_avi.d osdep/mplayer-rc.o stream/network.d stream/stream_cddb.d: version.h - $(DEPS): help_mp.h +@@ -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 --libdvdcss/%.o libdvdcss/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DVERSION=\"1.2.9\" $(CFLAGS_LIBDVDCSS) - libdvdnav/%.o libdvdnav/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H -DVERSION=\"MPlayer-custom\" - libdvdread4/%.o libdvdread4/%.d: CFLAGS += -D__USE_UNIX98 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_LIBDVDCSS_DVDREAD) - libfaad2/%.o libfaad2/%.d: CFLAGS += -Ilibfaad2 -D_GNU_SOURCE -DHAVE_CONFIG_H $(CFLAGS_FAAD_FIXED) +-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) Index: mplayer.spec =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- mplayer.spec 13 Feb 2009 19:05:48 -0000 1.18 +++ mplayer.spec 19 Mar 2009 21:29:11 -0000 1.19 @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20090204svn +%define pre 20090319svn %define svn 1 -%define svnbuild 2009-02-04 +%define svnbuild 2009-03-19 %define faad2min 1:2.6.1 Name: mplayer Version: 1.0 -Release: 0.106.%{pre}%{?dist} +Release: 0.107.%{pre}%{?dist} Summary: Movie player playing most video formats and DVDs Group: Applications/Multimedia @@ -20,7 +20,7 @@ %endif Source1: http://www.mplayerhq.hu/MPlayer/skins/Blue-1.7.tar.bz2 Source10: mplayer-snapshot.sh -Patch1: %{name}-ppc-compile.patch +Patch1: %{name}-htmldocs.patch Patch2: %{name}-config.patch Patch5: %{name}-x86_32-compile.patch Patch8: %{name}-manlinks.patch @@ -190,7 +190,7 @@ %else %setup -q -n MPlayer-%{version}%{pre} %endif -%patch1 -p1 -b .ppc-compile +%patch1 -p1 -b .htmldocs %patch2 -p1 -b .config %patch5 -p1 -b .compile %patch8 -p1 -b .manlinks @@ -341,6 +341,10 @@ %changelog +* Thu Mar 19 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.107.20091319svn +- 20090319 snapshot +- fix HTML docs generation + * Wed Feb 04 2009 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.106.20090204svn - 20090204 snapshot - dropped obsolete patch Index: sources =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/sources,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- sources 11 Feb 2009 17:46:38 -0000 1.11 +++ sources 19 Mar 2009 21:29:11 -0000 1.12 @@ -1,2 +1,2 @@ e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 -de38e1fcf6eb4666d80b3db0561de7b0 mplayer-export-2009-02-04.tar.bz2 +76d04b3854c6af71af4f609c049933dc mplayer-export-2009-03-19.tar.bz2