From: Bartłomiej Zimoń <cactus@pld-linux.org>
Date: Fri, 18 Feb 2011 14:03:06 +0000 (+0000)
Subject: - up to 1.0 rc5 svn r32923
X-Git-Tag: auto/th/mplayer-1_0-5_rc5_svn32923_1
X-Git-Url: https://git.pld-linux.org/?a=commitdiff_plain;h=5bcd4a3c5253e514f48ae30239e4342b1369e448;p=packages%2Fmplayer.git

- up to 1.0 rc5 svn r32923

Changed files:
    mplayer-shared_live.patch -> 1.3
    mplayer.spec -> 1.451
---

diff --git a/mplayer-shared_live.patch b/mplayer-shared_live.patch
index 8602bc8..1287878 100644
--- a/mplayer-shared_live.patch
+++ b/mplayer-shared_live.patch
@@ -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 \
diff --git a/mplayer.spec b/mplayer.spec
index 5207f7d..ed2ccb4 100644
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -90,8 +90,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
@@ -111,8 +111,9 @@ License:	GPL
 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
@@ -485,7 +486,6 @@ build() {
 	%{__disable cdparanoia} \
 	%{__disable enca} \
 	%{__disable esd} \
-	--disable-faad-internal \
 	%{__disable faad} \
 	%{__disable gif} \
 	%{__enable joystick} \