Merge branch 'master' of ssh://pkgs.fedoraproject.org/xine-lib into f16

.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

sources

@@ -1 +1 @@
-46d9f91395feb50237ac385aa6654b26  xine-lib-1.1.20.1-pruned.tar.xz
+1568a378a732bd9b69d418674ad4165c  xine-lib-1.1.21-pruned.tar.xz

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

xine-lib.spec

@@ -25,8 +25,8 @@
 
 Summary:        A multimedia engine
 Name:           xine-lib
-Version:        1.1.20.1
-Release:        1%{?dist}
+Version:        1.1.21
+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
@@ -79,17 +82,18 @@ 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
 BuildRequires:  libdvdread-devel
+BuildRequires:  libbluray-devel
 
 # Dropped in Fedora 9
 Obsoletes:      xine-lib-arts < %{version}-%{release}
@@ -311,8 +315,10 @@ 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_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
@@ -373,6 +379,19 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul 16 2012 Kevin Kofler <Kevin@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@bachelot.org> 1.1.21-1
+- Update to 1.1.21.
+- Enable libbluray support.
+
+* Sat Mar 10 2012 Rex Dieter <rdieter@fedoraproject.org> 1.1.20.1-3
+- rebuild (ImageMagick)
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1.20.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
 * Tue Jan 03 2012 Kevin Kofler <Kevin@tigcc.ticalc.org> 1.1.20.1-1
 - update to 1.1.20.1 (bugfix release)
 - drop upstreamed link-libdvdread patch