Author: mguevara Date: Tue May 2 12:19:49 2006 GMT
Module: SPECS Tag: AC-branch
---- Log message:
- adds mplayer-includes.patch to help find proper includes
- x264 bcond (default off) taken from HEAD - we have to find the proper
libx264-devel - the newest (20060430) is not ok too
---- Files affected:
SPECS:
mplayer.spec (1.316.2.4 -> 1.316.2.5)
---- Diffs:
================================================================
Index: SPECS/mplayer.spec
diff -u SPECS/mplayer.spec:1.316.2.4 SPECS/mplayer.spec:1.316.2.5
--- SPECS/mplayer.spec:1.316.2.4 Fri Apr 21 11:11:01 2006
+++ SPECS/mplayer.spec Tue May 2 14:19:43 2006
@@ -13,6 +13,7 @@
%bcond_with svga # with svgalib video output
%bcond_with osd # with osd menu support
%bcond_with altivec # with altivec support (altivec code brakes
image in mpeg4, and may segfault on others)
+%bcond_with x264 # with x264 support (needs some libx264-devel
version - maybe older one)
%bcond_with xmms # with XMMS inputplugin support
%bcond_without aalib # without aalib video output
%bcond_without jack # without JACKD support
@@ -121,6 +122,7 @@
Patch17: %{name}-gcc4.patch
Patch18:
http://www.mplayerhq.hu/MPlayer/patches/demuxer_h_fix_20060212.diff
Patch19: %{name}-CVE-2005-4048.patch
+Patch20: %{name}-includes.patch
#http://www.openchrome.org/snapshots/mplayer/
URL: http://www.mplayerhq.hu/
%{?with_directfb:BuildRequires: DirectFB-devel}
@@ -162,6 +164,7 @@
%{?with_dshow:BuildRequires: libstdc++-devel}
%{?with_theora:BuildRequires: libtheora-devel}
%{?with_vorbis:BuildRequires: libvorbis-devel}
+%{?with_x264:BuildRequires: libx264-devel > 0.1.2-1.20051023}
BuildRequires: libungif-devel
BuildRequires: libxslt-progs
%{?with_lirc:BuildRequires: lirc-devel}
@@ -323,6 +326,7 @@
%patch17 -p1
%patch18 -p0
%patch19 -p1
+%patch20 -p1
# kill evil file, hackery not needed with llh
echo > osdep/kerneltwosix.h
@@ -393,6 +397,7 @@
%{!?with_vorbis:--disable-vorbis} \
%{?with_osd:--enable-menu} \
%{!?with_theora:--disable-theora} \
+%{!?with_x264:--disable-x264} \
%{?with_xmms:--enable-xmms --with-xmmsplugindir=%{_libdir}/xmms/Input
--with-xmmslibdir=%{_libdir}} \
%{!?with_mencoder:--disable-mencoder} \
--enable-external-faad \
@@ -571,6 +576,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.316.2.5 2006/05/02 12:19:43 mguevara
+- adds mplayer-includes.patch to help find proper includes
+- x264 bcond (default off) taken from HEAD - we have to find the proper
+ libx264-devel - the newest (20060430) is not ok too
+
Revision 1.316.2.4 2006/04/21 09:11:01 sparky
- multiarch support
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mplayer.spec?r1=1.316.2.4&r2=1.316.2.5&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
