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

glen glen at pld-linux.org
Sun Jun 17 22:52:36 CEST 2012


Author: glen                         Date: Sun Jun 17 20:52:36 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- mplayer 1.1 tarball, compatible with ffmpeg 0.11

---- Files affected:
packages/mplayer:
   mplayer-shared_live.patch (1.5 -> 1.6) , mplayer.spec (1.468 -> 1.469) 

---- Diffs:

================================================================
Index: packages/mplayer/mplayer-shared_live.patch
diff -u packages/mplayer/mplayer-shared_live.patch:1.5 packages/mplayer/mplayer-shared_live.patch:1.6
--- packages/mplayer/mplayer-shared_live.patch:1.5	Sat Mar 10 14:17:11 2012
+++ packages/mplayer/mplayer-shared_live.patch	Sun Jun 17 22:52:31 2012
@@ -1,15 +1,14 @@
---- mplayer-r34805/configure.orig	2012-03-10 12:22:12.000000000 +0000
-+++ mplayer-r34805/configure	2012-03-10 12:24:33.000000000 +0000
-@@ -6671,11 +6671,7 @@
-     _livelibdir=$(echo $I| sed s/-I//)
+--- 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 $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/UsageEnvironment/libUsageEnvironment.a \
--                 $_livelibdir/BasicUsageEnvironment/libBasicUsageEnvironment.a \
--                 $_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 \
+         cxx_check $inc_tmp $ld_tmp &&

================================================================
Index: packages/mplayer/mplayer.spec
diff -u packages/mplayer/mplayer.spec:1.468 packages/mplayer/mplayer.spec:1.469
--- packages/mplayer/mplayer.spec:1.468	Wed May  9 21:31:12 2012
+++ packages/mplayer/mplayer.spec	Sun Jun 17 22:52:31 2012
@@ -93,9 +93,6 @@
 %define		_suf	32
 %endif
 
-%define		subver	rc5
-%define		svnver	34894
-%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
@@ -103,8 +100,8 @@
 Summary(pl.UTF-8):	Odtwarzacz filmów dla systemów uniksowych
 Summary(pt_BR.UTF-8):	Reprodutor de filmes
 Name:		mplayer
-Version:	1.0
-Release:	5.%{subver}_svn%{svnver}.%{rel}
+Version:	1.1
+Release:	0.1
 # DO NOT increase epoch unless it's really neccessary!
 # especially such changes like pre7->pre7try2, increase Release instead!
 # PS: $ rpmvercmp pre7try2 pre7
@@ -115,8 +112,8 @@
 # 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:	%{name}-r%{svnver}.tar.xz
-# Source0-md5:	86409e811285d9e8796d4034cd6f9bb8
+Source0:	ftp://ftp.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
 Source5:	g%{name}.desktop
@@ -163,6 +160,7 @@
 %{?with_ssse3:BuildRequires:	binutils >= 3:2.16.92}
 BuildRequires:	bzip2-devel
 %{?with_cdparanoia:BuildRequires:	cdparanoia-III-devel}
+%{?with_gnomess:BuildRequires:	dbus-glib-devel}
 BuildRequires:	dirac-devel
 %{?with_doc:BuildRequires:	docbook-dtd412-xml}
 %{?with_doc:BuildRequires:	docbook-style-xsl}
@@ -175,7 +173,6 @@
 BuildRequires:	freetype-devel >= 1:2.2.1
 BuildRequires:	fribidi-devel
 %{?with_altivec:BuildRequires:	gcc >= 5:4.1}
-%{?with_gnomess:BuildRequires:	dbus-glib-devel}
 %{?with_gif:BuildRequires:	giflib-devel}
 %{?with_gui:BuildRequires:	gtk+2-devel}
 %{?with_jack:BuildRequires:	jack-audio-connection-kit-devel}
@@ -360,7 +357,7 @@
 MEncoder to koder filmów dla Linuksa będący częścią pakietu MPlayer.
 
 %prep
-%setup -q -n %{name}-r%{svnver} -a3 -a6 -a9
+%setup -q -n MPlayer-%{version} -a3 -a6 -a9
 cp -f etc/codecs.conf etc/codecs.win32.conf
 
 # build (configure / Makefile) related:
@@ -369,6 +366,7 @@
 %patch12 -p1
 %patch13 -p1
 %{?with_system_ffmpeg:%patch14 -p1}
+# patch15 updated, but possibly no longer needed
 %{?with_live:%patch15 -p1}
 %{?with_shared:%patch16 -p1}
 
@@ -407,7 +405,7 @@
 %patch102 -p1
 
 # Set version
-%if "x%{svnver}" != "x%{nil}"
+%if "x%{?svnver}" != "x%{nil}"
 	echo "SVN-r%{svnver}%{?with_on2:-on2}" > VERSION
 %endif
 
@@ -649,6 +647,7 @@
 
 %if %{with doc}
 %files doc
+%defattr(644,root,root,755)
 %doc DOCS/tech
 # HTML and XML-generated docs
 %doc DOCS/HTML/en
@@ -695,6 +694,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.469  2012/06/17 20:52:31  glen
+- mplayer 1.1 tarball, compatible with ffmpeg 0.11
+
 Revision 1.468  2012/05/09 19:31:12  blekot
 - up to svn:34894
 - added Blue-ray support as bcond (BR: libbluray-devel)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/mplayer/mplayer-shared_live.patch?r1=1.5&r2=1.6
    http://cvs.pld-linux.org/packages/mplayer/mplayer.spec?r1=1.468&r2=1.469



More information about the pld-cvs-commit mailing list