From da58f27df9a7e59cbe69636eba16211bced0f0b4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 26 Aug 2014 14:49:56 -0500 Subject: [PATCH] 1.1.21-10 - add conditionals to support el5/el6, fix/cleanup other conditionals - omit libmodplug support (for now, FTBFS) --- xine-lib.spec | 97 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 84 insertions(+), 13 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 8365d82..1930e7d 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -11,6 +11,14 @@ %define have_vidix 0 %endif # ix86 +%if 0%{?fedora} +%define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1} +# FIXME: libmodplug-0.8.8.5-1 regressed (pkgconfig --cflags dropped -I/usr/include/libmodplug), and now FTBFS +#define _enable_modplug --enable-modplug +%else +%define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} +%endif # Fedora + %ifarch %{arm} %define _without_directfb 1 %endif @@ -31,10 +39,25 @@ %define _without_directfb 1 %endif +%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 1 +%define _with_smbclient 1 +%endif + Summary: A multimedia engine Name: xine-lib Version: 1.1.21 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -65,23 +88,27 @@ BuildRequires: autoconf 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 0%{?_with_xcb} BuildRequires: libxcb-devel +%endif # Video BuildRequires: SDL-devel BuildRequires: libtheora-devel BuildRequires: libmng-devel +%if %{with_aalib} BuildRequires: aalib-devel >= 1.4 +%endif # aalib BuildRequires: libcaca-devel >= 0.99-0.5.beta14 %if 0%{!?_without_directfb:1} BuildRequires: directfb-devel %endif # directfb BuildRequires: ImageMagick-devel >= 6.2.4.6-1 -%if 0%{?_with_freetype:1} BuildRequires: fontconfig-devel -%endif # freetype # Audio BuildRequires: alsa-lib-devel >= 0.9.0 %if 0%{!?_without_esound:1} @@ -89,7 +116,9 @@ BuildRequires: esound-devel %endif # esound BuildRequires: flac-devel BuildRequires: jack-audio-connection-kit-devel +%if 0%{?_enable_modplug:1} BuildRequires: libmodplug-devel +%endif BuildRequires: libmpcdec-devel BuildRequires: libvorbis-devel BuildRequires: speex-devel @@ -98,21 +127,29 @@ BuildRequires: wavpack-devel BuildRequires: libcdio-devel # Other BuildRequires: pkgconfig +%if 0%{?_with_pa} BuildRequires: pkgconfig(libpulse) +%endif BuildRequires: gtk2-devel -BuildRequires: libsmbclient-devel +%if 0%{?_with_smbclient} +BuildRequires: pkgconfig(smbclient) +%endif BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel %if 0%{?bluray} BuildRequires: libbluray-devel %endif +%if 0%{?_without_arts:1} # Dropped in Fedora 9 Obsoletes: xine-lib-arts < %{version}-%{release} +%endif # Included in main package since Fedora 12 +%if 0%{?fedora} > 11 Obsoletes: xine-lib-pulseaudio < 1.1.16.3-5 Provides: xine-lib-pulseaudio = %{version}-%{release} +%endif %description This package contains the Xine library. It can be used to play back @@ -143,13 +180,28 @@ This package contains extra plugins for %{name}: - GDK-Pixbuf - SMB - SDL +%if %{with_aalib} - AA-lib +%endif # aalib - Libcaca - Image decoding %if 0%{!?_without_directfb:1} - DirectFB output %endif # directfb +%if ! 0%{?_without_arts:1} +%package arts +Summary: aRts plugin for %{name} +Group: System Environment/Libraries +BuildRequires: arts-devel +Requires: %{name}%{?_isa} = %{version}-%{release} +#Requires: xine-lib(plugin-abi) = %{plugin_abi} +# -arts was split off the -extras subpackage at 1.1.7-3 +Obsoletes: xine-lib-extras < 1.1.7-3 +%description arts +This package contains the aRts plugin for %{name}. +%endif + %prep %setup -q @@ -176,32 +228,29 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %if 0%{!?_without_directfb:1} --enable-directfb \ %endif # directfb - --enable-v4l \ - --enable-libv4l \ - --enable-xvmc \ + %{?_enable_modplug}%{!?_enable_modplug:--disable-modplug} \ + %{?_enable_v4l}%{!?_enable_v4l:--disable-v4l --disable-libv4l} \ + %{?_enable_xvmc}%{!?_enable_xvmc:--disable-xvmc} \ --disable-gnomevfs \ --disable-a52dec \ --disable-mad \ --disable-vcd \ --disable-asf \ --disable-faad \ -%if 0%{?_with_freetype:1} -%if 0%{?_with_antialiasing:1} --enable-antialiasing \ -%endif # antialiasing --with-freetype \ --with-fontconfig \ -%endif # freetype --with-caca \ --with-external-ffmpeg \ --with-external-dvdnav \ + %{?_with_xcb:--with-xcb}%{!?with_xcb:--without-xcb} \ --with-xv-path=%{_libdir} \ --with-libflac \ --with-external-libmpcdec \ - --without-arts \ %if 0%{?_without_esound:1} --without-esound \ %endif + %{!?_without_arts:--with-arts} %{?_without_arts} \ --with-wavpack \ --with-real-codecs-path=%{codecdir} \ --with-w32-path=%{codecdir} @@ -280,7 +329,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_file.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_none.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_oss.so +%if 0%{?_with_pa:1} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so +%endif %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_bitplane.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gsm610.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so @@ -341,11 +392,13 @@ rm -rf $RPM_BUILD_ROOT %{_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} %if ! 0%{?_disable_v4l1:1} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so %endif %{_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 @@ -354,14 +407,24 @@ rm -rf $RPM_BUILD_ROOT %if %{have_vidix} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so %endif # vidix +%if 0%{?_with_xcb} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbshm.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbxv.so +%endif %{_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 0%{!?_without_arts:1} +%files arts +%defattr(-,root,root,-) +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_arts.so +%endif + %files extras %defattr(-,root,root,-) %if 0%{!?_without_esound:1} @@ -370,8 +433,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_jack.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gdk_pixbuf.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so +%if 0%{?_with_smbclient} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so +%endif +%if %{with_aalib} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_aa.so +%endif # aalib %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_caca.so %if 0%{!?_without_directfb:1} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_directfb.so @@ -394,6 +461,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 26 2014 Rex Dieter - 1.1.21-10 +- add conditionals to support el5/el6, fix/cleanup other conditionals +- omit libmodplug support (for now, FTBFS) + * Sat Aug 31 2013 Till Maas - 1.1.21-9 - Disable directfb support for Fedora 20 and newer, because it was retired