Author: rathann Update of /cvs/free/rpms/mplayer/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv32231 Modified Files: .cvsignore mplayer-nodvdcss.patch mplayer.spec sources Removed Files: mplayer-libgif.patch Log Message: * Thu Apr 29 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.116.20100429svn - 20100429 snapshot - drop unnecessary patches Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v retrieving revision 1.18 retrieving revision 1.19 diff -u -r1.18 -r1.19 --- .cvsignore 29 Apr 2010 21:56:52 -0000 1.18 +++ .cvsignore 3 Jul 2010 17:06:10 -0000 1.19 @@ -1,2 +1,3 @@ Blue-1.7.tar.bz2 mplayer-export-2010-04-29.tar.bz2 +mplayer-export-2010-07-03.tar.bz2 mplayer-nodvdcss.patch: Makefile | 7 ------- configure | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) Index: mplayer-nodvdcss.patch =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer-nodvdcss.patch,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- mplayer-nodvdcss.patch 25 Apr 2010 19:27:43 -0000 1.7 +++ mplayer-nodvdcss.patch 3 Jul 2010 17:06:10 -0000 1.8 @@ -1,7 +1,7 @@ -diff -up mplayer-export-2010-03-27/configure.nodvdcss mplayer-export-2010-03-27/configure ---- mplayer-export-2010-03-27/configure.nodvdcss 2010-03-25 20:53:05.000000000 +0100 -+++ mplayer-export-2010-03-27/configure 2010-03-27 22:54:31.000000000 +0100 -@@ -648,7 +648,7 @@ _dvdnavconfig=dvdnav-config +diff -up mplayer-export-2010-07-03/configure.nodvdcss mplayer-export-2010-07-03/configure +--- mplayer-export-2010-07-03/configure.nodvdcss 2010-07-02 18:52:32.000000000 +0200 ++++ mplayer-export-2010-07-03/configure 2010-07-03 18:00:01.000000000 +0200 +@@ -677,7 +677,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-2010-03-27/Makefile.nodvdcss mplayer-export-2010-03-27/Makefile ---- mplayer-export-2010-03-27/Makefile.nodvdcss 2010-03-27 22:54:31.000000000 +0100 -+++ mplayer-export-2010-03-27/Makefile 2010-03-27 22:55:40.000000000 +0100 -@@ -158,11 +158,6 @@ SRCS_COMMON-$(LIBDCA) += +diff -up mplayer-export-2010-07-03/Makefile.nodvdcss mplayer-export-2010-07-03/Makefile +--- mplayer-export-2010-07-03/Makefile.nodvdcss 2010-07-03 18:00:01.000000000 +0200 ++++ mplayer-export-2010-07-03/Makefile 2010-07-03 18:00:26.000000000 +0200 +@@ -146,11 +146,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 -@@ -778,7 +773,6 @@ DIRS = . \ +@@ -764,7 +759,6 @@ DIRS = . \ libavutil/sh4 \ libavutil/tomi \ libavutil/x86 \ @@ -33,9 +33,9 @@ libdvdnav \ libdvdnav/vm \ libdvdread4 \ -@@ -907,7 +901,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 osdep/mplayer.rc): version.h +@@ -887,7 +881,6 @@ $(call ADDSUFFIXES,.d .o,mpcommon osdep/ + + gui/%: CFLAGS += -Wno-strict-prototypes -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) Index: mplayer.spec =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v retrieving revision 1.31 retrieving revision 1.32 diff -u -r1.31 -r1.32 --- mplayer.spec 6 May 2010 20:51:35 -0000 1.31 +++ mplayer.spec 3 Jul 2010 17:06:10 -0000 1.32 @@ -1,12 +1,12 @@ %define codecdir %{_libdir}/codecs -%define pre 20100429svn +%define pre 20100703svn %define svn 1 -%define svnbuild 2010-04-29 +%define svnbuild 2010-07-03 %define faad2min 1:2.6.1 Name: mplayer Version: 1.0 -Release: 0.117.%{pre}%{?dist} +Release: 0.118.%{pre}%{?dist} Summary: Movie player playing most video formats and DVDs Group: Applications/Multimedia @@ -27,7 +27,6 @@ Patch2: %{name}-config.patch Patch8: %{name}-manlinks.patch Patch14: %{name}-nodvdcss.patch -Patch15: %{name}-libgif.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: SDL-devel @@ -59,9 +58,11 @@ BuildRequires: libdvdnav-devel >= 4.1.3-1 BuildRequires: libjpeg-devel BuildRequires: libmpcdec-devel +BuildRequires: libmpeg2-devel BuildRequires: libtheora-devel BuildRequires: libvdpau-devel BuildRequires: libvorbis-devel +BuildRequires: libvpx-devel >= 0.9.1 BuildRequires: lirc-devel BuildRequires: live555-devel BuildRequires: lzo-devel >= 2 @@ -188,18 +189,17 @@ --disable-mp3lame-lavc \\\ --disable-x264-lavc \\\ \\\ - --disable-liba52-internal \\\ %{?_without_amr:--disable-libopencore_amrnb --disable-libopencore_amrwb} \\\ %{!?_with_faac:--disable-faac} \\\ --disable-faad-internal \\\ %{!?_with_libmad:--disable-mad} \\\ + --disable-libmpeg2-internal \\\ --disable-tremor-internal \\\ %{?_with_xmms:--enable-xmms} \\\ %{?_with_xmms:--with-xmmslibdir=%{_libdir}} \\\ \\\ --disable-bitmap-font \\\ --%{?_with_directfb:enable}%{!?_with_directfb:disable}-directfb \\\ - --with-fribidi-config="pkg-config fribidi" \\\ %{!?_with_svgalib:--disable-svga} \\\ --disable-termcap \\\ --enable-xvmc \\\ @@ -220,7 +220,6 @@ %patch2 -p1 -b .config %patch8 -p1 -b .manlinks %patch14 -p1 -b .nodvdcss -%patch15 -p1 -b .libgif doconv() { iconv -f $1 -t $2 -o DOCS/man/$3/mplayer.1.utf8 DOCS/man/$3/mplayer.1 && \ @@ -393,6 +392,12 @@ %{_datadir}/mplayer/*.fp %changelog +* Sat Jul 03 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.0-0.118.20100703svn +- 20100703 snapshot +- dropped obsolete libgif patch +- enabled libvpx support +- enabled external libmpeg2 (internal copy is scheduled to be dropped by upstream) + * Thu May 06 2010 Nicolas Chauvet <kwizart(a)fedoraproject.org&gt; - 1.0-0.117.20100429svn - Rebuilt for live555 Index: sources =================================================================== RCS file: /cvs/free/rpms/mplayer/devel/sources,v retrieving revision 1.19 retrieving revision 1.20 diff -u -r1.19 -r1.20 --- sources 29 Apr 2010 21:56:52 -0000 1.19 +++ sources 3 Jul 2010 17:06:10 -0000 1.20 @@ -1,2 +1,3 @@ e4e2020d11b681aac898103b3ba723c4 Blue-1.7.tar.bz2 b393c9cabe1d10f412a9e56624957ef5 mplayer-export-2010-04-29.tar.bz2 +6169cad296bd67c399fd3dc18cca71aa mplayer-export-2010-07-03.tar.bz2 --- mplayer-libgif.patch DELETED ---