- release 20 - live bcond enabled (with shared_live patch). Remove

  --with-live option - authors depreciate it. rtsp should work now.

Changed files:
    TODO -> 1.2
    mplayer-shared_live.patch -> 1.1
    mplayer.spec -> 1.420

diff --git a/TODO b/TODO
index 8b2f07838be0e40811c3794cb514f02abc7e7ab2..29645e7b626e1c94c19ece3e325f896c840bcdaf 100644 (file)
--- a/TODO
+++ b/TODO
@@ -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)
-

diff --git a/mplayer-shared_live.patch b/mplayer-shared_live.patch
new file mode 100644 (file)
index 0000000..fce9878
--- /dev/null
+++ b/mplayer-shared_live.patch
@@ -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" && \

diff --git a/mplayer.spec b/mplayer.spec
index 3d1df327b11e47c0d66b62365b1782819859b1ec..b816a2031ac0698dc6bbe2fb21ef659676ac4569 100644 (file)
--- a/mplayer.spec
+++ b/mplayer.spec
@@ -24,7 +24,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
@@ -67,7 +67,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
@@ -118,6 +118,7 @@ Patch22:    %{name}-ffmpeg.patch
 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
@@ -170,7 +171,7 @@ BuildRequires:      libpng-devel
 %{?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
@@ -335,6 +336,7 @@ done
 %patch24 -p0
 %patch26 -p1
 %patch27 -p1
+%patch28 -p1
 
 # recent dvdnav-config doesn't support --minilibs.
 sed -i 's:--minilibs:--libs:g' configure
@@ -397,7 +399,7 @@ set -x
        %{!?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} \