Author: belegdol
Update of /cvs/free/rpms/mplayer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv28004
Modified Files:
.cvsignore mplayer-snapshot.sh mplayer.spec sources
Removed Files:
mplayer-gmplayer-subtitles.patch
Log Message:
* Sat Oct 20 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-3.20121008svn
- 20121008 snapshot
- Internal tremor copy is no more
- Dropped the included gmplayer subtitles patch
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/.cvsignore,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- .cvsignore 14 Jun 2012 22:34:06 -0000 1.28
+++ .cvsignore 20 Oct 2012 18:51:04 -0000 1.29
@@ -1,2 +1,2 @@
Blue-1.8.tar.bz2
-MPlayer-1.1.tar.xz
+mplayer-export-2012-10-08.tar.bz2
Index: mplayer-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-snapshot.sh,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- mplayer-snapshot.sh 4 May 2012 19:13:04 -0000 1.11
+++ mplayer-snapshot.sh 20 Oct 2012 18:51:04 -0000 1.12
@@ -13,7 +13,7 @@
unset CDPATH
pwd=$(pwd)
svn=$(date +%Y-%m-%d)
-svn=2012-05-04
+svn=2012-10-08
dirname=mplayer-export-$svn
mplayer_rev={$svn}
#mplayer_rev=HEAD
Index: mplayer.spec
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- mplayer.spec 9 Sep 2012 20:39:29 -0000 1.61
+++ mplayer.spec 20 Oct 2012 18:51:04 -0000 1.62
@@ -1,12 +1,12 @@
%define codecdir %{_libdir}/codecs
-#define pre 20120205svn
-#define svn 1
-#define svnbuild 2012-02-05
+%define pre 20121008svn
+%define svn 1
+%define svnbuild 2012-10-08
%define faad2min 1:2.6.1
Name: mplayer
Version: 1.1
-Release: 2%{?pre}%{?dist}
+Release: 3.%{?pre}%{?dist}
Summary: Movie player playing most video formats and DVDs
%if 0%{!?_without_amr:1}
@@ -23,7 +23,6 @@
%endif
Source1:
http://www.mplayerhq.hu/MPlayer/skins/Blue-1.8.tar.bz2
Source10: mplayer-snapshot.sh
-Patch0: %{name}-gmplayer-subtitles.patch
# set defaults for Fedora
Patch2: %{name}-config.patch
# use roff include statements instead of symlinks
@@ -198,7 +197,6 @@
%{!?_with_libmad:--disable-mad} \\\
%{?_with_libmpcdec:--enable-musepack} \\\
--disable-libmpeg2-internal \\\
- --disable-tremor-internal \\\
%{?_with_xmms:--enable-xmms} \\\
%{?_with_xmms:--with-xmmslibdir=%{_libdir}} \\\
\\\
@@ -224,7 +222,6 @@
%setup -q -n MPlayer-%{version}%{?pre}
rm -rf ffmpeg libdvdcss libdvdnav libdvdread4
%endif
-%patch0 -p0 -b .gmplayer-subtitles
%patch2 -p1 -b .config
%patch8 -p1 -b .manlinks
%patch14 -p1 -b .nodvdcss
@@ -384,6 +381,11 @@
%{_datadir}/mplayer/*.fp
%changelog
+* Sat Oct 20 2012 Julian Sikorski <belegdol(a)fedoraproject.org> - 1.1-3.20121008svn
+- 20121008 snapshot
+- Internal tremor copy is no more
+- Dropped the included gmplayer subtitles patch
+
* Wed Sep 05 2012 Nicolas Chauvet <kwizart(a)gmail.com>
- Rebuilt for x264 ABI 125
- Use --cpu-runtime-detection only on supported arches - rfbz#2467
Index: sources
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/sources,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- sources 14 Jun 2012 22:34:06 -0000 1.29
+++ sources 20 Oct 2012 18:51:04 -0000 1.30
@@ -1,2 +1,2 @@
340368f4e33f767d9df109990fb29c02 Blue-1.8.tar.bz2
-ac7bf1cfedc1c5c24bfc83107eefb1d9 MPlayer-1.1.tar.xz
+1a073615341bae9ab99550ae7a31c509 mplayer-export-2012-10-08.tar.bz2
--- mplayer-gmplayer-subtitles.patch DELETED ---