commit d4580ead564218439dff0f21b41d5d03a73534ca Author: Xavier Bachelot <xavier(a)bachelot.org&gt; Date: Tue Feb 21 20:15:35 2017 +0100 Update to 1.2.8 .gitignore | 1 + ffmpeg_2.9.patch | 73 ---------------------------------------- sources | 2 +- xine-lib-1.1.16.2-multilib.patch | 16 --------- xine-lib-link-xcb.patch | 36 -------------------- xine-lib.spec | 69 ++++++++++++------------------------- 6 files changed, 23 insertions(+), 174 deletions(-) --- diff --git a/.gitignore b/.gitignore index e6fbd0c..85fc798 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ xine-lib-1.2.6.tar.xz +/xine-lib-1.2.8.tar.xz diff --git a/sources b/sources index c24b16d..6112027 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -02ee3c2380273989b4b016903209e05e xine-lib-1.2.6.tar.xz +427cc4568632eea725d5169a4a50ff22 xine-lib-1.2.8.tar.xz diff --git a/xine-lib.spec b/xine-lib.spec index b41680f..f07a338 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,4 +1,4 @@ -%global plugin_abi 2.5 +%global plugin_abi 2.6 %global codecdir %{_libdir}/codecs %ifarch %{ix86} @@ -9,16 +9,11 @@ Summary: A multimedia engine Name: xine-lib -Version: 1.2.6 -Release: 14%{?dist} +Version: 1.2.8 +Release: 1%{?dist} License: GPLv2+ URL: http://www.xine-project.org/ -Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz - -# http://bugzilla.redhat.com/477226 -Patch1: xine-lib-1.1.16.2-multilib.patch -Patch2: ffmpeg_2.9.patch -Patch3: xine-lib-link-xcb.patch +Source0: https://%{name}.alioth.debian.org/releases/%{name}-%{version}.tar.xz Provides: xine-lib(plugin-abi) = %{plugin_abi} %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} @@ -26,8 +21,6 @@ Provides: xine-lib(plugin-abi) = %{plugin_abi} Obsoletes: xine-lib-extras-freeworld < 1.1.21-10 Provides: xine-lib-extras-freeworld = %{version}-%{release} -BuildRequires: gawk -BuildRequires: sed BuildRequires: gettext-devel # X11 BuildRequires: libX11-devel @@ -71,7 +64,8 @@ BuildRequires: libcdio-devel BuildRequires: vcdimager-devel >= 0.7.23 BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel -BuildRequires: libbluray-devel +# libbluray is too old on EL6 +%{!?el6:BuildRequires: libbluray-devel} # Other BuildRequires: pkgconfig BuildRequires: pkgconfig(libpulse) @@ -109,9 +103,6 @@ This package contains extra plugins for %{name}: %prep %setup -q -%patch1 -p1 -b .multilib -%patch2 -p1 -b .ffmpeg_2.9 -%patch3 -p1 -b .xcb autoreconf -i @@ -156,7 +147,7 @@ rm -rf $RPM_BUILD_ROOT%{_docdir}/xine-lib # Removing useless files rm -Rf $RPM_BUILD_ROOT%{_libdir}/libxine*.la __docs/README \ - __docs/README.{freebsd,irix,solaris,MINGWCROSS,WIN32} + __docs/README.{freebsd,irix,macosx,solaris,MINGWCROSS,WIN32} # Directory for binary codecs mkdir -p $RPM_BUILD_ROOT%{codecdir} @@ -168,9 +159,9 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir} %files -f libxine2.lang -%doc AUTHORS COPYING COPYING.LIB CREDITS ChangeLog* README TODO +%doc AUTHORS CREDITS ChangeLog* README TODO %doc __docs/README.* __docs/faq.* -%doc doc/README.dxr3 doc/README.network_dvd +%license COPYING COPYING.LIB %dir %{codecdir}/ %{_datadir}/xine-lib/ %{_libdir}/libxine.so.* @@ -206,12 +197,9 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir} %{_libdir}/xine/plugins/%{plugin_abi}/vidix/unichrome_vid.so %endif # vidix %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_alsa.so -%{_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 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_a52.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_bitplane.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_dts.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_dvaudio.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_dxr3_spu.so @@ -228,54 +216,34 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir} %ifarch %{ix86} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_qt.so %endif # ix86 +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_rawvideo.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_real.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_rgb.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spu.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucc.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spucmml.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spudvb.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_spuhdmv.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vdpau_h264.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vdpau_h264_alter.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vdpau_mpeg12.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vdpau_mpeg4.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vdpau_vc1.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vdpau.so %ifarch %{ix86} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_w32dll.so %endif # ix86 -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_yuv.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_audio.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_asf.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_avi.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_fli.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_flv.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_games.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_iff.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_image.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_matroska.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mng.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_modplug.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_block.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_elem.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_pes.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_mpeg_ts.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_nsv.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_playlist.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_pva.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_qt.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_rawdv.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_real.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_slave.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_vc1_es.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv_frames.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv4mpeg2.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_video.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_flac.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_bluray.so +%{!?el6:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_bluray.so} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_cdda.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvb.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvd.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_file.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_http.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_mms.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_net.so @@ -283,7 +251,7 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir} %{_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 +%{?el6:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_vcd.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_vcdo.so @@ -292,7 +260,6 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vdr.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_dxr3.so %{_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 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl2.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_raw.so @@ -315,7 +282,6 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gdk_pixbuf.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_test.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_aa.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_caca.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_sdl.so @@ -334,6 +300,13 @@ mkdir -p $RPM_BUILD_ROOT%{codecdir} %changelog +* Tue Feb 21 2017 Xavier Bachelot <xavier(a)bachelot.org&gt; 1.2.8-1 +- Update to 1.2.8. +- All patches are now upstream, remove them. +- Use %%license. +- Fix building on EL6. +- Drop now obsolete BR: gawk and sed. + * Fri Nov 18 2016 Adrian Reber <adrian(a)lisas.de&gt; - 1.2.6-14 - Rebuilt for libcdio-0.94