rpms/xine-lib/F-13 xine-lib.spec,1.85,1.86

Mon Jul 19 17:18:19 UTC 2010

Author: rdieter

Update of /cvs/pkgs/rpms/xine-lib/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4118

Modified Files:
	xine-lib.spec 
Log Message:
sync w/devel , for arm fix mostly



Index: xine-lib.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xine-lib/F-13/xine-lib.spec,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -p -r1.85 -r1.86

--- xine-lib.spec	8 Mar 2010 14:53:04 -0000	1.85
+++ xine-lib.spec	19 Jul 2010 17:18:18 -0000	1.86
@@ -13,29 +13,38 @@
 %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}
-%define with_xcb    %{?_without_xcb:0}%{!?_without_xcb:1}
 %else
 %define with_aalib  %{?_with_aalib:1}%{!?_with_aalib:0}
-%define with_pa     %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0}
-%define with_xcb    %{?_with_xcb:1}%{!?_with_xcb:0}
 %endif # Fedora
 
+%define _enable_xvmc --enable-xvmc
+%if 0%{?rhel} > 5
+%ifarch ppc64
+%undefine _enable_xvmc
+%endif
+%endif
+
+%ifarch %{arm} 
+%define _without_directfb 1
+%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
 
 Summary:        A multimedia engine 
 Name:           xine-lib
 Version:        1.1.18.1
-Release:        1%{?dist}
+Release:        3%{?dist}
 License:        GPLv2+
 Group:          System Environment/Libraries
 URL:            http://www.xine-project.org/ 
@@ -68,12 +77,12 @@ 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
 %endif
-%if %{with_xcb}
+%if 0%{?_with_xcb:1}
 BuildRequires:  libxcb-devel
 %endif # xcb
 # Video
@@ -101,7 +110,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
@@ -168,7 +177,9 @@ This package contains extra plugins for 
   - EsounD
   - JACK
   - GDK-Pixbuf
-  - GNOME VFS
+%if ! 0%{?_disable_gnomevfs:1}
+   - GNOME VFS
+%endif
   - SMB
   - SDL
 %if %{with_aalib}
@@ -217,6 +228,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 \
@@ -364,12 +376,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
@@ -378,17 +392,19 @@ rm -rf $RPM_BUILD_ROOT
 %if %{have_vidix}
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so
 %endif # vidix
-%if %{with_xcb}
+%if 0%{?_with_xcb:1}
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbshm.so
 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbxv.so
 %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,-)
@@ -396,7 +412,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,-)
@@ -437,6 +452,12 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 19 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.18.1-3
+- no directfb on arm (yet)
+
+* Tue Jun  1 2010 Ville Skyttä <ville.skytta at iki.fi> - 1.1.18.1-2
+- Rebuild.
+
 * Sun Mar 07 2010 Rex Dieter <rdieter at fedoraproject.org> - 1.1.18.1-1
 - xine-lib-1.1.18.1
 
@@ -539,10 +560,10 @@ rm -rf $RPM_BUILD_ROOT
 * Thu Apr 24 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.12-2
 - CVE-2008-1878
 
-* Wed Apr 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.12-1
+* Wed Apr 16 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.12-1
 - 1.1.12 (plugin ABI 1.21); qt, mkv, and pulseaudio patches applied upstream.
 
-* Wed Apr  9 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-3
+* Wed Apr  9 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-3
 - Apply upstream fixes for Quicktime (#441705) and Matroska regressions
   introduced in 1.1.11.1.
 
@@ -550,12 +571,12 @@ rm -rf $RPM_BUILD_ROOT
 - pulse-rework2 patch (#439731)
 - -pulseaudio subpkg (#439731)
 
-* Sun Mar 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-1
+* Sun Mar 30 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11.1-1
 - 1.1.11.1 (security update, #438663, CVE-2008-1482).
 - Provide versioned xine-lib(plugin-abi) so 3rd party packages installing
   plugins can use it instead of requiring a version of xine-lib.
 
-* Wed Mar 19 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11-1
+* Wed Mar 19 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.11-1
 - 1.1.11 (security update, #438182, CVE-2008-0073).
 - Drop jack and wavpack build conditionals.
 - Specfile cleanups.
@@ -563,37 +584,37 @@ rm -rf $RPM_BUILD_ROOT
 * Fri Mar  7 2008 Rex Dieter <rdieter at fedoraproject.org> - 1.1.10.1-1.1
 - xcb support for f7+ (#373411)
 
-* Fri Feb  8 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10.1-1
+* Fri Feb  8 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10.1-1
 - 1.1.10.1 (security update, #431541).
 
-* Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-2
+* Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-2
 - Include spu, spucc, and spucmml decoders (#213597).
 
-* Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-1
+* Sun Jan 27 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.10-1
 - 1.1.10 (security update).
 
-* Mon Jan 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-3
+* Mon Jan 21 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-3
 - Fix version number in libxine.pc (#429487).
 
-* Sun Jan 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-2
+* Sun Jan 20 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-2
 - Disable upstream "discard buffers on ao close" 1.1.9 changeset (#429182).
 
-* Sat Jan 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-1
+* Sat Jan 12 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9.1-1
 - 1.1.9.1 (security update).
 
-* Sun Jan  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9-1
+* Sun Jan  6 2008 Ville Skyttä <ville.skytta at iki.fi> - 1.1.9-1
 - 1.1.9.
 
-* Thu Sep 27 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-6
+* Thu Sep 27 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-6
 - Enable wavpack support by default for all distros.
 
-* Sun Sep 23 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-5
+* Sun Sep 23 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-5
 - Enable JACK support by default for all distros.
 
-* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-4
+* Wed Sep 19 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-4
 - Fix "--without wavpack" build.
 
-* Sat Sep 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-3
+* Sat Sep 15 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-3
 - Move XCB plugins to the main package.
 - Make aalib, caca, pulseaudio, jack, and wavpack support optional at build
   time in preparation for the first EPEL build.
@@ -602,63 +623,63 @@ rm -rf $RPM_BUILD_ROOT
 - remove the dependency from -extras to -arts, and use Obsoletes to
   provide an upgrade path
 
-* Thu Aug 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-1
+* Thu Aug 30 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.8-1
 - 1.1.8, "open" patch applied upstream.
 - Build XCB plugins by default for Fedora 8+ only.
 
 * Sat Aug 25 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.7-3
 - Split the aRts plugin into its own subpackage
 
-* Tue Aug 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-2
+* Tue Aug 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-2
 - Include XCB output plugins (in -extras at least for now).
 - Protect "open" with glibc 2.6.90 and -D_FORTIFY_SOURCE=2.
 - Clean up %%configure options.
 - License: GPLv2+
 
-* Thu Jun  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-1
+* Thu Jun  7 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.7-1
 - 1.1.7.
 
 * Wed Jun 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 1.1.6-3
 - respin (for libmpcdec)
 
-* Wed Apr 25 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.6-2
+* Wed Apr 25 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.6-2
 - Make Real codec search path /usr/lib(64)/codecs again (#237743).
 
-* Wed Apr 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.6-1
+* Wed Apr 18 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.6-1
 - 1.1.6.
 
-* Wed Apr 11 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.5-1
+* Wed Apr 11 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.5-1
 - 1.1.5.
 - Include GSM 06.10 decoder (#228186).
 - Re-enable CACA support.
 
-* Sun Apr  8 2007 Ville Skyttä <ville.skytta at iki.fi>
+* Sun Apr  8 2007 Ville Skyttä <ville.skytta at iki.fi>
 - Exclude vidix dir on systems that don't have vidix.
 - Specfile cleanups.
 
-* Mon Mar 26 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-4
+* Mon Mar 26 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-4
 - Add PulseAudio support (in -extras, #234035/Jost Diederichs).
 - Adjust Samba build dependencies to work for both <= and > FC6.
 - Add --with freetype and --with antialiasing build time options,
   default disabled, and an upstream patch for FreeType memory leak (#233194).
 
-* Sat Mar 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-3
+* Sat Mar 10 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-3
 - Apply upstream fix for CVE-2007-1246.
 
-* Wed Feb 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-2
+* Wed Feb 14 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-2
 - Rebuild.
 
-* Wed Jan 31 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-1
+* Wed Jan 31 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.4-1
 - 1.1.4, with wavpack and system libmpcdec support.
 
 * Thu Jan 18 2007 Aurelien Bompard <abompard at fedoraproject.org> 1.1.3-4
 - rebuild
 
-* Wed Jan  3 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-3
+* Wed Jan  3 2007 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-3
 - Fix libflac decoder with FLAC < 1.1.3 (#220961).
 - Apply upstream patch for FLAC >= 1.1.3.
 
-* Sun Dec 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-2
+* Sun Dec 17 2006 Ville Skyttä <ville.skytta at iki.fi> - 1.1.3-2
 - Don't run autotools during build.
 
 * Mon Dec 04 2006 Aurelien Bompard <abompard at fedoraproject.org> 1.1.3-1

