From 3843e1c31bc7ea855f1687176162e954d7d48fc8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:58:08 -0600 Subject: [PATCH 1/5] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 7bd8afb..40ec7b2 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -26,7 +26,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.20.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -373,6 +373,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 14 2012 Fedora Release Engineering - 1.1.20.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild + * Tue Jan 03 2012 Kevin Kofler 1.1.20.1-1 - update to 1.1.20.1 (bugfix release) - drop upstreamed link-libdvdread patch From 069aba18f74f62bf2f27b3fc35bf191ede1b0e03 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 10 Mar 2012 08:16:20 -0600 Subject: [PATCH 2/5] rebuild (ImageMagick) --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 40ec7b2..51128a8 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -26,7 +26,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.20.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -373,6 +373,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Mar 10 2012 Rex Dieter 1.1.20.1-3 +- rebuild (ImageMagick) + * Sat Jan 14 2012 Fedora Release Engineering - 1.1.20.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild From 50ba62cfcd6d8622b4f6840b4b683efe2df3318d Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sat, 23 Jun 2012 12:01:23 +0200 Subject: [PATCH 3/5] Update to 1.1.21, enable libbluray support * Tue Jun 12 2012 Xavier Bachelot 1.1.21-1 - Update to 1.1.21. - Enable libbluray support. --- .gitignore | 1 + sources | 2 +- xine-lib.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cd0f87f..6f9a840 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xine-lib-1.1.19-autotools.patch.bz2 xine-lib-1.1.19-pruned.tar.bz2 /xine-lib-1.1.20-pruned.tar.xz /xine-lib-1.1.20.1-pruned.tar.xz +/xine-lib-1.1.21-pruned.tar.xz diff --git a/sources b/sources index d1fab77..cce5cd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -46d9f91395feb50237ac385aa6654b26 xine-lib-1.1.20.1-pruned.tar.xz +121b82650df35c7d701586889edc9aab xine-lib-1.1.21-pruned.tar.xz diff --git a/xine-lib.spec b/xine-lib.spec index 51128a8..54d791b 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -25,8 +25,8 @@ Summary: A multimedia engine Name: xine-lib -Version: 1.1.20.1 -Release: 3%{?dist} +Version: 1.1.21 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -90,6 +90,7 @@ BuildRequires: gtk2-devel BuildRequires: libsmbclient-devel BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel +BuildRequires: libbluray-devel # Dropped in Fedora 9 Obsoletes: xine-lib-arts < %{version}-%{release} @@ -311,6 +312,7 @@ rm -rf $RPM_BUILD_ROOT %{_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_flac.so +%{_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_file.so @@ -373,6 +375,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jun 12 2012 Xavier Bachelot 1.1.21-1 +- Update to 1.1.21. +- Enable libbluray support. + * Sat Mar 10 2012 Rex Dieter 1.1.20.1-3 - rebuild (ImageMagick) From ad948d47c8744b87933139840d6fcf8f268de682 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 23 Jun 2012 05:32:58 -0500 Subject: [PATCH 4/5] s/pulseaudio-lib-devel/pkgconfig(libpulse)/ or use pulseaudio-libs-devel these days, that old name was deprecated long ago --- xine-lib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 54d791b..17aedfa 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -79,13 +79,13 @@ BuildRequires: jack-audio-connection-kit-devel BuildRequires: libmodplug-devel BuildRequires: libmpcdec-devel BuildRequires: libvorbis-devel -BuildRequires: pulseaudio-lib-devel BuildRequires: speex-devel BuildRequires: wavpack-devel # CDs BuildRequires: libcdio-devel # Other BuildRequires: pkgconfig +BuildRequires: pkgconfig(libpulse) BuildRequires: gtk2-devel BuildRequires: libsmbclient-devel BuildRequires: libdvdnav-devel From 7537d5e2da03a62eef237d576b2fd9cb397c27a6 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 16 Jul 2012 21:50:44 +0200 Subject: [PATCH 5/5] - do not remove DVD plugin, not encumbered (only uses libdvdread/libdvdnav) * Mon Jul 16 2012 Kevin Kofler 1.1.21-2 - do not remove DVD plugin, not encumbered (only uses libdvdread/libdvdnav) It makes no sense to remove the DVD input plugin when: * the libdvd* libraries which do all the actual work are in Fedora, * GStreamer also ships the exact equivalent functionality in Fedora and * we are now shipping the BluRay input plugin in Fedora. The DVD input plugin does not include nor depend on any decoding or decryption code, it only wraps the libdvdread and libdvdnav libraries. (The same goes for the BluRay plugin, except libbluray is used there.) --- sources | 2 +- xine-lib-cleanup-sources.sh | 5 ++++- xine-lib.spec | 9 ++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sources b/sources index cce5cd6..fd1b3c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -121b82650df35c7d701586889edc9aab xine-lib-1.1.21-pruned.tar.xz +1568a378a732bd9b69d418674ad4165c xine-lib-1.1.21-pruned.tar.xz diff --git a/xine-lib-cleanup-sources.sh b/xine-lib-cleanup-sources.sh index 6a1aa82..a250800 100755 --- a/xine-lib-cleanup-sources.sh +++ b/xine-lib-cleanup-sources.sh @@ -44,7 +44,10 @@ for remove in ffmpeg; do rmpluglib combined ffmpeg done # Input plugins -for p in dvd vcd mms; do +# DVD reading (dvd input plugin) has now been in Fedora for a while (libdvdread, +# libdvdnav), the xine-lib code only wraps those libraries. (Decrypting and +# decoding are of course still separate and forbidden in Fedora.) +for p in vcd mms; do echo "removing $p input plugin..." # Remove sources for sourcefile in `awk '/^xineplug_inp_'$p'_la_SOURCES/ { $1=""; $2=""; print $0}' src/input/Makefile.am`; do diff --git a/xine-lib.spec b/xine-lib.spec index 17aedfa..2f2352c 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -26,7 +26,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.21 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -47,6 +47,9 @@ Patch9: xine-lib-1.1.16.2-multilib.patch Provides: xine-lib(plugin-abi) = %{plugin_abi} %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} +# DVD plugin moved from there +Conflicts: xine-lib-extras-freeworld < 1.1.21-3 + BuildRequires: autoconf automake libtool # X11 BuildRequires: libX11-devel @@ -315,6 +318,7 @@ rm -rf $RPM_BUILD_ROOT %{_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_net.so @@ -375,6 +379,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 16 2012 Kevin Kofler 1.1.21-2 +- do not remove DVD plugin, not encumbered (only uses libdvdread/libdvdnav) + * Tue Jun 12 2012 Xavier Bachelot 1.1.21-1 - Update to 1.1.21. - Enable libbluray support.