packages: mplayer/mplayer-shared_live.patch, mplayer/mplayer.spec - up to 1...

[cactus]

Author: cactus                       Date: Fri Feb 18 14:03:12 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.0 rc5 svn r32923

---- Files affected:
packages/mplayer:
   mplayer-shared_live.patch (1.2 -> 1.3) , mplayer.spec (1.450 -> 1.451) 

---- Diffs:

================================================================
Index: packages/mplayer/mplayer-shared_live.patch
diff -u packages/mplayer/mplayer-shared_live.patch:1.2 packages/mplayer/mplayer-shared_live.patch:1.3
--- packages/mplayer/mplayer-shared_live.patch:1.2	Wed Nov 18 04:22:05 2009
+++ packages/mplayer/mplayer-shared_live.patch	Fri Feb 18 15:03:06 2011
@@ -1,9 +1,9 @@
---- ./configure.org	2009-07-18 20:21:38.732115145 +0200
-+++ ./configure	2009-07-18 20:26:09.698517432 +0200
-@@ -6913,11 +6913,7 @@
+--- ./configure.org	2011-02-17 12:15:19.000000000 +0100
++++ ./configure	2011-02-18 00:49:43.984157326 +0100
+@@ -6796,11 +6796,7 @@
    for I in $extra_cflags "-I$_libdir/live" "-I/usr/lib/live" "-I/usr/lib64/live" "-I/usr/local/live" "-I/usr/local/lib/live" ; do
-     cxx_check $I/liveMedia/include $I/UsageEnvironment/include \
-       $I/groupsock/include && _livelibdir=$(echo $I| sed s/-I//) && \
+     cxx_check $I/liveMedia/include $I/UsageEnvironment/include $I/groupsock/include &&
+         _livelibdir=$(echo $I| sed s/-I//) &&
 -      extra_ldflags="$_livelibdir/liveMedia/libliveMedia.a \
 -                 $_livelibdir/groupsock/libgroupsock.a \
 -                 $_livelibdir/UsageEnvironment/libUsageEnvironment.a \

================================================================
Index: packages/mplayer/mplayer.spec
diff -u packages/mplayer/mplayer.spec:1.450 packages/mplayer/mplayer.spec:1.451
--- packages/mplayer/mplayer.spec:1.450	Tue Nov 30 10:39:37 2010
+++ packages/mplayer/mplayer.spec	Fri Feb 18 15:03:06 2011
@@ -91,8 +91,8 @@
 %define		_suf	32
 %endif
 
-%define		subver	rc4
-%define		svnver	32669
+%define		subver	rc5
+%define		svnver	32923
 %define		rel	1
 Summary:	MPlayer - THE Movie Player for UN*X
 Summary(de.UTF-8):	MPlayer ist ein unter der freien GPL-Lizenz stehender Media-Player
@@ -112,8 +112,9 @@
 Group:		Applications/Multimedia
 # svn export svn://svn.mplayerhq.hu/mplayer/trunk mplayer-rXXX
 # tar -cvJf mplayer-rXXX.tar.xz mplayer-rXXX
-Source0:	%{name}-r%{svnver}.tar.xz
-# Source0-md5:	0bc479a5625dd5dbd34e5bed676ad96e
+# for ffmpeg git://git.videolan.org/ffmpeg.git
+Source0:	http://carme.pld-linux.org/~cactus/snaps/mplayer/%{name}-r%{svnver}.tar.xz
+# Source0-md5:	8de311873d5a9342387197b0a16c7756
 Source3:	ftp://ftp1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
 # Source3-md5:	7b47904a925cf58ea546ca15f3df160c
 Source5:	g%{name}.desktop
@@ -486,7 +487,6 @@
 	%{__disable cdparanoia} \
 	%{__disable enca} \
 	%{__disable esd} \
-	--disable-faad-internal \
 	%{__disable faad} \
 	%{__disable gif} \
 	%{__enable joystick} \
@@ -680,6 +680,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.451  2011/02/18 14:03:06  cactus
+- up to 1.0 rc5 svn r32923
+
 Revision 1.450  2010/11/30 09:39:37  pluto
 - snapshot updated to r32669 (bugfix for DTS wave audios).
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/mplayer-shared_live.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/mplayer.spec?r1=1.450&r2=1.451&f=u