From 08481795c603c1ad048890e0dcd6d7475606993a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 21 Jun 2010 18:15:18 +0000 Subject: [PATCH] more el-6 fixes --- xine-lib.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 0a2749f..75e873d 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -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)" SDL_LIBS="$(sdl-config --libs)" --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}