From: Jakub Bogusz Date: Wed, 30 Jan 2013 19:56:03 +0000 (+0100) Subject: - removed obsolete hotfixes and shared_live patch X-Git-Tag: auto/th/mplayer-1.1.1-1~16 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=e2b12b5a035ea932f833329e8d941f8bb7dc2cad;p=packages%2Fmplayer.git - removed obsolete hotfixes and shared_live patch - added live patch (fixes build with recent live releases, which need -DRTSPCLIENT_SYNCHRONOUS_INTERFACE) --- diff --git a/mplayer-live.patch b/mplayer-live.patch new file mode 100644 index 0000000..7ce9fba --- /dev/null +++ b/mplayer-live.patch @@ -0,0 +1,10 @@ ++++ MPlayer-1.1/configure.orig 2013-01-28 21:25:18.354520436 +0100 +--- MPlayer-1.1/configure 2013-01-30 20:06:23.334350773 +0100 +@@ -6686,6 +6686,7 @@ + echocheck "LIVE555 Streaming Media libraries" + if test "$_live" = auto && test "$networking" = yes ; then + cat > $TMPCPP << EOF ++#define RTSPCLIENT_SYNCHRONOUS_INTERFACE 1 + #include + #if (LIVEMEDIA_LIBRARY_VERSION_INT < 1141257600) + #error Please upgrade to version 2006.03.03 or later of the "LIVE555 Streaming Media" libraries - available from diff --git a/mplayer-shared_live.patch b/mplayer-shared_live.patch deleted file mode 100644 index 04c615d..0000000 --- a/mplayer-shared_live.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- MPlayer-1.1/configure~ 2012-06-17 23:45:37.000000000 +0300 -+++ MPlayer-1.1/configure 2012-06-17 23:47:45.579510002 +0300 -@@ -6701,10 +6701,7 @@ - -I$_livelibdir/UsageEnvironment/include \ - -I$_livelibdir/BasicUsageEnvironment/include \ - -I$_livelibdir/groupsock/include" -- ld_tmp="$_livelibdir/liveMedia/libliveMedia.a \ -- $_livelibdir/UsageEnvironment/libUsageEnvironment.a \ -- $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \ -- $_livelibdir/groupsock/libgroupsock.a \ -+ ld_tmp="-lliveMedia -lgroupsock -lUsageEnvironment -lBasicUsageEnvironment \ - -lstdc++ $ld_sock" - test -e "$_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a" && - cxx_check $inc_tmp $ld_tmp && diff --git a/mplayer.spec b/mplayer.spec index 48873c3..7c6674d 100644 --- a/mplayer.spec +++ b/mplayer.spec @@ -63,7 +63,6 @@ %if %{with alsa} %undefine with_select %endif - %if %{without vorbis} %undefine with_system_vorbis %endif @@ -73,23 +72,20 @@ %undefine with_quicktime %undefine with_vidix %endif - %ifnarch %{ix86} %{x8664} ppc ppc64 %undefine with_runtime %endif - %ifnarch %{ix86} %{x8664} %undefine with_vdpau %endif - %ifnarch ppc %undefine with_altivec %endif %if %{_lib} == "lib64" -%define _suf 64 +%define binsuf 64 %else -%define _suf 32 +%define binsuf 32 %endif Summary: MPlayer - THE Movie Player for UN*X @@ -108,10 +104,11 @@ Release: 3 Epoch: 3 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 -Source0: ftp://ftp.mplayerhq.hu/MPlayer/releases/MPlayer-%{version}.tar.xz +# for snapshots: +# 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 +Source0: http://mplayerhq.hu/MPlayer/releases/MPlayer-%{version}.tar.xz # Source0-md5: ac7bf1cfedc1c5c24bfc83107eefb1d9 Source3: ftp://ftp1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2 # Source3-md5: 7b47904a925cf58ea546ca15f3df160c @@ -130,7 +127,7 @@ Patch11: %{name}-altivec.patch Patch12: %{name}-check-byteswap.patch Patch13: %{name}-visibility-hidden-fix.patch Patch14: %{name}-ffmpeg.patch -Patch15: %{name}-shared_live.patch +Patch15: %{name}-live.patch Patch16: %{name}-shared.patch # codecs, outputs, demuxers: @@ -365,8 +362,7 @@ cp -f etc/codecs.conf etc/codecs.win32.conf %patch12 -p1 %patch13 -p1 %{?with_system_ffmpeg:%patch14 -p1} -# patch15 updated, but possibly no longer needed -%{?with_live:%patch15 -p1} +%patch15 -p1 %{?with_shared:%patch16 -p1} # codecs, outputs, demuxers: @@ -403,11 +399,6 @@ done %patch101 -p1 %patch102 -p1 -# Set version -%if "x%{?svnver}" != "x%{nil}" - echo "SVN-r%{svnver}%{?with_on2:-on2}" > VERSION -%endif - cat etc/example.conf > etc/mplayer.conf cat <<'CONFIGADD' >> etc/mplayer.conf @@ -431,21 +422,12 @@ CONFIGADD %if %{with system_ffmpeg} # using external ffmpeg, but mplayer adds these to includepath -rm -r libavcodec libavdevice libavformat libavutil libpostproc libswscale +%{__rm} -r libavcodec libavdevice libavformat libavutil libpostproc libswscale %endif -# *** HOT FIXES *** - -# typo, fixed in recent svn -sed 's/STREAM_NONCACHEABLE/STREAM_NON_CACHEABLE/' -i stream/stream_live555.c - -# mjpeg encoder is required for Zoran hardware -sed '/_libavencoders="MPEG/s/"$/ MJPEG_ENCODER"/' -i configure - %build CFLAGS="%{rpmcflags} %{?with_hidden_visibility:-fvisibility=hidden} %{?with_shared:-fvisibility=default -fPIC}" CFLAGS="$CFLAGS -I%{_includedir}/xvid%{?with_directfb::%{_includedir}/directfb}" -%{?with_live:CFLAGS="$CFLAGS -I/usr/include/liveMedia"} build() { set -x @@ -576,13 +558,13 @@ install etc/{codecs,mplayer%{?with_osd:,menu},input}.conf $RPM_BUILD_ROOT%{_sysc # executables %if %{with mencoder} install mencoder $RPM_BUILD_ROOT%{_bindir}/mencoder%{_suf} -ln -sf mencoder%{_suf} $RPM_BUILD_ROOT%{_bindir}/mencoder +ln -sf mencoder%{binsuf} $RPM_BUILD_ROOT%{_bindir}/mencoder %endif install mplayer $RPM_BUILD_ROOT%{_bindir}/mplayer%{_suf} -ln -sf mplayer%{_suf} $RPM_BUILD_ROOT%{_bindir}/mplayer +ln -sf mplayer%{binsuf} $RPM_BUILD_ROOT%{_bindir}/mplayer %if %{with gui} install gmplayer $RPM_BUILD_ROOT%{_bindir}/gmplayer%{_suf} -ln -sf gmplayer%{_suf} $RPM_BUILD_ROOT%{_bindir}/gmplayer +ln -sf gmplayer%{binsuf} $RPM_BUILD_ROOT%{_bindir}/gmplayer %endif %if %{with shared}