rpms/xine-lib/EL-6 xine-lib.spec,1.82,1.83

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/EL-6
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv21138

Modified Files:
	xine-lib.spec 
Log Message:
more el-6 fixes



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/EL-6/xine-lib.spec,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -p -r1.82 -r1.83
--- xine-lib.spec	21 Jun 2010 17:24:30 -0000	1.82
+++ xine-lib.spec	21 Jun 2010 18:15:18 -0000	1.83
@@ -19,9 +19,10 @@
 %define with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
 %endif # Fedora
 
+%define _enable_xvmc --enable-xvmc
 %if 0%{?rhel} > 5
 %ifarch ppc64
-%define no_xvmc 1 
+%undefine _enable_xvmc
 %endif
 %endif
 
@@ -32,7 +33,7 @@
 %define _with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} 
 %endif
 
-%if 0%{?fedora} > 11
+%if 0%{?fedora} > 11 || 0%{?rhel} > 5
 %define pa_in_main 1
 %endif
 
@@ -72,7 +73,7 @@ BuildRequires:  automake libtool
 BuildRequires:  libX11-devel
 BuildRequires:  libXv-devel
 BuildRequires:  libXinerama-devel
-%{!?no_xvmc:BuildRequires:  libXvMC-devel}
+%{?_enable_xvmc:BuildRequires:  libXvMC-devel}
 BuildRequires:  libGLU-devel
 %if 0%{?_enable_v4l:1}
 BuildRequires:  libv4l-devel
@@ -221,6 +222,7 @@ export SDL_CFLAGS="$(sdl-config --cflags
     --enable-directfb \
 %endif # directfb
     %{?_enable_v4l}%{!?_enable_v4l:--disable-v4l --disable-libv4l} \
+    %{?_enable_xvmc}%{!?_enable_xvmc:--disable-xvmc} \
     %{?_disable_gnomevfs} \
     --disable-a52dec \
     --disable-mad \
@@ -390,8 +392,10 @@ rm -rf $RPM_BUILD_ROOT
 %endif # xcb
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xshm.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xv.so
-%{!?no_xvmc:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so}
+%if 0%{?_enable_xvmc:1}
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so
+%endif
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so
 
 %if 0%{?_with_pa:1}