[xine-lib] - do not remove DVD plugin, not encumbered (only uses libdvdread/libdvdnav)

[Kevin Kofler]

commit 7537d5e2da03a62eef237d576b2fd9cb397c27a6
Author: Kevin Kofler <kevin.kofler at chello.at>
Date:   Mon Jul 16 21:50:44 2012 +0200

    - do not remove DVD plugin, not encumbered (only uses libdvdread/libdvdnav)
    
    * Mon Jul 16 2012 Kevin Kofler <Kevin at tigcc.ticalc.org> 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 <Kevin at tigcc.ticalc.org> 1.1.21-2
+- do not remove DVD plugin, not encumbered (only uses libdvdread/libdvdnav)
+
 * Tue Jun 12 2012 Xavier Bachelot <xavier at bachelot.org> 1.1.21-1
 - Update to 1.1.21.
 - Enable libbluray support.