rpms/mplayer/devel mplayer-snapshot.sh, 1.10, 1.11 mplayer.spec, 1.51, 1.52

[Nicolas Chauvet]

Author: kwizart

Update of /cvs/free/rpms/mplayer/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv12402/devel

Modified Files:
	mplayer-snapshot.sh mplayer.spec 
Log Message:
Unbreak mplayer



Index: mplayer-snapshot.sh
===================================================================
RCS file: /cvs/free/rpms/mplayer/devel/mplayer-snapshot.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- mplayer-snapshot.sh	29 Feb 2012 16:45:42 -0000	1.10
+++ mplayer-snapshot.sh	4 May 2012 19:13:04 -0000	1.11
@@ -13,7 +13,7 @@
 unset CDPATH
 pwd=$(pwd)
 svn=$(date +%Y-%m-%d)
-svn=2012-02-05
+svn=2012-05-04
 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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- mplayer.spec	1 May 2012 20:00:17 -0000	1.51
+++ mplayer.spec	4 May 2012 19:13:04 -0000	1.52
@@ -6,7 +6,7 @@
 
 Name:           mplayer
 Version:        1.0
-Release:        0.136.%{pre}%{?dist}
+Release:        0.137.%{pre}%{?dist}
 Summary:        Movie player playing most video formats and DVDs
 
 %if 0%{!?_without_amr:1}
@@ -72,7 +72,7 @@
 BuildRequires:  libvdpau-devel
 BuildRequires:  libvorbis-devel
 BuildRequires:  lirc-devel
-BuildRequires:  live555-devel
+#BuildRequires:  live555-devel #broken - see libnemesi as an alternative
 BuildRequires:  lzo-devel >= 2
 BuildRequires:  pulseaudio-lib-devel
 BuildRequires:  speex-devel >= 1.1
@@ -211,6 +211,7 @@
     %{!?_with_esound:--disable-esd} \\\
     %{!?_with_jack:--disable-jack} \\\
     %{!?_with_openal:--disable-openal} \\\
+    --disable-live \\\
 
 
 %prep
@@ -378,8 +379,8 @@
 %{_datadir}/mplayer/*.fp
 
 %changelog
-* Tue May 01 2012 Nicolas Chauvet <kwizart at gmail.com> - 1.0-0.136.20120205svn
-- Rebuilt for live555
+* Fri May 04 2012 Nicolas Chauvet <kwizart at gmail.com>  - 1.0-0.137.20120205svn
+- Disable live (broken) - See libnemesi as an alternative
 
 * Sun Mar 18 2012 Julian Sikorski <belegdol at fedoraproject.org> - 1.0-0.135.20120205svn
 - Rebuilt for ffmpeg-0.10.2