Author: pluto Date: Mon Feb 27 20:44:37 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- gcc4 fix, modular xorg deps, system-wide ffmpeg deps in progress...
---- Files affected:
SPECS:
mplayer.spec (1.316 -> 1.317)
---- Diffs:
================================================================
Index: SPECS/mplayer.spec
diff -u SPECS/mplayer.spec:1.316 SPECS/mplayer.spec:1.317
--- SPECS/mplayer.spec:1.316 Mon Feb 13 21:58:15 2006
+++ SPECS/mplayer.spec Mon Feb 27 21:44:32 2006
@@ -42,7 +42,6 @@
%bcond_without sdl # disable SDL
%bcond_without doc # don't build docs (slow)
%bcond_with gtk2 # EXPERIMENTAL support for GTK+ version 2
-%bcond_with xlibs
%bcond_with shared # experimental libmplayer.so support
%ifnarch %{ix86}
@@ -110,16 +109,12 @@
Patch14: %{name}-shared.patch
Patch15: %{name}-xvmc.patch
Patch16: %{name}-kill-mabi_altivec.patch
+Patch17: %{name}-gcc4.patch
#http://www.openchrome.org/snapshots/mplayer/
URL: http://www.mplayerhq.hu/
%{?with_directfb:BuildRequires: DirectFB-devel}
BuildRequires: OpenGL-devel
%{?with_sdl:BuildRequires: SDL-devel >= 1.1.7}
-%if %{with xlibs}
-BuildRequires: libXv-devel
-%else
-BuildRequires: XFree86-devel >= 4.0.2
-%endif
%{?with_aalib:BuildRequires: aalib-devel}
%{?with_alsa:BuildRequires: alsa-lib-devel}
%{?with_arts:BuildRequires: artsc-devel}
@@ -162,6 +157,7 @@
%{?with_polyp:BuildRequires: polypaudio-devel}
%{?with_svga:BuildRequires: svgalib-devel}
%{?with_xmms:BuildRequires: xmms-libs}
+BuildRequires: xorg-lib-libXvMC-devel
BuildRequires: xvid-devel >= 1:0.9.0
BuildRequires: zlib-devel
Requires: %{name}-common = %{epoch}:%{version}-%{release}
@@ -170,7 +166,7 @@
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define _noautoreqdep libGL.so.1 libGLU.so.1
-%define specflags -fomit-frame-pointer
+%define specflags_ia32 -fomit-frame-pointer
%define specflags_alpha -mmax
%if %{with altivec}
%define specflags_ppc -maltivec
@@ -309,6 +305,7 @@
%endif
%patch15 -p0
%patch16 -p1
+%patch17 -p1
# kill evil file, hackery not needed with llh
echo > osdep/kerneltwosix.h
@@ -332,7 +329,8 @@
%{?debug:--enable-debug=3} \
--prefix=%{_prefix} \
--confdir=%{_sysconfdir}/mplayer \
- --with-x11incdir=%{_prefix}/X11R6/include \
+ --with-x11incdir=%{_includedir} \
+ --with-x11libdir=%{_libdir} \
--with-extraincdir=%{_includedir}/xvid \
--enable-menu \
%ifnarch %{ix86} %{x8664}
@@ -554,6 +552,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.317 2006/02/27 20:44:32 pluto
+- gcc4 fix, modular xorg deps, system-wide ffmpeg deps in progress...
+
Revision 1.316 2006/02/13 20:58:15 sparky
- kill evil -mabi=altivec, runtime detection works now, but image with altivec
is broken
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/mplayer.spec?r1=1.316&r2=1.317&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
