rpms/xine-lib/devel xine-lib.spec,1.89,1.90
Rex Dieter
rdieter at fedoraproject.org
Mon Jun 21 19:22:44 UTC 2010
Author: rdieter
Update of /cvs/pkgs/rpms/xine-lib/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv28754
Modified Files:
xine-lib.spec
Log Message:
sync changes from EL-6 branch
Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/devel/xine-lib.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- xine-lib.spec 21 Jun 2010 17:20:33 -0000 1.89
+++ xine-lib.spec 21 Jun 2010 19:22:43 -0000 1.90
@@ -13,21 +13,27 @@
%endif # ix86
%if 0%{?fedora}
-%define _enable_v4l --enable-v4l --enable-libv4l
%define _disable_gnomevfs --disable-gnomevfs
%define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1}
-%define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
%else
%define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0}
-%define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
%endif # Fedora
-%if 0%{?fedora} || 0%{?rhel} > 5
-%define _without_arts --without-art
-%define _with_xcb %{?_without_xcb:0}%{!?_without_xcb:1}
+%define _enable_xvmc --enable-xvmc
+%if 0%{?rhel} > 5
+%ifarch ppc64
+%undefine _enable_xvmc
+%endif
+%endif
+
+%if 0%{?fedora} > 8 || 0%{?rhel} > 5
+%define _enable_v4l --enable-v4l --enable-libv4l
+%define _without_arts --without-arts
+%define _with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1}
+%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
@@ -67,7 +73,7 @@ BuildRequires: automake libtool
BuildRequires: libX11-devel
BuildRequires: libXv-devel
BuildRequires: libXinerama-devel
-BuildRequires: libXvMC-devel
+%{?_enable_xvmc:BuildRequires: libXvMC-devel}
BuildRequires: libGLU-devel
%if 0%{?_enable_v4l:1}
BuildRequires: libv4l-devel
@@ -100,7 +106,7 @@ BuildRequires: jack-audio-connection-ki
BuildRequires: libmodplug-devel
BuildRequires: libmpcdec-devel
BuildRequires: libvorbis-devel
-%if %{with_pa}
+%if 0%{?_with_pa:1}
BuildRequires: pulseaudio-lib-devel
%endif # pa
BuildRequires: speex-devel
@@ -167,9 +173,7 @@ This package contains extra plugins for
- EsounD
- JACK
- GDK-Pixbuf
-%if ! 0%{?_disable_gnomevfs:1}
- GNOME VFS
-%endif
- SMB
- SDL
%if %{with_aalib}
@@ -218,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 \
@@ -365,12 +370,14 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_http.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_net.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pnm.so
-%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtp.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so
+%if 0%{?_enable_v4l:1}
+%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so
+%endif
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_none.so
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl.so
@@ -385,11 +392,13 @@ 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
+%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 %{with_pa}
+%if 0%{?_with_pa:1}
%if ! 0%{?pa_in_main}
%files pulseaudio
%defattr(-,root,root,-)
@@ -397,7 +406,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so
%endif
-
%if 0%{!?_without_arts:1}
%files arts
%defattr(-,root,root,-)
More information about the scm-commits
mailing list