diff --git a/.gitignore b/.gitignore index 9d21c9b..6f9a840 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,5 @@ -xine-lib-1.1.18.1-autotools.patch.bz2 -xine-lib-1.1.18.1-pruned.tar.bz2 +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 cf9ff04..fd1b3c5 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -e2c45d451fd9d8ad3be680237ff5bcdf xine-lib-1.1.18.1-autotools.patch.bz2 -55de212f416d9d366cad7520ccd7a539 xine-lib-1.1.18.1-pruned.tar.bz2 +1568a378a732bd9b69d418674ad4165c xine-lib-1.1.21-pruned.tar.xz diff --git a/xine-lib-1.1.1-deepbind-939.patch b/xine-lib-1.1.1-deepbind-939.patch deleted file mode 100644 index b04400b..0000000 --- a/xine-lib-1.1.1-deepbind-939.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- xine-lib-1.1.1/src/xine-engine/load_plugins.c.~1~ 2005-09-19 09:14:02.000000000 -0700 -+++ xine-lib-1.1.1/src/xine-engine/load_plugins.c 2006-04-22 23:07:33.000000000 -0700 -@@ -591,7 +591,7 @@ static void collect_plugins(xine_t *this - printf("load_plugins: %s not cached\n", str); - #endif - -- if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL)) == NULL) { -+ if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)) == NULL) { - const char *error = dlerror(); - /* too noisy -- but good to catch unresolved references */ - xprintf(this, XINE_VERBOSITY_LOG, -@@ -649,7 +649,7 @@ static int _load_plugin_class(xine_t *th - /* load the dynamic library if needed */ - if (!node->file->lib_handle) { - lprintf("dlopen %s\n", filename); -- if ((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL)) == NULL) { -+ if ((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)) == NULL) { - const char *error = dlerror(); - - xine_log (this, XINE_LOG_PLUGIN, diff --git a/xine-lib-1.1.19-no_autopoint.patch b/xine-lib-1.1.19-no_autopoint.patch new file mode 100644 index 0000000..d5ee0cd --- /dev/null +++ b/xine-lib-1.1.19-no_autopoint.patch @@ -0,0 +1,17 @@ +diff -up xine-lib-1.1.17/autogen.sh.no_autopoint xine-lib-1.1.17/autogen.sh +--- xine-lib-1.1.17/autogen.sh.no_autopoint 2009-10-09 09:33:31.000000000 -0500 ++++ xine-lib-1.1.17/autogen.sh 2009-12-02 09:15:48.534555467 -0600 +@@ -229,10 +229,10 @@ run_aclocal () { + echo + fi + +- echo $_echo_n " + Running autopoint: $_echo_c" ++ #echo $_echo_n " + Running autopoint: $_echo_c" + +- autopoint +- echo "done." ++ #autopoint ++ #echo "done." + + echo $_echo_n " + Running aclocal: $_echo_c" + diff --git a/xine-lib-1.1.21-samba4.patch b/xine-lib-1.1.21-samba4.patch new file mode 100644 index 0000000..6c5f67d --- /dev/null +++ b/xine-lib-1.1.21-samba4.patch @@ -0,0 +1,32 @@ +diff -ur xine-lib-1.1.21/configure.ac xine-lib-1.1.21-samba4/configure.ac +--- xine-lib-1.1.21/configure.ac 2012-07-16 21:42:38.000000000 +0200 ++++ xine-lib-1.1.21-samba4/configure.ac 2013-02-12 15:44:33.000000000 +0100 +@@ -1698,12 +1698,10 @@ + [with_samba=$enableval], [with_samba=yes]) + + if test "x$with_samba" = "xyes"; then +- AC_CHECK_LIB(smbclient, smbc_init, +- [ AC_CHECK_HEADER(libsmbclient.h, +- [ have_libsmbclient=yes +- LIBSMBCLIENT_LIBS="-lsmbclient" ], +- AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***]))], +- AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***])) ++ PKG_CHECK_MODULES([LIBSMBCLIENT], [smbclient], ++ [have_libsmbclient=yes], ++ AC_MSG_RESULT(*** All libsmbclient dependent parts will be disabled ***)) ++ AC_SUBST(LIBSMBCLIENT_CFLAGS) + AC_SUBST(LIBSMBCLIENT_LIBS) + fi + AM_CONDITIONAL(HAVE_LIBSMBCLIENT, test "x$have_libsmbclient" = "xyes") +diff -ur xine-lib-1.1.21/src/input/Makefile.am xine-lib-1.1.21-samba4/src/input/Makefile.am +--- xine-lib-1.1.21/src/input/Makefile.am 2012-07-16 21:42:38.000000000 +0200 ++++ xine-lib-1.1.21-samba4/src/input/Makefile.am 2013-02-12 15:46:45.000000000 +0100 +@@ -150,7 +150,7 @@ + + xineplug_inp_smb_la_SOURCES = input_smb.c + xineplug_inp_smb_la_LIBADD = $(XINE_LIB) $(LIBSMBCLIENT_LIBS) $(LTLIBINTL) +-xineplug_inp_smb_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) ++xineplug_inp_smb_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) $(LIBSMBCLIENT_CFLAGS) + xineplug_inp_smb_la_LDFLAGS = $(xineplug_ldflags) + + xineplug_inp_pvr_la_SOURCES = input_pvr.c diff --git a/xine-lib-1.1.4-optflags.patch b/xine-lib-1.1.4-optflags.patch index a76864a..72540f6 100644 --- a/xine-lib-1.1.4-optflags.patch +++ b/xine-lib-1.1.4-optflags.patch @@ -9,14 +9,3 @@ archopt_val= case "$host_or_hostalias" in ---- xine-lib-1.1.4/configure~ 2007-01-30 23:02:56.000000000 +0200 -+++ xine-lib-1.1.4/configure 2007-01-30 23:03:40.000000000 +0200 -@@ -47754,7 +47754,7 @@ - - DEBUG_CFLAGS="-O $DEBUG_CFLAGS" - -- if test x"$sarchopt" != "xno"; then -+ if false ; then - archopt_val= - - case "$host_or_hostalias" in diff --git a/xine-lib-cleanup-sources.sh b/xine-lib-cleanup-sources.sh index 31cff0f..a250800 100755 --- a/xine-lib-cleanup-sources.sh +++ b/xine-lib-cleanup-sources.sh @@ -6,9 +6,9 @@ if [ -z "$1" -o $# -ne 1 ]; then fi version=$1 -tarball="xine-lib-$version.tar.bz2" +tarball="xine-lib-$version.tar.xz" dir="xine-lib-$version" -modtarball="xine-lib-$version-pruned.tar.bz2" +modtarball="xine-lib-$version-pruned.tar.xz" if [ ! -f $tarball ]; then @@ -18,7 +18,7 @@ fi echo "Uncompressing $tarball..." rm -rf $dir -tar -xjf $tarball +tar -xJf $tarball cd $dir rmpluglib() @@ -30,7 +30,7 @@ rmpluglib() } # Main libraries -for remove in libfaad libffmpeg libmad libmpeg2 dxr3 liba52 libdts; do +for remove in libfaad libffmpeg libmad libmpeg2 libmpeg2new dxr3 liba52 libdts; do echo "removing src/$remove..." rm -rf src/$remove sed -i -e "/$remove/d" src/Makefile.am @@ -44,11 +44,14 @@ 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 - if [ "`grep -c $sourcefile src/input/Makefile.am`" -le 1 ]; then # if this file is only used for this plugin + if [ "`grep -v '^EXTRA_DIST = ' src/input/Makefile.am | grep -c $sourcefile`" -le 1 ]; then # if this file is only used for this plugin rm -f src/input/$sourcefile fi done @@ -76,10 +79,12 @@ sed -i -e '/^xineplug_decode_nsf_la/,/^\s*$/d' \ -e 's/ nosefart//' \ src/libxineadec/Makefile.am sed -i -e '/nosefart\/Makefile/d' configure.ac +# Patches for forbidden libraries +rm -fv misc/lib*.patch win32/scripts/*.patch # All clean ! cd .. echo "Generating $modtarball..." -tar -cjf $modtarball $dir +tar -cJf $modtarball $dir rm -rf $dir diff --git a/xine-lib-mk-autotools-patch.sh b/xine-lib-mk-autotools-patch.sh deleted file mode 100644 index 3cb6d1a..0000000 --- a/xine-lib-mk-autotools-patch.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -# be sure to have all build deps + libtool installed before running this - -set -e - -if [ -z "$1" -o $# -ne 1 ]; then - echo "Usage: $0 " - exit 2 -fi - -version=$1 - -# missing dependency on autoconf >= (apparently) 2.61 in upstream autofoo files -acversion="$(rpm -q --qf=%{VERSION} autoconf)" -case $acversion in - 2.6*) ;; - *) echo "ERROR: autoconf >= 2.61 required" ; exit 1 ;; -esac - -rm -rf xine-lib-$version xine-lib-$version-pruned -tar jxf xine-lib-$version-pruned.tar.bz2 -cp -a xine-lib-$version xine-lib-$version-pruned - -pushd xine-lib-$version -patch -p1 < ../xine-lib-${version}-no_autopoint.patch -# extra work for to omit old libtool-related crud -rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4 -./autogen.sh noconfig -rm -rf autom4te.cache *~ -popd - -diff -Nru xine-lib-$version-pruned xine-lib-$version \ -| bzip2 --best > xine-lib-$version-autotools.patch.bz2 diff --git a/xine-lib.spec b/xine-lib.spec index 75e873d..1930e7d 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,9 +1,8 @@ # TODO, sometime, maybe: # - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog # - drop the opengl video out plugin? -# - deprecate ESD support? -%define plugin_abi 1.28 +%define plugin_abi 1.30 %define codecdir %{_libdir}/codecs %ifarch %{ix86} @@ -13,12 +12,33 @@ %endif # ix86 %if 0%{?fedora} -%define _disable_gnomevfs --disable-gnomevfs %define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1} +# FIXME: libmodplug-0.8.8.5-1 regressed (pkgconfig --cflags dropped -I/usr/include/libmodplug), and now FTBFS +#define _enable_modplug --enable-modplug %else %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} %endif # Fedora +%ifarch %{arm} +%define _without_directfb 1 +%endif + +%if 0%{?fedora} > 14 +%define _disable_v4l1 1 +%endif + +%if 0%{?fedora} > 16 +%define _without_esound 1 +%endif + +%if 0%{?fedora} > 16 +%define bluray 1 +%endif + +%if 0%{?fedora} > 19 +%define _without_directfb 1 +%endif + %define _enable_xvmc --enable-xvmc %if 0%{?rhel} > 5 %ifarch ppc64 @@ -30,45 +50,40 @@ %define _enable_v4l --enable-v4l --enable-libv4l %define _without_arts --without-arts %define _with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1} -%define _with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} +%define _with_xcb 1 +%define _with_smbclient 1 %endif -%if 0%{?fedora} > 11 || 0%{?rhel} > 5 -%define pa_in_main 1 -%endif - -Summary: A multimedia engine +Summary: A multimedia engine Name: xine-lib -Version: 1.1.18.1 -Release: 1%{?dist} +Version: 1.1.21 +Release: 10%{?dist} License: GPLv2+ Group: System Environment/Libraries -URL: http://www.xine-project.org/ +URL: http://www.xine-project.org/ # The tarball is generated from the upstream tarball using # the script in SOURCE1. It prunes potentially patented code -#Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2 -Source0: xine-lib-%{version}-pruned.tar.bz2 +#Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz +Source0: xine-lib-%{version}-pruned.tar.xz Source1: xine-lib-cleanup-sources.sh -Source2: xine-lib-mk-autotools-patch.sh -# autotools patch created with source2 -Patch0: xine-lib-%{version}-autotools.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: xine-lib-1.1.19-no_autopoint.patch Patch1: xine-lib-1.1.4-optflags.patch -# used to help -Patch2: xine-lib-%{version}-no_autopoint.patch -Patch6: xine-lib-1.1.1-deepbind-939.patch # http://bugzilla.redhat.com/470568 -Patch8: xine-lib-1.1.17-avsync_hack.patch +Patch2: xine-lib-1.1.17-avsync_hack.patch # http://bugzilla.redhat.com/477226 -Patch9: xine-lib-1.1.16.2-multilib.patch -## upstreamable patches -## upstream patches +Patch3: xine-lib-1.1.16.2-multilib.patch +# find the Samba 4 libsmbclient.h using pkg-config (#909825) +Patch4: xine-lib-1.1.21-samba4.patch Provides: xine-lib(plugin-abi) = %{plugin_abi} %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} -BuildRequires: automake libtool +# DVD plugin moved from there +Conflicts: xine-lib-extras-freeworld < 1.1.21-3 + +BuildRequires: autoconf automake libtool # X11 BuildRequires: libX11-devel BuildRequires: libXv-devel @@ -78,9 +93,9 @@ BuildRequires: libGLU-devel %if 0%{?_enable_v4l:1} BuildRequires: libv4l-devel %endif -%if 0%{?_with_xcb:1} +%if 0%{?_with_xcb} BuildRequires: libxcb-devel -%endif # xcb +%endif # Video BuildRequires: SDL-devel BuildRequires: libtheora-devel @@ -92,43 +107,46 @@ BuildRequires: libcaca-devel >= 0.99-0.5.beta14 %if 0%{!?_without_directfb:1} BuildRequires: directfb-devel %endif # directfb -%if 0%{!?_without_imagemagick:1} BuildRequires: ImageMagick-devel >= 6.2.4.6-1 -%endif # imagemagick -%if 0%{?_with_freetype:1} BuildRequires: fontconfig-devel -%endif # freetype # Audio BuildRequires: alsa-lib-devel >= 0.9.0 +%if 0%{!?_without_esound:1} BuildRequires: esound-devel +%endif # esound BuildRequires: flac-devel BuildRequires: jack-audio-connection-kit-devel +%if 0%{?_enable_modplug:1} BuildRequires: libmodplug-devel +%endif BuildRequires: libmpcdec-devel BuildRequires: libvorbis-devel -%if 0%{?_with_pa:1} -BuildRequires: pulseaudio-lib-devel -%endif # pa BuildRequires: speex-devel -%if 0%{?_without_arts:1} -Obsoletes: xine-lib-arts < %{version}-%{release} -%else -BuildRequires: arts-devel -%endif BuildRequires: wavpack-devel # CDs BuildRequires: libcdio-devel # Other BuildRequires: pkgconfig +%if 0%{?_with_pa} +BuildRequires: pkgconfig(libpulse) +%endif BuildRequires: gtk2-devel -%if 0%{?fedora} > 6 || 0%{?rhel} > 5 -BuildRequires: libsmbclient-devel -%else -BuildRequires: samba-common +%if 0%{?_with_smbclient} +BuildRequires: pkgconfig(smbclient) %endif BuildRequires: libdvdnav-devel +BuildRequires: libdvdread-devel +%if 0%{?bluray} +BuildRequires: libbluray-devel +%endif -%if 0%{?pa_in_main} +%if 0%{?_without_arts:1} +# Dropped in Fedora 9 +Obsoletes: xine-lib-arts < %{version}-%{release} +%endif + +# Included in main package since Fedora 12 +%if 0%{?fedora} > 11 Obsoletes: xine-lib-pulseaudio < 1.1.16.3-5 Provides: xine-lib-pulseaudio = %{version}-%{release} %endif @@ -148,21 +166,6 @@ Requires: zlib-devel %description devel This package contains development files for %{name}. -%package arts -Summary: aRts plugin for %{name} -Group: System Environment/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -#Requires: xine-lib(plugin-abi) = %{plugin_abi} -%description arts -This package contains the aRts plugin for %{name}. - -%package pulseaudio -Summary: Pulseaudio plugin for %{name} -Group: System Environment/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -%description pulseaudio -This package contains the pulseaudio plugin for %{name}. - %package extras Summary: Additional plugins for %{name} Group: System Environment/Libraries @@ -170,44 +173,48 @@ Requires: %{name}%{?_isa} = %{version}-%{release} #Requires: xine-lib(plugin-abi) = %{plugin_abi} %description extras This package contains extra plugins for %{name}: +%if 0%{!?_without_esound:1} - EsounD +%endif # esound - JACK - GDK-Pixbuf - - GNOME VFS - SMB - SDL %if %{with_aalib} - AA-lib %endif # aalib - Libcaca -%if 0%{!?_without_imagemagick:1} - Image decoding -%endif # imagemagick %if 0%{!?_without_directfb:1} - DirectFB output %endif # directfb +%if ! 0%{?_without_arts:1} +%package arts +Summary: aRts plugin for %{name} +Group: System Environment/Libraries +BuildRequires: arts-devel +Requires: %{name}%{?_isa} = %{version}-%{release} +#Requires: xine-lib(plugin-abi) = %{plugin_abi} +# -arts was split off the -extras subpackage at 1.1.7-3 +Obsoletes: xine-lib-extras < 1.1.7-3 +%description arts +This package contains the aRts plugin for %{name}. +%endif + %prep %setup -q -%patch0 -p1 -b .autotools -touch -r configure.ac aclocal.m4 -touch -r m4/optimizations.m4 m4/optimizations.m4.stamp +%patch0 -p1 -b .no_autopoint +# extra work for to omit old libtool-related crud +rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4 %patch1 -p1 -b .optflags -touch -r m4/optimizations.m4.stamp m4/optimizations.m4 -# needed at least when compiling with external ffmpeg and internal faad livna bug#939. -# see also http://bugzilla.redhat.com/480504 for side-effects -#patch6 -p1 -b .deepbind -%patch8 -p1 -b .avsync_hack -%patch9 -p1 -b .multilib +%patch2 -p1 -b .avsync_hack +%patch3 -p1 -b .multilib +%patch4 -p1 -b .samba4 -# autotools patch + touch'ing above seems to miss something, aclocal -# runs on make anyway, let's use the ./autogen.sh hammer for now. ./autogen.sh noconfig -#Avoid standard rpaths on lib64 archs: (autotools patch handles this too) -#sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure - %build export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" " @@ -221,29 +228,28 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %if 0%{!?_without_directfb:1} --enable-directfb \ %endif # directfb + %{?_enable_modplug}%{!?_enable_modplug:--disable-modplug} \ %{?_enable_v4l}%{!?_enable_v4l:--disable-v4l --disable-libv4l} \ %{?_enable_xvmc}%{!?_enable_xvmc:--disable-xvmc} \ - %{?_disable_gnomevfs} \ + --disable-gnomevfs \ --disable-a52dec \ --disable-mad \ --disable-vcd \ --disable-asf \ --disable-faad \ -%if 0%{?_with_freetype:1} -%if 0%{?_with_antialiasing:1} --enable-antialiasing \ - --with-caca \ -%endif # antialiasing --with-freetype \ --with-fontconfig \ -%endif # freetype + --with-caca \ --with-external-ffmpeg \ + --with-external-dvdnav \ + %{?_with_xcb:--with-xcb}%{!?with_xcb:--without-xcb} \ --with-xv-path=%{_libdir} \ --with-libflac \ --with-external-libmpcdec \ -%if 0%{?_without_imagemagick:1} - --without-imagemagick \ -%endif # imagemagick +%if 0%{?_without_esound:1} + --without-esound \ +%endif %{!?_without_arts:--with-arts} %{?_without_arts} \ --with-wavpack \ --with-real-codecs-path=%{codecdir} \ @@ -267,6 +273,12 @@ rm -Rf $RPM_BUILD_ROOT%{_libdir}/libxine.la __docs/README \ # Directory for binary codecs mkdir -p $RPM_BUILD_ROOT%{codecdir} +# unpackaged files +%if 0%{?_disable_v4l1:1} +rm -fv $RPM_BUILD_ROOT%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so +rm -fv $RPM_BUILD_ROOT%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -317,6 +329,9 @@ rm -rf $RPM_BUILD_ROOT %{_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 +%if 0%{?_with_pa:1} +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so +%endif %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_bitplane.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gsm610.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so @@ -335,7 +350,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_sputext.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_theora.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vorbis.so -%ifarch %ix86 +%ifarch %{ix86} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_w32dll.so %endif # ix86 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_yuv.so @@ -364,8 +379,12 @@ 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 +%if 0%{?bluray} +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_bluray.so +%endif %{_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 @@ -374,8 +393,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so %if 0%{?_enable_v4l:1} +%if ! 0%{?_disable_v4l1:1} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so +%endif %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so %endif %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so @@ -386,10 +407,10 @@ rm -rf $RPM_BUILD_ROOT %if %{have_vidix} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so %endif # vidix -%if 0%{?_with_xcb:1} +%if 0%{?_with_xcb} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbshm.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbxv.so -%endif # xcb +%endif %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xshm.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xv.so %if 0%{?_enable_xvmc:1} @@ -398,14 +419,6 @@ rm -rf $RPM_BUILD_ROOT %endif %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so -%if 0%{?_with_pa:1} -%if ! 0%{?pa_in_main} -%files pulseaudio -%defattr(-,root,root,-) -%endif -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so -%endif - %if 0%{!?_without_arts:1} %files arts %defattr(-,root,root,-) @@ -414,13 +427,15 @@ rm -rf $RPM_BUILD_ROOT %files extras %defattr(-,root,root,-) +%if 0%{!?_without_esound:1} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_esd.so +%endif # esound %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_jack.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gdk_pixbuf.so -%if 0%{!?_without_imagemagick:1} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so -%endif # imagemagick +%if 0%{?_with_smbclient} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so +%endif %if %{with_aalib} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_aa.so %endif # aalib @@ -446,6 +461,91 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Aug 26 2014 Rex Dieter - 1.1.21-10 +- add conditionals to support el5/el6, fix/cleanup other conditionals +- omit libmodplug support (for now, FTBFS) + +* Sat Aug 31 2013 Till Maas - 1.1.21-9 +- Disable directfb support for Fedora 20 and newer, because it was retired + +* Tue Aug 27 2013 Jon Ciesla - 1.1.21-8 +- libmng rebuild. + +* Sun Aug 04 2013 Fedora Release Engineering - 1.1.21-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sat Mar 30 2013 Kevin Fenzi - 1.1.21-6 +- Rebuild for broken deps in rawhide + +* Tue Feb 12 2013 Kevin Kofler 1.1.21-5 +- find the Samba 4 libsmbclient.h using pkg-config, fixes FTBFS (#909825) + +* Mon Sep 17 2012 Kevin Kofler 1.1.21-4 +- rebuild for new directfb + +* Sun Jul 22 2012 Fedora Release Engineering - 1.1.21-3.1 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Sat Jul 21 2012 Kevin Kofler 1.1.21-2.1 +- disable libbluray support on F16, libbluray too old + +* 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. + +* 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 + +* Tue Jan 03 2012 Kevin Kofler 1.1.20.1-1 +- update to 1.1.20.1 (bugfix release) +- drop upstreamed link-libdvdread patch + +* Sun Nov 20 2011 Kevin Kofler 1.1.20-1 +- update to 1.1.20 (#753758) +- use .xz tarball +- drop old conditionals +- drop ESD (esound) support on F17+ (native PulseAudio just works) +- drop autotools patch, run autogen.sh in %%prep instead +- drop unused deepbind patch +- drop xvmclib_header patch, fixed upstream +- use the system libdvdnav (and libdvdread) instead of the bundled one +- fix system libdvdnav support to also link libdvdread +- plugin ABI is now 1.30 + +* Fri Jul 15 2011 Kevin Kofler 1.1.19-7 +- rebuild for new DirectFB (1.5.0) + +* Mon Feb 14 2011 Rex Dieter 1.1.19-6 +- split v4l, libv4l handling +- omit v4l(1) bits (f15+) + +* Mon Feb 07 2011 Fedora Release Engineering - 1.1.19-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Mon Jan 24 2011 Rex Dieter - 1.1.19-4 +- xvmclib header changes, fixes ftbfs (#635653,#661071) + +* Sun Nov 28 2010 Kevin Kofler - 1.1.19-3 +- rebuild for new directfb (1.4.11) + +* Wed Sep 15 2010 Rex Dieter - 1.1.19-2 +- rebuild (ImageMagick) + +* Sun Jul 25 2010 Rex Dieter - 1.1.19-1 +- 1.1.19 + +* Mon Jul 19 2010 Rex Dieter - 1.1.18.1-3 +- no directfb on arm (yet) + +* Tue Jun 1 2010 Ville Skyttä - 1.1.18.1-2 +- Rebuild. + * Sun Mar 07 2010 Rex Dieter - 1.1.18.1-1 - xine-lib-1.1.18.1 @@ -548,10 +648,10 @@ rm -rf $RPM_BUILD_ROOT * Thu Apr 24 2008 Rex Dieter - 1.1.12-2 - CVE-2008-1878 -* Wed Apr 16 2008 Ville Skyttä - 1.1.12-1 +* Wed Apr 16 2008 Ville Skyttä - 1.1.12-1 - 1.1.12 (plugin ABI 1.21); qt, mkv, and pulseaudio patches applied upstream. -* Wed Apr 9 2008 Ville Skyttä - 1.1.11.1-3 +* Wed Apr 9 2008 Ville Skyttä - 1.1.11.1-3 - Apply upstream fixes for Quicktime (#441705) and Matroska regressions introduced in 1.1.11.1. @@ -559,12 +659,12 @@ rm -rf $RPM_BUILD_ROOT - pulse-rework2 patch (#439731) - -pulseaudio subpkg (#439731) -* Sun Mar 30 2008 Ville Skyttä - 1.1.11.1-1 +* Sun Mar 30 2008 Ville Skyttä - 1.1.11.1-1 - 1.1.11.1 (security update, #438663, CVE-2008-1482). - Provide versioned xine-lib(plugin-abi) so 3rd party packages installing plugins can use it instead of requiring a version of xine-lib. -* Wed Mar 19 2008 Ville Skyttä - 1.1.11-1 +* Wed Mar 19 2008 Ville Skyttä - 1.1.11-1 - 1.1.11 (security update, #438182, CVE-2008-0073). - Drop jack and wavpack build conditionals. - Specfile cleanups. @@ -572,37 +672,37 @@ rm -rf $RPM_BUILD_ROOT * Fri Mar 7 2008 Rex Dieter - 1.1.10.1-1.1 - xcb support for f7+ (#373411) -* Fri Feb 8 2008 Ville Skyttä - 1.1.10.1-1 +* Fri Feb 8 2008 Ville Skyttä - 1.1.10.1-1 - 1.1.10.1 (security update, #431541). -* Sun Jan 27 2008 Ville Skyttä - 1.1.10-2 +* Sun Jan 27 2008 Ville Skyttä - 1.1.10-2 - Include spu, spucc, and spucmml decoders (#213597). -* Sun Jan 27 2008 Ville Skyttä - 1.1.10-1 +* Sun Jan 27 2008 Ville Skyttä - 1.1.10-1 - 1.1.10 (security update). -* Mon Jan 21 2008 Ville Skyttä - 1.1.9.1-3 +* Mon Jan 21 2008 Ville Skyttä - 1.1.9.1-3 - Fix version number in libxine.pc (#429487). -* Sun Jan 20 2008 Ville Skyttä - 1.1.9.1-2 +* Sun Jan 20 2008 Ville Skyttä - 1.1.9.1-2 - Disable upstream "discard buffers on ao close" 1.1.9 changeset (#429182). -* Sat Jan 12 2008 Ville Skyttä - 1.1.9.1-1 +* Sat Jan 12 2008 Ville Skyttä - 1.1.9.1-1 - 1.1.9.1 (security update). -* Sun Jan 6 2008 Ville Skyttä - 1.1.9-1 +* Sun Jan 6 2008 Ville Skyttä - 1.1.9-1 - 1.1.9. -* Thu Sep 27 2007 Ville Skyttä - 1.1.8-6 +* Thu Sep 27 2007 Ville Skyttä - 1.1.8-6 - Enable wavpack support by default for all distros. -* Sun Sep 23 2007 Ville Skyttä - 1.1.8-5 +* Sun Sep 23 2007 Ville Skyttä - 1.1.8-5 - Enable JACK support by default for all distros. -* Wed Sep 19 2007 Ville Skyttä - 1.1.8-4 +* Wed Sep 19 2007 Ville Skyttä - 1.1.8-4 - Fix "--without wavpack" build. -* Sat Sep 15 2007 Ville Skyttä - 1.1.8-3 +* Sat Sep 15 2007 Ville Skyttä - 1.1.8-3 - Move XCB plugins to the main package. - Make aalib, caca, pulseaudio, jack, and wavpack support optional at build time in preparation for the first EPEL build. @@ -611,63 +711,63 @@ rm -rf $RPM_BUILD_ROOT - remove the dependency from -extras to -arts, and use Obsoletes to provide an upgrade path -* Thu Aug 30 2007 Ville Skyttä - 1.1.8-1 +* Thu Aug 30 2007 Ville Skyttä - 1.1.8-1 - 1.1.8, "open" patch applied upstream. - Build XCB plugins by default for Fedora 8+ only. * Sat Aug 25 2007 Aurelien Bompard 1.1.7-3 - Split the aRts plugin into its own subpackage -* Tue Aug 14 2007 Ville Skyttä - 1.1.7-2 +* Tue Aug 14 2007 Ville Skyttä - 1.1.7-2 - Include XCB output plugins (in -extras at least for now). - Protect "open" with glibc 2.6.90 and -D_FORTIFY_SOURCE=2. - Clean up %%configure options. - License: GPLv2+ -* Thu Jun 7 2007 Ville Skyttä - 1.1.7-1 +* Thu Jun 7 2007 Ville Skyttä - 1.1.7-1 - 1.1.7. * Wed Jun 06 2007 Rex Dieter - 1.1.6-3 - respin (for libmpcdec) -* Wed Apr 25 2007 Ville Skyttä - 1.1.6-2 +* Wed Apr 25 2007 Ville Skyttä - 1.1.6-2 - Make Real codec search path /usr/lib(64)/codecs again (#237743). -* Wed Apr 18 2007 Ville Skyttä - 1.1.6-1 +* Wed Apr 18 2007 Ville Skyttä - 1.1.6-1 - 1.1.6. -* Wed Apr 11 2007 Ville Skyttä - 1.1.5-1 +* Wed Apr 11 2007 Ville Skyttä - 1.1.5-1 - 1.1.5. - Include GSM 06.10 decoder (#228186). - Re-enable CACA support. -* Sun Apr 8 2007 Ville Skyttä +* 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 +* 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. - Add --with freetype and --with antialiasing build time options, default disabled, and an upstream patch for FreeType memory leak (#233194). -* Sat Mar 10 2007 Ville Skyttä - 1.1.4-3 +* Sat Mar 10 2007 Ville Skyttä - 1.1.4-3 - Apply upstream fix for CVE-2007-1246. -* Wed Feb 14 2007 Ville Skyttä - 1.1.4-2 +* Wed Feb 14 2007 Ville Skyttä - 1.1.4-2 - Rebuild. -* Wed Jan 31 2007 Ville Skyttä - 1.1.4-1 +* Wed Jan 31 2007 Ville Skyttä - 1.1.4-1 - 1.1.4, with wavpack and system libmpcdec support. * Thu Jan 18 2007 Aurelien Bompard 1.1.3-4 - rebuild -* Wed Jan 3 2007 Ville Skyttä - 1.1.3-3 +* Wed Jan 3 2007 Ville Skyttä - 1.1.3-3 - Fix libflac decoder with FLAC < 1.1.3 (#220961). - Apply upstream patch for FLAC >= 1.1.3. -* Sun Dec 17 2006 Ville Skyttä - 1.1.3-2 +* Sun Dec 17 2006 Ville Skyttä - 1.1.3-2 - Don't run autotools during build. * Mon Dec 04 2006 Aurelien Bompard 1.1.3-1