Author: blues Date: Sat Jul 18 18:44:44 2009 GMT
Module: packages Tag: HEAD
---- Log message:
- release 20 - live bcond enabled (with shared_live patch). Remove
--with-live option - authors depreciate it. rtsp should work now.
---- Files affected:
packages/mplayer:
TODO (1.1 -> 1.2) , mplayer.spec (1.419 -> 1.420) ,
mplayer-shared_live.patch (NONE -> 1.1) (NEW)
---- Diffs:
================================================================
Index: packages/mplayer/TODO
diff -u packages/mplayer/TODO:1.1 packages/mplayer/TODO:1.2
--- packages/mplayer/TODO:1.1 Sat Jul 18 14:40:45 2009
+++ packages/mplayer/TODO Sat Jul 18 20:44:38 2009
@@ -6,4 +6,3 @@
- segfaults on amd64:
mencoder -oac pcm -af dummy -ovc raw -vf format=yv12 -of ogg -mc 0 -quiet -o
/tmp/out1 l.avi
avi: RIFF (little-endian) data, AVI, 480 x 360, 25.00 fps, video: XviD,
audio: MPEG-1 Layer 3 (stereo, 48000 Hz)
-
================================================================
Index: packages/mplayer/mplayer.spec
diff -u packages/mplayer/mplayer.spec:1.419 packages/mplayer/mplayer.spec:1.420
--- packages/mplayer/mplayer.spec:1.419 Sat Jul 18 14:40:45 2009
+++ packages/mplayer/mplayer.spec Sat Jul 18 20:44:38 2009
@@ -25,7 +25,7 @@
%bcond_without libdts # disable libdts support
%bcond_without libdv # disable libdv en/decoding support
%bcond_without lirc # without lirc support
-%bcond_with live # without LIVE555 libraries
+%bcond_without live # without LIVE555 libraries
%bcond_without lzo # with LZO support (requires lzo 2.x)
%bcond_without mad # without mad (audio MPEG) support
%bcond_without pulseaudio # without pulseaudio output
@@ -68,7 +68,7 @@
%define subver rc2
%define svnver 27725
-%define rel 19
+%define rel 20
Summary: MPlayer - THE Movie Player for UN*X
Summary(de.UTF-8): MPlayer ist ein unter der freien GPL-Lizenz stehender
Media-Player
@@ -119,6 +119,7 @@
Patch24: %{name}-fontconfig_sub.patch
Patch26: %{name}-check-byteswap.patch
Patch27: %{name}-release_directfb.patch
+Patch28: %{name}-shared_live.patch
URL: http://www.mplayerhq.hu/
%{?with_directfb:BuildRequires: DirectFB-devel}
BuildRequires: OpenAL-devel
@@ -171,7 +172,7 @@
%{?with_x264:BuildRequires: libx264-devel >= 0.1.2-1.20081023_2245.1}
BuildRequires: libxslt-progs
%{?with_lirc:BuildRequires: lirc-devel}
-%{?with_live:BuildRequires: live-static}
+%{?with_live:BuildRequires: live-devel}
%{?with_lzo:BuildRequires: lzo-devel >= 2.0}
%{?with_nas:BuildRequires: nas-devel}
BuildRequires: ncurses-devel
@@ -336,6 +337,7 @@
%patch24 -p0
%patch26 -p1
%patch27 -p1
+%patch28 -p1
# recent dvdnav-config doesn't support --minilibs.
sed -i 's:--minilibs:--libs:g' configure
@@ -398,7 +400,7 @@
%{!?with_directfb:--disable-directfb} \
%{!?with_dxr3:--disable-dxr3} \
%{!?with_ggi:--disable-ggi} \
- %{?with_live:--enable-live --with-extraincdir=/usr/include/liveMedia} \
+ %{?with_live:--with-extraincdir=/usr/include/liveMedia} \
%{!?with_live:--disable-live} \
%{!?with_lzo:--disable-liblzo} \
%{!?with_nas:--disable-nas} \
@@ -596,6 +598,10 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.420 2009/07/18 18:44:38 blues
+- release 20 - live bcond enabled (with shared_live patch). Remove
+ --with-live option - authors depreciate it. rtsp should work now.
+
Revision 1.419 2009/07/18 12:40:45 blues
- BR live-static
================================================================
Index: packages/mplayer/mplayer-shared_live.patch
diff -u /dev/null packages/mplayer/mplayer-shared_live.patch:1.1
--- /dev/null Sat Jul 18 20:44:44 2009
+++ packages/mplayer/mplayer-shared_live.patch Sat Jul 18 20:44:38 2009
@@ -0,0 +1,17 @@
+--- ./configure.org 2009-07-18 20:21:38.732115145 +0200
++++ ./configure 2009-07-18 20:26:09.698517432 +0200
+@@ -6379,12 +6379,8 @@ EOF
+ for I in $_inc_extra "-I$_libdir/live" "-I/usr/lib/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//` && \
+- _ld_extra="$_livelibdir/liveMedia/libliveMedia.a \
+- $_livelibdir/groupsock/libgroupsock.a \
+- $_livelibdir/UsageEnvironment/libUsageEnvironment.a \
+-
$_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
+- $_ld_extra -lstdc++" \
+- _inc_extraxx="-I$_livelibdir/liveMedia/include \
++ _ld_extra="$_ld_extra -lliveMedia -lgroupsock -lUsageEnvironment
-lBasicUsageEnvironment -lstdc++"
++ _inc_extraxx="-I$_livelibdir/liveMedia/include \
+ -I$_livelibdir/UsageEnvironment/include \
+ -I$_livelibdir/BasicUsageEnvironment/include \
+ -I$_livelibdir/groupsock/include" && \
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/TODO?r1=1.1&r2=1.2&f=u
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mplayer/mplayer.spec?r1=1.419&r2=1.420&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
