From 8a1dd4f6d7128d5767395cff668816f6cf4aaf1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 8 Apr 2007 18:09:47 +0000 Subject: [PATCH] Order/expand all plugins in %files, don't ship empty vidix dir. --- xine-lib.spec | 153 ++++++++++++++++++++++++++++++-------------------- 1 file changed, 92 insertions(+), 61 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index a46faaa..4530cdb 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -2,6 +2,11 @@ # - libstk: http://www.libstk.net/ %define codecdir %{_libdir}/codecs +%ifarch %{ix86} +%define have_vidix 1 +%else +%define have_vidix 0 +%endif Summary: Xine library Name: xine-lib @@ -199,72 +204,94 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/xine/ %dir %{_libdir}/xine/plugins/ %dir %{_libdir}/xine/plugins/%{version}/ -# I list all the plugins because I don't want a non-free plugin -# to sneak into a future version +# Listing every plugin separately for better control over binary packages +# containing exactly the plugins we want, nothing accidentally snuck in +# nor dropped. +%dir %{_libdir}/xine/plugins/%{version}/post/ +%{_libdir}/xine/plugins/%{version}/post/xineplug_post_audio_filters.so +%{_libdir}/xine/plugins/%{version}/post/xineplug_post_goom.so +%{_libdir}/xine/plugins/%{version}/post/xineplug_post_mosaico.so +%{_libdir}/xine/plugins/%{version}/post/xineplug_post_switch.so +%{_libdir}/xine/plugins/%{version}/post/xineplug_post_visualizations.so +%if %{have_vidix} +%dir %{_libdir}/xine/plugins/%{version}/vidix/ +%{_libdir}/xine/plugins/%{version}/vidix/cyberblade_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/mach64_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/mga_crtc2_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/mga_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/nvidia_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/pm2_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/pm3_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/radeon_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/rage128_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/savage_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/sis_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/unichrome_vid.so +%endif %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so -%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_oss.so -%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_fb.so %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_none.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_opengl.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so +%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so +%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_oss.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_bitplane.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_lpcm.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so +%ifarch %ix86 +%{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so +%endif +%{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_real_audio.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_spudvb.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so +%ifarch %ix86 +%{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so +%endif +%{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_fli.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_flv.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_games.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_iff.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_image.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_matroska.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_mng.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_nsv.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_ogg.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_pva.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_qt.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_rawdv.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_real.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_sputext.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_yuv_frames.so +%{_libdir}/xine/plugins/%{version}/xineplug_flac.so +%{_libdir}/xine/plugins/%{version}/xineplug_inp_cdda.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_dvb.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_v4l.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_file.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_http.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_net.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_pnm.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_cdda.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_stdin_fifo.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtsp.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_pvr.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_rtp.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_bitplane.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_lpcm.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_real_audio.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_spudvb.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_yuv_frames.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_real.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_iff.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_flv.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_image.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_matroska.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_ogg.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_fli.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_nsv.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_mng.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_pva.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_qt.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_rawdv.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_sputext.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_games.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so -%{_libdir}/xine/plugins/%{version}/xineplug_flac.so -%{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so -%ifarch %ix86 +%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtsp.so +%{_libdir}/xine/plugins/%{version}/xineplug_inp_stdin_fifo.so +%{_libdir}/xine/plugins/%{version}/xineplug_inp_v4l.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_fb.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_none.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_opengl.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so +%if %{have_vidix} %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so %endif -%ifnarch ppc64 s390 s390x -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so -%endif -%{_libdir}/xine/plugins/%{version}/post/ -%{_libdir}/xine/plugins/%{version}/vidix/ +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so +%{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so %files extras @@ -273,20 +300,20 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so -%if 0%{?_with_caca:1} -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so -%endif %if 0%{!?_without_imagemagick:1} %{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so %endif +%{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so +%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so +%if 0%{?_with_caca:1} +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so +%endif %if 0%{!?_without_directfb:1} %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so %endif +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so %files devel @@ -302,6 +329,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Apr 8 2007 Ville Skyttä +- Exclude vidix dir on systems that don't have vidix. +- Specfile cleanups. + * Mon Mar 26 2007 Ville Skyttä - 1.1.4-4 - Add PulseAudio support (in -extras, #234035/Jost Diederichs). - Adjust Samba build dependencies to work for both <= and > FC6.