packages: mplayer/mplayer-ldflags.patch, mplayer/mplayer-shared_live.patch, ...

Mon Jul 25 11:45:21 CEST 2011

Author: arekm                        Date: Mon Jul 25 09:45:21 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to svn33917

---- Files affected:
packages/mplayer:
   mplayer-ldflags.patch (1.3 -> 1.4) , mplayer-shared_live.patch (1.3 -> 1.4) , mplayer.spec (1.458 -> 1.459) , mplayer-build.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mplayer/mplayer-ldflags.patch
diff -u packages/mplayer/mplayer-ldflags.patch:1.3 packages/mplayer/mplayer-ldflags.patch:1.4

--- packages/mplayer/mplayer-ldflags.patch:1.3	Tue Nov 30 10:37:58 2010
+++ packages/mplayer/mplayer-ldflags.patch	Mon Jul 25 11:45:15 2011
@@ -34,7 +34,7 @@
  CFLAGS_TREMOR_LOW        = $cflags_tremor_low
  
 +LDFLAGS            = $real_ldflags
- EXTRALIBS          = $extra_ldflags $_ld_static $_ld_lm $extra_libs
+ EXTRALIBS          = $extra_ldflags $_ld_static $extra_libs
  EXTRALIBS_MPLAYER  = $libs_mplayer
  EXTRALIBS_MENCODER = $libs_mencoder
 --- mplayer-r32669/Makefile.orig	2010-10-27 19:55:45.000000000 +0200

================================================================
Index: packages/mplayer/mplayer-shared_live.patch
diff -u packages/mplayer/mplayer-shared_live.patch:1.3 packages/mplayer/mplayer-shared_live.patch:1.4
--- packages/mplayer/mplayer-shared_live.patch:1.3	Fri Feb 18 15:03:06 2011
+++ packages/mplayer/mplayer-shared_live.patch	Mon Jul 25 11:45:15 2011
@@ -1,15 +1,16 @@
 --- ./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//) &&
+@@ -6778,11 +6778,7 @@
+     _livelibdir=$(echo $I| sed s/-I//)
+     test -e "$_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a" &&
+         cxx_check $I/liveMedia/include $I/UsageEnvironment/include $I/BasicUsageEnvironment/include $I/groupsock/include $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a $_livelibdir/UsageEnvironment/libUsageEnvironment.a $_livelibdir/groupsock/libgroupsock.a $_ld_sock &&
 -      extra_ldflags="$_livelibdir/liveMedia/libliveMedia.a \
--                 $_livelibdir/groupsock/libgroupsock.a \
 -                 $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
 -                 $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
--                 $extra_ldflags  -lstdc++" \
+-                 $_livelibdir/groupsock/libgroupsock.a \
+-                 $extra_ldflags  -lstdc++ $_ld_sock" \
 +      extra_ldflags="-lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment $extra_ldflags -lstdc++" && \
        extra_cxxflags="-I$_livelibdir/liveMedia/include \
                    -I$_livelibdir/UsageEnvironment/include \
                    -I$_livelibdir/BasicUsageEnvironment/include \
+

================================================================
Index: packages/mplayer/mplayer.spec
diff -u packages/mplayer/mplayer.spec:1.458 packages/mplayer/mplayer.spec:1.459
--- packages/mplayer/mplayer.spec:1.458	Wed Jun 29 18:29:21 2011
+++ packages/mplayer/mplayer.spec	Mon Jul 25 11:45:15 2011
@@ -93,8 +93,8 @@
 %endif
 
 %define		subver	rc5
-%define		svnver	32923
-%define		rel	5
+%define		svnver	33917
+%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
 Summary(es.UTF-8):	Otro reproductor de películas
@@ -112,10 +112,10 @@
 License:	GPL
 Group:		Applications/Multimedia
 # svn export svn://svn.mplayerhq.hu/mplayer/trunk mplayer-rXXX
+# cd mplayer-rXXX && git clone git://git.videolan.org/ffmpeg.git
 # tar -cvJf mplayer-rXXX.tar.xz mplayer-rXXX
-# 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
+Source0:	%{name}-r%{svnver}.tar.xz
+# Source0-md5:	312105f44f5828432a52955b69f2ed00
 Source3:	ftp://ftp1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
 # Source3-md5:	7b47904a925cf58ea546ca15f3df160c
 Source5:	g%{name}.desktop
@@ -149,6 +149,7 @@
 
 Patch100:	%{name}-on2flix.patch
 Patch101:	%{name}-link.patch
+Patch102:	%{name}-build.patch
 
 URL:		http://www.mplayerhq.hu/
 %{?with_directfb:BuildRequires:	DirectFB-devel}
@@ -394,6 +395,7 @@
 %endif
 
 %patch101 -p1
+%patch102 -p1
 
 # Set version
 %if "x%{svnver}" != "x%{nil}"
@@ -532,7 +534,6 @@
 	%{__enable_disable zr} \
 	--enable-unrarexec \
 	--enable-dynamic-plugins \
-	--enable-largefiles \
 	--language=all \
 	--codecsdir=%{_libdir}/codecs \
 	"$@"
@@ -682,6 +683,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.459  2011/07/25 09:45:15  arekm
+- up to svn33917
+
 Revision 1.458  2011/06/29 16:29:21  arekm
 - release 5
 

================================================================
Index: packages/mplayer/mplayer-build.patch
diff -u /dev/null packages/mplayer/mplayer-build.patch:1.1
--- /dev/null	Mon Jul 25 11:45:21 2011
+++ packages/mplayer/mplayer-build.patch	Mon Jul 25 11:45:15 2011
@@ -0,0 +1,10 @@
+--- mplayer-r33917/help/help_mp-en.h~	2011-07-25 11:28:45.000000000 +0200
++++ mplayer-r33917/help/help_mp-en.h	2011-07-25 11:38:03.007928282 +0200
+@@ -1973,6 +1973,7 @@
+ #define MSGTR_RADIO_AudioInInitFailed "[radio] audio_in_init failed.\n"
+ #define MSGTR_RADIO_AudioInSetupFailed "[radio] audio_in_setup call failed: %s\n"
+ #define MSGTR_RADIO_ClearBufferFailed "[radio] Clearing buffer failed: %s\n"
++#define MSGTR_RADIO_SelectedChannel "[radio] Selected channel: %d - %s (freq: %.2f)\n"
+ #define MSGTR_RADIO_StreamEnableCacheFailed "[radio] Call to stream_enable_cache failed: %s\n"
+ #define MSGTR_RADIO_DriverUnknownStr "[radio] Unknown driver name: %s\n"
+ #define MSGTR_RADIO_DriverV4L2 "[radio] Using V4Lv2 radio interface.\n"
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/mplayer-ldflags.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/mplayer-shared_live.patch?r1=1.3&r2=1.4&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/mplayer.spec?r1=1.458&r2=1.459&f=u

