Author: glen Date: Sat Dec 9 13:45:36 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- added on2flixenglinux patches
---- Files affected:
SPECS:
mplayer.spec (1.354 -> 1.354.2.1)
---- Diffs:
================================================================
Index: SPECS/mplayer.spec
diff -u SPECS/mplayer.spec:1.354 SPECS/mplayer.spec:1.354.2.1
--- SPECS/mplayer.spec:1.354 Sat Dec 9 14:10:21 2006
+++ SPECS/mplayer.spec Sat Dec 9 14:45:31 2006
@@ -69,15 +69,11 @@
%define _suf 32
%endif
-# set it to 0, or 1
-%define snapshot 0
-
%define sname MPlayer
%define snap %{nil}
-%define pre rc1
-
-%define _rel 1.1
+%define _rc rc1
+%define _rel 1.2
Summary: MPlayer - THE Movie Player for UN*X
Summary(de): MPlayer ist ein unter der freien GPL-Lizenz stehender
Media-Player
Summary(es): Otro reproductor de películas
@@ -86,7 +82,7 @@
Summary(pt_BR): Reprodutor de filmes
Name: mplayer
Version: 1.0
-Release: 3.%{pre}.%{_rel}
+Release: 3.%{_rc}.%{_rel}
# DO NOT increase epoch unless it's really neccessary!
# especially such changes like pre7->pre7try2, increase Release instead!
# PS: $ rpmvercmp pre7try2 pre7
@@ -94,14 +90,8 @@
Epoch: 3
License: GPL
Group: Applications/Multimedia
-%if %{snapshot}
-#Source0: ftp://ftp1.mplayerhq.hu/MPlayer/cvs/%{sname}-%{snap}.tar.bz2
-#Source0: %{name}-%{snap}.tar.bz2
-#Source1: libavcodec-%{snap}.tar.bz2
-%else
-Source0:
ftp://ftp2.mplayerhq.hu/MPlayer/releases/%{sname}-%{version}%{pre}.tar.bz2
+Source0:
ftp://ftp2.mplayerhq.hu/MPlayer/releases/%{sname}-%{version}%{_rc}.tar.bz2
# Source0-md5: 18c05d88e22c3b815a43ca8d7152ccdc
-%endif
Source3:
ftp://ftp1.mplayerhq.hu/MPlayer/releases/fonts/font-arial-iso-8859-2.tar.bz2
# Source3-md5: 7b47904a925cf58ea546ca15f3df160c
Source5: g%{name}.desktop
@@ -109,6 +99,9 @@
# Source6-md5: 1ecd31d17b51f16332b1fcc7da36b312
Source7: %{name}.png
Source8: %{name}.desktop
+# http://www.on2.com/gpl/mplayer/
+Source9:
http://www.on2.com/gpl/mplayer/2006-11-29-mencoder-on2flixenglinux.tar.bz2
+# Source9-md5: 66fd6987f36f0b0cec6a28366ac3141c
Patch1: %{name}-cp1250-fontdesc.patch
Patch2: %{name}-codec.patch
Patch3: %{name}-home_etc.patch
@@ -126,6 +119,7 @@
Patch16: %{name}-kill-mabi_altivec.patch
Patch17: %{name}-auto-expand.patch
Patch18: %{name}-gnome-screensaver.patch
+Patch19: %{name}-on2flix.patch
URL: http://www.mplayerhq.hu/
%{?with_directfb:BuildRequires: DirectFB-devel}
BuildRequires: OpenAL-devel
@@ -301,12 +295,7 @@
MEncoder to koder filmów dla Linuksa będący częścią pakietu MPlayer.
%prep
-%if %{snapshot}
-%setup -q -n %{name}-%{snap} -a 1 -a 3 -a 6
-%else
-%setup -q -n %{sname}-%{version}%{pre} -a 3 -a 6
-%endif
-
+%setup -q -n %{sname}-%{version}%{_rc} -a3 -a6 -a9
cp -f etc/codecs.conf etc/codecs.win32.conf
%patch1 -p0
##%patch2 -p1
@@ -329,10 +318,17 @@
%patch18 -p1
%endif
-%if %{with snapshot}
+%if 0%{?snap}
find . -type d -name CVS -print | xargs rm -rf
%endif
+# on2flix
+cp -a mencoder-on2flixenglinux/new_files/libmpdemux/* libmpdemux
+%patch19 -p1
+for a in mencoder-on2flixenglinux/*.diff; do
+ patch -p0 < $a
+done
+
%build
%if %{with shared}
CFLAGS="%{rpmcflags} -fPIC"
@@ -579,6 +575,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.354.2.1 2006/12/09 13:45:31 glen
+- added on2flixenglinux patches
+
Revision 1.354 2006/12/09 13:10:21 glen
- AC-branch moved
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mplayer.spec?r1=1.354&r2=1.354.2.1&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
