SPECS: mplayer.spec - wrong branch commit reverted

[glen]

Author: glen                         Date: Sat Dec  9 13:13:41 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- wrong branch commit reverted

---- Files affected:
SPECS:
   mplayer.spec (1.354 -> 1.355) 

---- Diffs:

================================================================
Index: SPECS/mplayer.spec
diff -u SPECS/mplayer.spec:1.354 SPECS/mplayer.spec:1.355
--- SPECS/mplayer.spec:1.354	Sat Dec  9 14:10:21 2006
+++ SPECS/mplayer.spec	Sat Dec  9 14:13:36 2006
@@ -169,7 +169,6 @@
 %{?with_dshow:BuildRequires:	libstdc++-devel}
 %{?with_theora:BuildRequires:	libtheora-devel}
 # tremor is used by default, internal as we don't have system one
-BuildRequires:	XFree86-devel >= 4.0.2
 %{?with_gnomess:BuildRequires:	dbus-glib-devel}
 #%{?with_vorbis:BuildRequires:	libvorbis-devel}
 %{?with_x264:BuildRequires:	libx264-devel >= 0.1.2-1.20060828_2245.1}
@@ -184,6 +183,13 @@
 BuildRequires:	speex-devel >= 1.1
 %{?with_svga:BuildRequires:	svgalib-devel}
 %{?with_xmms:BuildRequires:	xmms-libs}
+BuildRequires:	xorg-lib-libX11-devel
+BuildRequires:	xorg-lib-libXext-devel
+BuildRequires:	xorg-lib-libXinerama-devel
+BuildRequires:	xorg-lib-libXv-devel
+BuildRequires:	xorg-lib-libXvMC-devel
+BuildRequires:	xorg-lib-libXxf86dga-devel
+BuildRequires:	xorg-lib-libXxf86vm-devel
 %{?with_xvid:BuildRequires:	xvid-devel >= 1:0.9.0}
 BuildRequires:	zlib-devel
 Requires(post,postun):	/sbin/ldconfig
@@ -349,6 +355,7 @@
 	%{?debug:--enable-debug=3} \
 	--prefix=%{_prefix} \
 	--confdir=%{_sysconfdir}/mplayer \
+	--with-x11libdir=%{_libdir} \
 	--with-extraincdir=%{_includedir}/xvid \
 	--enable-menu \
 %ifnarch %{ix86} %{x8664}
@@ -579,8 +586,8 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
-Revision 1.354  2006/12/09 13:10:21  glen
-- AC-branch moved
+Revision 1.355  2006/12/09 13:13:36  glen
+- wrong branch commit reverted
 
 Revision 1.353  2006/12/09 12:50:15  glen
 - adapter
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/mplayer.spec?r1=1.354&r2=1.355&f=u