From 1dd470ca9c350dc45b1b36833601cfcb3ebb6c1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 17 Dec 2006 12:51:33 +0000 Subject: [PATCH 01/43] =?UTF-8?q?*=20Sun=20Dec=2017=202006=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=201.1.3-2=20-=20Don't?= =?UTF-8?q?=20run=20autotools=20during=20build.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Mon Dec 04 2006 Aurelien Bompard 1.1.3-1 - version 1.1.3 - patch2 applied upstream - Disable CACA support by default, needs newer than what's in FE ATM. - Split extras plugins in a separate package - Enable JACK support (in extras subpackage) - Enable DirectFB support (in extras subpackage) * Sat Nov 11 2006 Aurelien Bompard 1.1.2-18 - Make shn files available to amarok. References: http://xine.cvs.sourceforge.net/xine/xine-lib/src/demuxers/demux_shn.c?r1=1.1.2.2&r2=1.2 https://launchpad.net/distros/ubuntu/+source/xine-lib/+bug/63130 --- .cvsignore | 3 +- sources | 3 +- xine-lib-1.1.1-configure-no-mcpu-march.patch | 13 -- xine-lib-1.1.3-optflags.patch | 22 +++ xine-lib-cleanup-sources.sh | 11 +- xine-lib.spec | 145 +++++++++++++------ 6 files changed, 132 insertions(+), 65 deletions(-) delete mode 100644 xine-lib-1.1.1-configure-no-mcpu-march.patch create mode 100644 xine-lib-1.1.3-optflags.patch diff --git a/.cvsignore b/.cvsignore index 7d987ff..c99b3db 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ -xine-lib-1.1.2.tar.bz2 +xine-lib-1.1.3-pruned.tar.bz2 +xine-lib-1.1.3-autotools.patch.bz2 diff --git a/sources b/sources index b512d76..3bdc00e 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ -d1afb34d2335f8c9ded4d9a2b741251e xine-lib-1.1.2.tar.bz2 +eff682745f198e1881773509f12c70c3 xine-lib-1.1.3-pruned.tar.bz2 +a58fce450d9288224caa413ad8bc1f8d xine-lib-1.1.3-autotools.patch.bz2 diff --git a/xine-lib-1.1.1-configure-no-mcpu-march.patch b/xine-lib-1.1.1-configure-no-mcpu-march.patch deleted file mode 100644 index 4b6ba9e..0000000 --- a/xine-lib-1.1.1-configure-no-mcpu-march.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- m4/optimizations.m4.orig 2005-11-27 01:20:08.000000000 +0100 -+++ m4/optimizations.m4 2005-11-27 01:22:56.000000000 +0100 -@@ -161,10 +161,6 @@ - ;; - - esac -- if test x"$archopt_val" != x; then -- CFLAGS="$sarchopt=$archopt_val $CFLAGS" -- DEBUG_CFLAGS="$sarchopt=$archopt_val $DEBUG_CFLAGS" -- fi - fi - else - dnl we have the Intel compiler diff --git a/xine-lib-1.1.3-optflags.patch b/xine-lib-1.1.3-optflags.patch new file mode 100644 index 0000000..8413f5a --- /dev/null +++ b/xine-lib-1.1.3-optflags.patch @@ -0,0 +1,22 @@ +--- xine-lib-1.1.3/m4/optimizations.m4~ 2006-06-17 18:20:56.000000000 +0300 ++++ xine-lib-1.1.3/m4/optimizations.m4 2006-12-17 11:49:44.000000000 +0200 +@@ -107,7 +107,7 @@ + + DEBUG_CFLAGS="-O $DEBUG_CFLAGS" + +- if test x"$sarchopt" != "xno"; then ++ if false ; then + archopt_val= + + case "$host_or_hostalias" in +--- xine-lib-1.1.3/configure~ 2006-12-03 21:41:27.000000000 +0200 ++++ xine-lib-1.1.3/configure 2006-12-17 11:50:07.000000000 +0200 +@@ -46971,7 +46971,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 dfa3ef4..97da5bd 100755 --- a/xine-lib-cleanup-sources.sh +++ b/xine-lib-cleanup-sources.sh @@ -6,8 +6,9 @@ if [ -z "$1" -o $# -ne 1 ]; then fi version=$1 -tarball="xine-lib-$version.tar.bz2" +tarball="xine-lib-$version.tar.gz" dir="xine-lib-$version" +modtarball="xine-lib-$version-pruned.tar.bz2" if [ ! -f $tarball ]; then @@ -17,7 +18,7 @@ fi echo "Uncompressing $tarball..." rm -rf $dir -tar -xjf $tarball +tar -xzf $tarball cd $dir # Main libraries @@ -58,8 +59,6 @@ sed -i -e 's/planar//g;s/deinterlace//g' src/post/Makefile.am # fails to build # All clean ! cd .. -echo "Generating $tarball..." -rm -f $tarball.orig -mv $tarball $tarball.orig -tar -cjf $tarball $dir +echo "Generating $modtarball..." +tar -cjf $modtarball $dir rm -rf $dir diff --git a/xine-lib.spec b/xine-lib.spec index faf767c..f317955 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,54 +1,64 @@ # TODO, sometime, maybe: # - libstk: http://www.libstk.net/ -# - polypaudio +# - pulseaudio %define codecdir %{_libdir}/codecs -#%define vdrver 0.7.9 Summary: Xine library Name: xine-lib -Version: 1.1.2 -Release: 17%{?dist} +Version: 1.1.3 +Release: 2%{?dist} License: GPL Group: System Environment/Libraries URL: http://xinehq.de/ # The tarball is generated from the upstream tarball using # the script in SOURCE1. It prunes potentially patented code -Source0: http://dl.sourceforge.net/xine/xine-lib-1.1.2.tar.bz2 -Source1: xine-lib-cleanup-sources.sh -Patch1: xine-lib-1.1.1-configure-no-mcpu-march.patch -Patch6: xine-lib-1.1.1-deepbind-939.patch -Patch7: xine-lib-1.1.1-multilib-devel.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +#Source0: http://dl.sourceforge.net/xine/xine-lib-%{version}.tar.gz +Source0: %{name}-%{version}-pruned.tar.bz2 +Source1: %{name}-cleanup-sources.sh +# To recreate the autotools patch: install build deps, extract source0, +# remove run_configure "$@" from autogen.sh, copy the dir to -patched, +# run autogen.sh (doesn't work with automake 1.10 as of 1.1.3 so use 1.9), +# remove autom4te.cache, then diff the dirs. Apply rest of the patches during +# build so that autotools do not need to be run again. +Patch0: %{name}-1.1.3-autotools.patch.bz2 +Patch1: %{name}-1.1.3-optflags.patch +Patch6: %{name}-1.1.1-deepbind-939.patch +Patch7: %{name}-1.1.1-multilib-devel.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # X11 BuildRequires: libX11-devel libXv-devel libXinerama-devel libXvMC-devel libGLU-devel # Video BuildRequires: freetype-devel SDL-devel libtheora-devel libmng-devel -BuildRequires: aalib-devel >= 1.4 libcaca-devel +BuildRequires: aalib-devel >= 1.4 +%if 0%{?_with_caca:1} +BuildRequires: libcaca-devel >= 0.99 +%endif +%if 0%{!?_without_directfb:1} +BuildRequires: directfb-devel +%endif +%if 0%{!?_without_imagemagick:1} +BuildRequires: ImageMagick-devel >= 6.2.4.6-1 +%endif # Audio BuildRequires: libogg-devel libvorbis-devel flac-devel libmodplug-devel BuildRequires: esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0 +BuildRequires: jack-audio-connection-kit-devel # CDs BuildRequires: libcdio-devel # Other -BuildRequires: pkgconfig gnome-vfs2-devel gtk2-devel -BuildRequires: libtool >= 1.4.0 /usr/bin/automake-1.9 samba-common - -%if 0%{?_with_directfb:1} -BuildRequires: directfb-devel -%endif -%if 0%{!?_without_imagemagick:1} -BuildRequires: ImageMagick-devel >= 6.2.4.6-1 -%endif -#Provides: %{name}(vdr) = %{vdrver} +BuildRequires: pkgconfig gnome-vfs2-devel gtk2-devel samba-common %package devel Summary: Xine library development files Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig zlib-devel -#Requires: %{name}(vdr) = %{vdrver} -#Provides: %{name}-devel(vdr) = %{vdrver} + +%package extras +Summary: Additional plugins for xine-lib +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} %description @@ -58,48 +68,69 @@ disk drives, and displays multimedia streamed over the Internet. It interprets many of the most common multimedia formats available - and some of the most uncommon formats, too. Non-default rpmbuild options: --without imagemagick: Disable ImageMagick support ---with directfb: Enable DirectFB support +--without directfb: Disable DirectFB support +--with caca: Enable CACA support %description devel This package contains development files for xine-lib. +%description extras +This package contains extra plugins for xine-lib: + - aRts + - EsounD + - JACK + - GDK-Pixbuf + - GNOME VFS + - SMB + - SDL + - AA-lib +%if 0%{?_with_caca:1} + - Libcaca +%endif +%if 0%{!?_without_imagemagick:1} + - Image decoding +%endif +%if 0%{!?_without_directfb:1} + - DirectFB output +%endif + + %prep %setup -q -%patch1 -p0 -b .nomcpu -###cp -p debian/changelog ChangeLog.vdr +%patch0 -p1 -b .autotools +cp -p m4/optimizations.m4 m4/optimizations.m4.stamp +%patch1 -p1 -b .optflags +touch -r m4/optimizations.m4.stamp m4/optimizations.m4 # Patch6 needed at least when compiling with external ffmpeg, #939. %patch6 -p1 -b .deepbind %patch7 -p0 -b .multilib-devel find . -name "*.[hc]" | xargs chmod -c -x -aclocal-1.9 -I m4 -libtoolize --force -autoheader -automake-1.9 --gnu --add-missing -autoconf - # Avoid standard rpaths on lib64 archs: sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure %build -FFMPEG_CPPFLAGS=" "; FFMPEG_LIBS=" "; export FFMPEG_CPPFLAGS FFMPEG_LIBS +export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" " +export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" " +export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %configure --disable-dependency-tracking \ --with-xv-path=%{_libdir} \ --with-w32-path=%{codecdir} \ --with-external-ffmpeg \ --enable-ipv6 \ -%if 0%{?_with_directfb:1} +%if 0%{!?_without_directfb:1} --enable-directfb \ %endif %if 0%{?_without_imagemagick:1} - --disable-imagemagick \ + --without-imagemagick \ +%endif +%if 0%{!?_with_caca:1} + --without-caca \ %endif - --disable-rte \ --disable-libfame \ - --disable-ffmpegtest \ --disable-faad \ --disable-mad \ --disable-asf \ @@ -146,7 +177,6 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/xine/plugins/%{version}/ # I list all the plugins because I don't want a non-free plugin # to sneak into a future version -# these plugins do not have legal problems according to the SuSE RPM %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_oss.so %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so @@ -154,6 +184,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_none.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_opengl.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_dvb.so @@ -163,12 +194,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/xineplug_inp_net.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_pnm.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_cdda.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_stdin_fifo.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_rtsp.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_pvr.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_rtp.so -#%{_libdir}/xine/plugins/%{version}/xineplug_inp_vdr.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_bitplane.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so @@ -200,8 +229,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so %{_libdir}/xine/plugins/%{version}/xineplug_flac.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so %ifarch %ix86 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so @@ -213,13 +240,27 @@ rm -rf $RPM_BUILD_ROOT %endif %{_libdir}/xine/plugins/%{version}/post/ %{_libdir}/xine/plugins/%{version}/vidix/ -# Put it in a xine-lib-extras package one day ? + + +%files extras +%defattr(-,root,root,-) %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so +%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so +%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so +%if 0%{?_with_caca:1} +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so +%endif +%if 0%{!?_without_imagemagick:1} %{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so +%endif +%if 0%{!?_without_directfb:1} +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so +%endif %files devel @@ -233,9 +274,25 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/pkgconfig/libxine.pc %{_mandir}/man1/xine-config.1* -# -------------------------------------------------------------------- + %changelog +* 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 +- version 1.1.3 +- patch2 applied upstream +- Disable CACA support by default, needs newer than what's in FE ATM. +- Split extras plugins in a separate package +- Enable JACK support (in extras subpackage) +- Enable DirectFB support (in extras subpackage) + +* Sat Nov 11 2006 Aurelien Bompard 1.1.2-18 +- Make shn files available to amarok. References: + http://xine.cvs.sourceforge.net/xine/xine-lib/src/demuxers/demux_shn.c?r1=1.1.2.2&r2=1.2 + https://launchpad.net/distros/ubuntu/+source/xine-lib/+bug/63130 + * Wed Oct 18 2006 Aurelien Bompard 1.1.2-17 - cleanup docs - remove mms From e5c2e5e2194891cd754d20ea7a81a90554297553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 3 Jan 2007 20:27:12 +0000 Subject: [PATCH 02/43] =?UTF-8?q?*=20Wed=20Jan=20=203=202007=20Ville=20Sky?= =?UTF-8?q?tt=C3=A4=20=20-=201.1.3-3=20-=20Fix?= =?UTF-8?q?=20libflac=20decoder=20with=20FLAC=20<=201.1.3=20(#220961).=20-?= =?UTF-8?q?=20Apply=20upstream=20patch=20for=20FLAC=20>=3D=201.1.3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xine-lib-1.1.3-flac113.patch | 149 ++++++++++++++++++++++++++ xine-lib-1.1.3-legacy-flac-init.patch | 16 +++ xine-lib.spec | 10 +- 3 files changed, 174 insertions(+), 1 deletion(-) create mode 100644 xine-lib-1.1.3-flac113.patch create mode 100644 xine-lib-1.1.3-legacy-flac-init.patch diff --git a/xine-lib-1.1.3-flac113.patch b/xine-lib-1.1.3-flac113.patch new file mode 100644 index 0000000..f698b90 --- /dev/null +++ b/xine-lib-1.1.3-flac113.patch @@ -0,0 +1,149 @@ +Index: xine-lib/src/libflac/decoder_flac.c +diff -u xine-lib/src/libflac/decoder_flac.c:1.21 xine-lib/src/libflac/decoder_flac.c:1.22 +--- xine-lib/src/libflac/decoder_flac.c:1.21 Sat Aug 5 13:34:42 2006 ++++ xine-lib/src/libflac/decoder_flac.c Mon Dec 25 19:22:00 2006 +@@ -30,6 +30,13 @@ + + #include + ++#if !defined FLAC_API_VERSION_CURRENT || FLAC_API_VERSION_CURRENT < 8 ++#include ++#define LEGACY_FLAC ++#else ++#undef LEGACY_FLAC ++#endif ++ + #define LOG_MODULE "flac_decoder" + #define LOG_VERBOSE + +@@ -344,6 +351,7 @@ + + this->flac_decoder = FLAC__stream_decoder_new(); + ++#ifdef LEGACY_FLAC + FLAC__stream_decoder_set_read_callback (this->flac_decoder, + flac_read_callback); + FLAC__stream_decoder_set_write_callback (this->flac_decoder, +@@ -359,6 +367,22 @@ + free (this); + return NULL; + } ++#else ++ if ( FLAC__stream_decoder_init_stream (this->flac_decoder, ++ flac_read_callback, ++ NULL, /* seek */ ++ NULL, /* tell */ ++ NULL, /* length */ ++ NULL, /* eof */ ++ flac_write_callback, ++ NULL, /* metadata */ ++ flac_error_callback, ++ this ++ ) != FLAC__STREAM_DECODER_INIT_STATUS_OK ) { ++ free (this); ++ return NULL; ++ } ++#endif + + return (audio_decoder_t *) this; + } +Index: xine-lib/src/libflac/demux_flac.c +diff -u xine-lib/src/libflac/demux_flac.c:1.24 xine-lib/src/libflac/demux_flac.c:1.25 +--- xine-lib/src/libflac/demux_flac.c:1.24 Sat Oct 21 18:50:41 2006 ++++ xine-lib/src/libflac/demux_flac.c Mon Dec 25 19:22:00 2006 +@@ -441,7 +441,11 @@ + lprintf("demux_flac_dispose\n"); + + if (this->flac_decoder) ++#ifdef LEGACY_FLAC + FLAC__seekable_stream_decoder_delete (this->flac_decoder); ++#else ++ FLAC__stream_decoder_delete (this->flac_decoder); ++#endif + + free(this); + return; +@@ -494,8 +498,13 @@ + } + target_sample = (uint64_t)(distance * this->total_samples); + ++#ifdef LEGACY_FLAC + s = FLAC__seekable_stream_decoder_seek_absolute (this->flac_decoder, + target_sample); ++#else ++ s = FLAC__stream_decoder_seek_absolute (this->flac_decoder, ++ target_sample); ++#endif + + if (s) { + lprintf ("Seek to: %d successfull!\n", start_time); +@@ -618,9 +627,6 @@ + /* Get a new FLAC decoder and hook up callbacks */ + #ifdef LEGACY_FLAC + this->flac_decoder = FLAC__seekable_stream_decoder_new(); +-#else +- this->flac_decoder = FLAC__stream_decoder_new(); +-#endif + lprintf("this->flac_decoder: %p\n", this->flac_decoder); + + FLAC__seekable_stream_decoder_set_md5_checking (this->flac_decoder, false); +@@ -644,6 +650,37 @@ + this); + + FLAC__seekable_stream_decoder_init (this->flac_decoder); ++#else ++ this->flac_decoder = FLAC__stream_decoder_new(); ++ lprintf("this->flac_decoder: %p\n", this->flac_decoder); ++ ++ if ( ! this->flac_decoder ) { ++ free(this); ++ return NULL; ++ } ++ ++ FLAC__stream_decoder_set_md5_checking (this->flac_decoder, false); ++ ++ if ( FLAC__stream_decoder_init_stream(this->flac_decoder, ++ flac_read_callback, ++ flac_seek_callback, ++ flac_tell_callback, ++ flac_length_callback, ++ flac_eof_callback, ++ flac_write_callback, ++ flac_metadata_callback, ++ flac_error_callback, ++ this ++ ) != FLAC__STREAM_DECODER_INIT_STATUS_OK ) { ++#ifdef LEGACY_FLAC ++ FLAC__seekable_stream_decoder_delete (this->flac_decoder); ++#else ++ FLAC__stream_decoder_delete (this->flac_decoder); ++#endif ++ free(this); ++ return NULL; ++ } ++#endif + + /* Get some stream info */ + this->data_size = this->input->get_length (this->input); +@@ -653,13 +690,21 @@ + * this flac stream + */ + this->status = DEMUX_OK; ++#ifdef LEGACY_FLAC + FLAC__seekable_stream_decoder_process_until_end_of_metadata (this->flac_decoder); ++#else ++ FLAC__stream_decoder_process_until_end_of_metadata (this->flac_decoder); ++#endif + + lprintf("Processed file until end of metadata: %s\n", + this->status == DEMUX_OK ? "success" : "failure"); + + if (this->status != DEMUX_OK) { ++#ifdef LEGACY_FLAC + FLAC__seekable_stream_decoder_delete (this->flac_decoder); ++#else ++ FLAC__stream_decoder_delete (this->flac_decoder); ++#endif + free (this); + return NULL; + } diff --git a/xine-lib-1.1.3-legacy-flac-init.patch b/xine-lib-1.1.3-legacy-flac-init.patch new file mode 100644 index 0000000..ba1cdb7 --- /dev/null +++ b/xine-lib-1.1.3-legacy-flac-init.patch @@ -0,0 +1,16 @@ +Index: src/libflac/decoder_flac.c +=================================================================== +RCS file: /cvsroot/xine/xine-lib/src/libflac/decoder_flac.c,v +retrieving revision 1.22 +diff -u -r1.22 decoder_flac.c +--- src/libflac/decoder_flac.c 25 Dec 2006 19:22:00 -0000 1.22 ++++ src/libflac/decoder_flac.c 3 Jan 2007 19:58:07 -0000 +@@ -363,7 +363,7 @@ + + FLAC__stream_decoder_set_client_data (this->flac_decoder, this); + +- if (FLAC__stream_decoder_init (this->flac_decoder) == FLAC__STREAM_DECODER_SEARCH_FOR_METADATA) { ++ if (FLAC__stream_decoder_init (this->flac_decoder) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA) { + free (this); + return NULL; + } diff --git a/xine-lib.spec b/xine-lib.spec index f317955..8477e9b 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -7,7 +7,7 @@ Summary: Xine library Name: xine-lib Version: 1.1.3 -Release: 2%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Libraries URL: http://xinehq.de/ @@ -23,6 +23,8 @@ Source1: %{name}-cleanup-sources.sh # build so that autotools do not need to be run again. Patch0: %{name}-1.1.3-autotools.patch.bz2 Patch1: %{name}-1.1.3-optflags.patch +Patch2: %{name}-1.1.3-flac113.patch +Patch3: %{name}-1.1.3-legacy-flac-init.patch Patch6: %{name}-1.1.1-deepbind-939.patch Patch7: %{name}-1.1.1-multilib-devel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -102,6 +104,8 @@ This package contains extra plugins for xine-lib: cp -p m4/optimizations.m4 m4/optimizations.m4.stamp %patch1 -p1 -b .optflags touch -r m4/optimizations.m4.stamp m4/optimizations.m4 +%patch2 -p1 -b .flac113 +%patch3 -p0 -b .legacy-flac-init # Patch6 needed at least when compiling with external ffmpeg, #939. %patch6 -p1 -b .deepbind %patch7 -p0 -b .multilib-devel @@ -277,6 +281,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 - Don't run autotools during build. From 929bb3df9b5e58a72422b1304887b7515bd70c2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 2 Feb 2007 18:02:26 +0000 Subject: [PATCH 03/43] =?UTF-8?q?*=20Wed=20Jan=2031=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=201.1.4-1=20-=201.1.4?= =?UTF-8?q?,=20with=20wavpack=20and=20system=20libmpcdec=20support.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 4 +- sources | 4 +- xine-lib-1.1.3-flac113.patch | 149 ------------------ ...ags.patch => xine-lib-1.1.4-optflags.patch | 10 +- xine-lib-mk-autotools-patch.sh | 24 +++ xine-lib.spec | 45 +++--- 6 files changed, 60 insertions(+), 176 deletions(-) delete mode 100644 xine-lib-1.1.3-flac113.patch rename xine-lib-1.1.3-optflags.patch => xine-lib-1.1.4-optflags.patch (61%) create mode 100644 xine-lib-mk-autotools-patch.sh diff --git a/.cvsignore b/.cvsignore index c99b3db..aea6ec7 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.3-pruned.tar.bz2 -xine-lib-1.1.3-autotools.patch.bz2 +xine-lib-1.1.4-pruned.tar.bz2 +xine-lib-1.1.4-autotools.patch.bz2 diff --git a/sources b/sources index 3bdc00e..2a4625c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -eff682745f198e1881773509f12c70c3 xine-lib-1.1.3-pruned.tar.bz2 -a58fce450d9288224caa413ad8bc1f8d xine-lib-1.1.3-autotools.patch.bz2 +81faabf1e38abed44639dbe4c76719f9 xine-lib-1.1.4-pruned.tar.bz2 +a916758545ed73a369f40648c7bc449c xine-lib-1.1.4-autotools.patch.bz2 diff --git a/xine-lib-1.1.3-flac113.patch b/xine-lib-1.1.3-flac113.patch deleted file mode 100644 index f698b90..0000000 --- a/xine-lib-1.1.3-flac113.patch +++ /dev/null @@ -1,149 +0,0 @@ -Index: xine-lib/src/libflac/decoder_flac.c -diff -u xine-lib/src/libflac/decoder_flac.c:1.21 xine-lib/src/libflac/decoder_flac.c:1.22 ---- xine-lib/src/libflac/decoder_flac.c:1.21 Sat Aug 5 13:34:42 2006 -+++ xine-lib/src/libflac/decoder_flac.c Mon Dec 25 19:22:00 2006 -@@ -30,6 +30,13 @@ - - #include - -+#if !defined FLAC_API_VERSION_CURRENT || FLAC_API_VERSION_CURRENT < 8 -+#include -+#define LEGACY_FLAC -+#else -+#undef LEGACY_FLAC -+#endif -+ - #define LOG_MODULE "flac_decoder" - #define LOG_VERBOSE - -@@ -344,6 +351,7 @@ - - this->flac_decoder = FLAC__stream_decoder_new(); - -+#ifdef LEGACY_FLAC - FLAC__stream_decoder_set_read_callback (this->flac_decoder, - flac_read_callback); - FLAC__stream_decoder_set_write_callback (this->flac_decoder, -@@ -359,6 +367,22 @@ - free (this); - return NULL; - } -+#else -+ if ( FLAC__stream_decoder_init_stream (this->flac_decoder, -+ flac_read_callback, -+ NULL, /* seek */ -+ NULL, /* tell */ -+ NULL, /* length */ -+ NULL, /* eof */ -+ flac_write_callback, -+ NULL, /* metadata */ -+ flac_error_callback, -+ this -+ ) != FLAC__STREAM_DECODER_INIT_STATUS_OK ) { -+ free (this); -+ return NULL; -+ } -+#endif - - return (audio_decoder_t *) this; - } -Index: xine-lib/src/libflac/demux_flac.c -diff -u xine-lib/src/libflac/demux_flac.c:1.24 xine-lib/src/libflac/demux_flac.c:1.25 ---- xine-lib/src/libflac/demux_flac.c:1.24 Sat Oct 21 18:50:41 2006 -+++ xine-lib/src/libflac/demux_flac.c Mon Dec 25 19:22:00 2006 -@@ -441,7 +441,11 @@ - lprintf("demux_flac_dispose\n"); - - if (this->flac_decoder) -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_decoder_delete (this->flac_decoder); -+#else -+ FLAC__stream_decoder_delete (this->flac_decoder); -+#endif - - free(this); - return; -@@ -494,8 +498,13 @@ - } - target_sample = (uint64_t)(distance * this->total_samples); - -+#ifdef LEGACY_FLAC - s = FLAC__seekable_stream_decoder_seek_absolute (this->flac_decoder, - target_sample); -+#else -+ s = FLAC__stream_decoder_seek_absolute (this->flac_decoder, -+ target_sample); -+#endif - - if (s) { - lprintf ("Seek to: %d successfull!\n", start_time); -@@ -618,9 +627,6 @@ - /* Get a new FLAC decoder and hook up callbacks */ - #ifdef LEGACY_FLAC - this->flac_decoder = FLAC__seekable_stream_decoder_new(); --#else -- this->flac_decoder = FLAC__stream_decoder_new(); --#endif - lprintf("this->flac_decoder: %p\n", this->flac_decoder); - - FLAC__seekable_stream_decoder_set_md5_checking (this->flac_decoder, false); -@@ -644,6 +650,37 @@ - this); - - FLAC__seekable_stream_decoder_init (this->flac_decoder); -+#else -+ this->flac_decoder = FLAC__stream_decoder_new(); -+ lprintf("this->flac_decoder: %p\n", this->flac_decoder); -+ -+ if ( ! this->flac_decoder ) { -+ free(this); -+ return NULL; -+ } -+ -+ FLAC__stream_decoder_set_md5_checking (this->flac_decoder, false); -+ -+ if ( FLAC__stream_decoder_init_stream(this->flac_decoder, -+ flac_read_callback, -+ flac_seek_callback, -+ flac_tell_callback, -+ flac_length_callback, -+ flac_eof_callback, -+ flac_write_callback, -+ flac_metadata_callback, -+ flac_error_callback, -+ this -+ ) != FLAC__STREAM_DECODER_INIT_STATUS_OK ) { -+#ifdef LEGACY_FLAC -+ FLAC__seekable_stream_decoder_delete (this->flac_decoder); -+#else -+ FLAC__stream_decoder_delete (this->flac_decoder); -+#endif -+ free(this); -+ return NULL; -+ } -+#endif - - /* Get some stream info */ - this->data_size = this->input->get_length (this->input); -@@ -653,13 +690,21 @@ - * this flac stream - */ - this->status = DEMUX_OK; -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_decoder_process_until_end_of_metadata (this->flac_decoder); -+#else -+ FLAC__stream_decoder_process_until_end_of_metadata (this->flac_decoder); -+#endif - - lprintf("Processed file until end of metadata: %s\n", - this->status == DEMUX_OK ? "success" : "failure"); - - if (this->status != DEMUX_OK) { -+#ifdef LEGACY_FLAC - FLAC__seekable_stream_decoder_delete (this->flac_decoder); -+#else -+ FLAC__stream_decoder_delete (this->flac_decoder); -+#endif - free (this); - return NULL; - } diff --git a/xine-lib-1.1.3-optflags.patch b/xine-lib-1.1.4-optflags.patch similarity index 61% rename from xine-lib-1.1.3-optflags.patch rename to xine-lib-1.1.4-optflags.patch index 8413f5a..a76864a 100644 --- a/xine-lib-1.1.3-optflags.patch +++ b/xine-lib-1.1.4-optflags.patch @@ -1,5 +1,5 @@ ---- xine-lib-1.1.3/m4/optimizations.m4~ 2006-06-17 18:20:56.000000000 +0300 -+++ xine-lib-1.1.3/m4/optimizations.m4 2006-12-17 11:49:44.000000000 +0200 +--- xine-lib-1.1.4/m4/optimizations.m4~ 2006-06-17 18:20:56.000000000 +0300 ++++ xine-lib-1.1.4/m4/optimizations.m4 2007-01-30 23:03:27.000000000 +0200 @@ -107,7 +107,7 @@ DEBUG_CFLAGS="-O $DEBUG_CFLAGS" @@ -9,9 +9,9 @@ archopt_val= case "$host_or_hostalias" in ---- xine-lib-1.1.3/configure~ 2006-12-03 21:41:27.000000000 +0200 -+++ xine-lib-1.1.3/configure 2006-12-17 11:50:07.000000000 +0200 -@@ -46971,7 +46971,7 @@ +--- 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" diff --git a/xine-lib-mk-autotools-patch.sh b/xine-lib-mk-autotools-patch.sh new file mode 100644 index 0000000..88db99c --- /dev/null +++ b/xine-lib-mk-autotools-patch.sh @@ -0,0 +1,24 @@ +#!/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 + +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 + +cd xine-lib-$version +./autogen.sh noconfig +rm -rf autom4te.cache *~ +cd .. + +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 8477e9b..b902952 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,29 +1,26 @@ # TODO, sometime, maybe: # - libstk: http://www.libstk.net/ # - pulseaudio +# - --enable-antialiasing? %define codecdir %{_libdir}/codecs Summary: Xine library Name: xine-lib -Version: 1.1.3 -Release: 3%{?dist} +Version: 1.1.4 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://xinehq.de/ # The tarball is generated from the upstream tarball using # the script in SOURCE1. It prunes potentially patented code -#Source0: http://dl.sourceforge.net/xine/xine-lib-%{version}.tar.gz +#Source0: http://dl.sourceforge.net/xine/xine-lib-%{version}.tar.bz2 Source0: %{name}-%{version}-pruned.tar.bz2 Source1: %{name}-cleanup-sources.sh -# To recreate the autotools patch: install build deps, extract source0, -# remove run_configure "$@" from autogen.sh, copy the dir to -patched, -# run autogen.sh (doesn't work with automake 1.10 as of 1.1.3 so use 1.9), -# remove autom4te.cache, then diff the dirs. Apply rest of the patches during -# build so that autotools do not need to be run again. -Patch0: %{name}-1.1.3-autotools.patch.bz2 -Patch1: %{name}-1.1.3-optflags.patch -Patch2: %{name}-1.1.3-flac113.patch +Source2: %{name}-mk-autotools-patch.sh +# autotools patch created with source2 +Patch0: %{name}-1.1.4-autotools.patch.bz2 +Patch1: %{name}-1.1.4-optflags.patch Patch3: %{name}-1.1.3-legacy-flac-init.patch Patch6: %{name}-1.1.1-deepbind-939.patch Patch7: %{name}-1.1.1-multilib-devel.patch @@ -45,7 +42,7 @@ BuildRequires: ImageMagick-devel >= 6.2.4.6-1 # Audio BuildRequires: libogg-devel libvorbis-devel flac-devel libmodplug-devel BuildRequires: esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0 -BuildRequires: jack-audio-connection-kit-devel +BuildRequires: jack-audio-connection-kit-devel wavpack-devel libmpcdec-devel # CDs BuildRequires: libcdio-devel # Other @@ -101,10 +98,10 @@ This package contains extra plugins for xine-lib: %prep %setup -q %patch0 -p1 -b .autotools -cp -p m4/optimizations.m4 m4/optimizations.m4.stamp +touch -r configure.ac aclocal.m4 +touch -r m4/optimizations.m4 m4/optimizations.m4.stamp %patch1 -p1 -b .optflags touch -r m4/optimizations.m4.stamp m4/optimizations.m4 -%patch2 -p1 -b .flac113 %patch3 -p0 -b .legacy-flac-init # Patch6 needed at least when compiling with external ffmpeg, #939. %patch6 -p1 -b .deepbind @@ -124,6 +121,9 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" --with-xv-path=%{_libdir} \ --with-w32-path=%{codecdir} \ --with-external-ffmpeg \ + --with-external-libmpcdec \ + --with-libflac \ + --with-wavpack \ --enable-ipv6 \ %if 0%{!?_without_directfb:1} --enable-directfb \ @@ -149,8 +149,8 @@ make %{?_smp_mflags} rm -rf $RPM_BUILD_ROOT __docs make install DESTDIR=$RPM_BUILD_ROOT %find_lang libxine1 -cp -pR $RPM_BUILD_ROOT%{_docdir}/xine __docs -rm -rf $RPM_BUILD_ROOT%{_docdir}/xine +cp -pR $RPM_BUILD_ROOT%{_docdir}/xine-lib __docs +rm -rf $RPM_BUILD_ROOT%{_docdir}/xine-lib # Removing useless files rm -Rf $RPM_BUILD_ROOT%{_libdir}/libxine.la __docs/README \ @@ -166,12 +166,14 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig + %postun -p /sbin/ldconfig %files -f libxine1.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING CREDITS ChangeLog* README TODO __docs/README.* __docs/faq +%doc AUTHORS COPYING CREDITS ChangeLog* README TODO +%doc __docs/README.* __docs/faq.* %dir %{codecdir} %{_datadir}/xine %{_libdir}/libxine.so.* @@ -213,6 +215,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_spudvb.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so %{_libdir}/xine/plugins/%{version}/xineplug_dmx_yuv_frames.so %{_libdir}/xine/plugins/%{version}/xineplug_dmx_real.so %{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so @@ -232,7 +235,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/xineplug_dmx_games.so %{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so %{_libdir}/xine/plugins/%{version}/xineplug_flac.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so +%{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so %ifarch %ix86 %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so @@ -281,6 +284,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 - Fix libflac decoder with FLAC < 1.1.3 (#220961). - Apply upstream patch for FLAC >= 1.1.3. From 363bbcc165f3db5dff31fe274e3a71ab117537d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 10 Mar 2007 22:12:58 +0000 Subject: [PATCH 04/43] =?UTF-8?q?*=20Sat=20Mar=2010=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=201.1.4-3=20-=20Apply?= =?UTF-8?q?=20upstream=20fix=20for=20CVE-2007-1246.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xine-lib-1.1.4-CVE-2007-1246.patch | 40 ++++++++++++++++++++++++++++++ xine-lib.spec | 10 +++++++- 2 files changed, 49 insertions(+), 1 deletion(-) create mode 100644 xine-lib-1.1.4-CVE-2007-1246.patch diff --git a/xine-lib-1.1.4-CVE-2007-1246.patch b/xine-lib-1.1.4-CVE-2007-1246.patch new file mode 100644 index 0000000..c7fec5d --- /dev/null +++ b/xine-lib-1.1.4-CVE-2007-1246.patch @@ -0,0 +1,40 @@ +--------------------- +PatchSet 8656 +Date: 2007/03/10 02:41:34 +Author: dgp85 +Branch: HEAD +Tag: (none) +Log: + * Security fixes: + - Fix heap overflow in DMO loader. (CVE-2007-1246) [bug #1676925] + Thanks to Kees Cook for reporting. + +Members: + ChangeLog:1.724->1.725 + src/libw32dll/DirectShow/DS_VideoDecoder.c:1.9->1.10 + src/libw32dll/dmo/DMO_VideoDecoder.c:1.4->1.5 + +Index: xine-lib/src/libw32dll/DirectShow/DS_VideoDecoder.c +diff -u xine-lib/src/libw32dll/DirectShow/DS_VideoDecoder.c:1.9 xine-lib/src/libw32dll/DirectShow/DS_VideoDecoder.c:1.10 +--- xine-lib/src/libw32dll/DirectShow/DS_VideoDecoder.c:1.9 Wed Dec 24 16:55:36 2003 ++++ xine-lib/src/libw32dll/DirectShow/DS_VideoDecoder.c Sat Mar 10 00:41:34 2007 +@@ -110,6 +110,7 @@ + + this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs); + memcpy(this->iv.m_bh, format, bihs); ++ this->iv.m_bh->biSize = bihs; + + this->iv.m_State = STOP; + //this->iv.m_pFrame = 0; +Index: xine-lib/src/libw32dll/dmo/DMO_VideoDecoder.c +diff -u xine-lib/src/libw32dll/dmo/DMO_VideoDecoder.c:1.4 xine-lib/src/libw32dll/dmo/DMO_VideoDecoder.c:1.5 +--- xine-lib/src/libw32dll/dmo/DMO_VideoDecoder.c:1.4 Wed Dec 24 16:55:36 2003 ++++ xine-lib/src/libw32dll/dmo/DMO_VideoDecoder.c Sat Mar 10 00:41:34 2007 +@@ -118,6 +118,7 @@ + + this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs); + memcpy(this->iv.m_bh, format, bihs); ++ this->iv.m_bh->biSize = bihs; + + this->iv.m_State = STOP; + //this->iv.m_pFrame = 0; diff --git a/xine-lib.spec b/xine-lib.spec index b902952..2397a7b 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -8,7 +8,7 @@ Summary: Xine library Name: xine-lib Version: 1.1.4 -Release: 1%{?dist} +Release: 3%{?dist} License: GPL Group: System Environment/Libraries URL: http://xinehq.de/ @@ -21,6 +21,7 @@ Source2: %{name}-mk-autotools-patch.sh # autotools patch created with source2 Patch0: %{name}-1.1.4-autotools.patch.bz2 Patch1: %{name}-1.1.4-optflags.patch +Patch2: %{name}-1.1.4-CVE-2007-1246.patch Patch3: %{name}-1.1.3-legacy-flac-init.patch Patch6: %{name}-1.1.1-deepbind-939.patch Patch7: %{name}-1.1.1-multilib-devel.patch @@ -101,6 +102,7 @@ This package contains extra plugins for xine-lib: touch -r configure.ac aclocal.m4 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp %patch1 -p1 -b .optflags +%patch2 -p1 -b .CVE-2007-1246 touch -r m4/optimizations.m4.stamp m4/optimizations.m4 %patch3 -p0 -b .legacy-flac-init # Patch6 needed at least when compiling with external ffmpeg, #939. @@ -284,6 +286,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 +- Rebuild. + * Wed Jan 31 2007 Ville Skyttä - 1.1.4-1 - 1.1.4, with wavpack and system libmpcdec support. From 8f80adbca060c45cd1b20f7c9bdc48053e6407a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 13 Apr 2007 20:52:22 +0000 Subject: [PATCH 05/43] =?UTF-8?q?*=20Wed=20Apr=2011=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=201.1.5-1=20-=201.1.5?= =?UTF-8?q?.=20-=20Include=20GSM=2006.10=20decoder=20(#228186).=20-=20Re-e?= =?UTF-8?q?nable=20CACA=20support.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 - 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). --- .cvsignore | 4 +- sources | 4 +- xine-lib-1.1.3-legacy-flac-init.patch | 16 -- xine-lib-1.1.4-CVE-2007-1246.patch | 40 ---- ...tch => xine-lib-1.1.5-multilib-devel.patch | 8 +- xine-lib-1.1.5-pthread-check.patch | 24 ++ xine-lib-cleanup-sources.sh | 20 +- xine-lib-mk-autotools-patch.sh | 8 + xine-lib.spec | 214 +++++++++++------- 9 files changed, 185 insertions(+), 153 deletions(-) delete mode 100644 xine-lib-1.1.3-legacy-flac-init.patch delete mode 100644 xine-lib-1.1.4-CVE-2007-1246.patch rename xine-lib-1.1.1-multilib-devel.patch => xine-lib-1.1.5-multilib-devel.patch (77%) create mode 100644 xine-lib-1.1.5-pthread-check.patch diff --git a/.cvsignore b/.cvsignore index aea6ec7..41883b2 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.4-pruned.tar.bz2 -xine-lib-1.1.4-autotools.patch.bz2 +xine-lib-1.1.5-pruned.tar.bz2 +xine-lib-1.1.5-autotools.patch.bz2 diff --git a/sources b/sources index 2a4625c..f2e30be 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -81faabf1e38abed44639dbe4c76719f9 xine-lib-1.1.4-pruned.tar.bz2 -a916758545ed73a369f40648c7bc449c xine-lib-1.1.4-autotools.patch.bz2 +f903a0426a812ea70200b7a528f67b00 xine-lib-1.1.5-pruned.tar.bz2 +f955ece2fba4dfbbf22fbb2a8376ae60 xine-lib-1.1.5-autotools.patch.bz2 diff --git a/xine-lib-1.1.3-legacy-flac-init.patch b/xine-lib-1.1.3-legacy-flac-init.patch deleted file mode 100644 index ba1cdb7..0000000 --- a/xine-lib-1.1.3-legacy-flac-init.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: src/libflac/decoder_flac.c -=================================================================== -RCS file: /cvsroot/xine/xine-lib/src/libflac/decoder_flac.c,v -retrieving revision 1.22 -diff -u -r1.22 decoder_flac.c ---- src/libflac/decoder_flac.c 25 Dec 2006 19:22:00 -0000 1.22 -+++ src/libflac/decoder_flac.c 3 Jan 2007 19:58:07 -0000 -@@ -363,7 +363,7 @@ - - FLAC__stream_decoder_set_client_data (this->flac_decoder, this); - -- if (FLAC__stream_decoder_init (this->flac_decoder) == FLAC__STREAM_DECODER_SEARCH_FOR_METADATA) { -+ if (FLAC__stream_decoder_init (this->flac_decoder) != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA) { - free (this); - return NULL; - } diff --git a/xine-lib-1.1.4-CVE-2007-1246.patch b/xine-lib-1.1.4-CVE-2007-1246.patch deleted file mode 100644 index c7fec5d..0000000 --- a/xine-lib-1.1.4-CVE-2007-1246.patch +++ /dev/null @@ -1,40 +0,0 @@ ---------------------- -PatchSet 8656 -Date: 2007/03/10 02:41:34 -Author: dgp85 -Branch: HEAD -Tag: (none) -Log: - * Security fixes: - - Fix heap overflow in DMO loader. (CVE-2007-1246) [bug #1676925] - Thanks to Kees Cook for reporting. - -Members: - ChangeLog:1.724->1.725 - src/libw32dll/DirectShow/DS_VideoDecoder.c:1.9->1.10 - src/libw32dll/dmo/DMO_VideoDecoder.c:1.4->1.5 - -Index: xine-lib/src/libw32dll/DirectShow/DS_VideoDecoder.c -diff -u xine-lib/src/libw32dll/DirectShow/DS_VideoDecoder.c:1.9 xine-lib/src/libw32dll/DirectShow/DS_VideoDecoder.c:1.10 ---- xine-lib/src/libw32dll/DirectShow/DS_VideoDecoder.c:1.9 Wed Dec 24 16:55:36 2003 -+++ xine-lib/src/libw32dll/DirectShow/DS_VideoDecoder.c Sat Mar 10 00:41:34 2007 -@@ -110,6 +110,7 @@ - - this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs); - memcpy(this->iv.m_bh, format, bihs); -+ this->iv.m_bh->biSize = bihs; - - this->iv.m_State = STOP; - //this->iv.m_pFrame = 0; -Index: xine-lib/src/libw32dll/dmo/DMO_VideoDecoder.c -diff -u xine-lib/src/libw32dll/dmo/DMO_VideoDecoder.c:1.4 xine-lib/src/libw32dll/dmo/DMO_VideoDecoder.c:1.5 ---- xine-lib/src/libw32dll/dmo/DMO_VideoDecoder.c:1.4 Wed Dec 24 16:55:36 2003 -+++ xine-lib/src/libw32dll/dmo/DMO_VideoDecoder.c Sat Mar 10 00:41:34 2007 -@@ -118,6 +118,7 @@ - - this->iv.m_bh = (BITMAPINFOHEADER*)malloc(bihs); - memcpy(this->iv.m_bh, format, bihs); -+ this->iv.m_bh->biSize = bihs; - - this->iv.m_State = STOP; - //this->iv.m_pFrame = 0; diff --git a/xine-lib-1.1.1-multilib-devel.patch b/xine-lib-1.1.5-multilib-devel.patch similarity index 77% rename from xine-lib-1.1.1-multilib-devel.patch rename to xine-lib-1.1.5-multilib-devel.patch index ff0c549..5b5d05d 100644 --- a/xine-lib-1.1.1-multilib-devel.patch +++ b/xine-lib-1.1.5-multilib-devel.patch @@ -1,5 +1,5 @@ ---- misc/xine-config.in~ 2005-09-05 20:02:57.000000000 +0300 -+++ misc/xine-config.in 2006-06-13 01:43:55.000000000 +0300 +--- misc/xine-config.in~ 2007-04-05 01:18:00.000000000 +0300 ++++ misc/xine-config.in 2007-04-11 01:32:44.000000000 +0300 @@ -2,8 +2,8 @@ # # @@ -24,12 +24,12 @@ fi if test "$echo_cflags" = "yes"; then -- echo -I@includedir@ @THREAD_CPPFLAGS@ +- echo -I@includedir@ @PTHREAD_CFLAGS@ + pkg-config libxine --cflags fi if test "$echo_libs" = "yes"; then -- echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @THREAD_LIBS@ @LIBICONV@ @RT_LIBS@ +- echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@ + pkg-config libxine --libs fi if test "$echo_plugindir" = "yes"; then diff --git a/xine-lib-1.1.5-pthread-check.patch b/xine-lib-1.1.5-pthread-check.patch new file mode 100644 index 0000000..9a6a974 --- /dev/null +++ b/xine-lib-1.1.5-pthread-check.patch @@ -0,0 +1,24 @@ +Upstream changeset 8743:defc4f072bde + additional fix in fakethread(). + +diff -r d1512848e87b -r defc4f072bde m4/pthreads.m4 +--- a/m4/pthreads.m4 Tue Apr 10 17:08:22 2007 +0100 ++++ b/m4/pthreads.m4 Wed Apr 11 17:32:13 2007 +0200 +@@ -36,11 +36,15 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ + [ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $cc_cv_werror $PTHREAD_CFLAGS" ++ + LIBS="$LIBS $PTHREAD_LIBS" +- AC_COMPILE_IFELSE( ++ AC_LINK_IFELSE( + [AC_LANG_PROGRAM( +- [[#include ]], +- [[pthread_create(NULL, NULL, NULL, NULL);]] ++ [[#include ++ void *fakethread(void *arg) { return NULL; } ++ pthread_t fakevariable; ++ ]], ++ [[pthread_create(&fakevariable, NULL, &fakethread, NULL);]] + )], + [cc_cv_pthreads=yes], + [cc_cv_pthreads=no]) diff --git a/xine-lib-cleanup-sources.sh b/xine-lib-cleanup-sources.sh index 97da5bd..0a240f2 100755 --- a/xine-lib-cleanup-sources.sh +++ b/xine-lib-cleanup-sources.sh @@ -6,7 +6,7 @@ if [ -z "$1" -o $# -ne 1 ]; then fi version=$1 -tarball="xine-lib-$version.tar.gz" +tarball="xine-lib-$version.tar.bz2" dir="xine-lib-$version" modtarball="xine-lib-$version-pruned.tar.bz2" @@ -18,11 +18,11 @@ fi echo "Uncompressing $tarball..." rm -rf $dir -tar -xzf $tarball +tar -xjf $tarball cd $dir # Main libraries -for remove in libfaad libffmpeg libmad libmpeg2 dxr3 libspudec libxineadec libspucmml libspucc liba52 libdts; do +for remove in libfaad libffmpeg libmad libmpeg2 dxr3 libspudec libspucmml libspucc liba52 libdts; do echo "removing src/$remove..." rm -rf src/$remove sed -i -e "/$remove/d" src/Makefile.am @@ -53,8 +53,20 @@ for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am done +# Postprocessors echo "removing planar and deinterlace postprocessors..." -sed -i -e 's/planar//g;s/deinterlace//g' src/post/Makefile.am # fails to build +sed -i -e 's/deinterlace //g' src/post/Makefile.am # see comments in speedy.c +sed -i -e 's/planar //g' src/post/Makefile.am # requires libpostproc +sed -i -e '/post\/\(deinterlace\|planar\)/d' configure.ac +rm -rf src/post/{deinterlace,planar} +# NSF decoder +echo "removing NSF decoder..." +rm -rf src/libxineadec/{nosefart,nsf.c} +sed -i -e '/^xineplug_decode_nsf_la/,/^\s*$/d' \ + -e /xineplug_decode_nsf/d \ + -e 's/ nosefart//' \ + src/libxineadec/Makefile.am +sed -i -e /nosefart/d configure.ac # All clean ! diff --git a/xine-lib-mk-autotools-patch.sh b/xine-lib-mk-autotools-patch.sh index 88db99c..4166b06 100644 --- a/xine-lib-mk-autotools-patch.sh +++ b/xine-lib-mk-autotools-patch.sh @@ -11,11 +11,19 @@ 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 cd xine-lib-$version +patch -p1 < ../xine-lib-$version-pthread-check.patch # XXX hopefully temporary ./autogen.sh noconfig rm -rf autom4te.cache *~ cd .. diff --git a/xine-lib.spec b/xine-lib.spec index 2397a7b..0dcdc74 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,14 +1,18 @@ # TODO, sometime, maybe: -# - libstk: http://www.libstk.net/ -# - pulseaudio -# - --enable-antialiasing? +# - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog +# - xcb stuff when it's available %define codecdir %{_libdir}/codecs +%ifarch %{ix86} +%define have_vidix 1 +%else +%define have_vidix 0 +%endif Summary: Xine library Name: xine-lib -Version: 1.1.4 -Release: 3%{?dist} +Version: 1.1.5 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://xinehq.de/ @@ -19,35 +23,39 @@ Source0: %{name}-%{version}-pruned.tar.bz2 Source1: %{name}-cleanup-sources.sh Source2: %{name}-mk-autotools-patch.sh # autotools patch created with source2 -Patch0: %{name}-1.1.4-autotools.patch.bz2 +Patch0: %{name}-1.1.5-autotools.patch.bz2 Patch1: %{name}-1.1.4-optflags.patch -Patch2: %{name}-1.1.4-CVE-2007-1246.patch -Patch3: %{name}-1.1.3-legacy-flac-init.patch +# Patch2 applied while creating full autotools patch +Patch2: %{name}-1.1.5-pthread-check.patch Patch6: %{name}-1.1.1-deepbind-939.patch -Patch7: %{name}-1.1.1-multilib-devel.patch +Patch7: %{name}-1.1.5-multilib-devel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # X11 BuildRequires: libX11-devel libXv-devel libXinerama-devel libXvMC-devel libGLU-devel # Video -BuildRequires: freetype-devel SDL-devel libtheora-devel libmng-devel +BuildRequires: SDL-devel libtheora-devel libmng-devel BuildRequires: aalib-devel >= 1.4 -%if 0%{?_with_caca:1} BuildRequires: libcaca-devel >= 0.99 -%endif %if 0%{!?_without_directfb:1} BuildRequires: directfb-devel %endif %if 0%{!?_without_imagemagick:1} BuildRequires: ImageMagick-devel >= 6.2.4.6-1 %endif +%if 0%{?_with_freetype:1} +BuildRequires: fontconfig-devel +%endif # Audio BuildRequires: libogg-devel libvorbis-devel flac-devel libmodplug-devel BuildRequires: esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0 BuildRequires: jack-audio-connection-kit-devel wavpack-devel libmpcdec-devel +BuildRequires: pulseaudio-lib-devel # CDs BuildRequires: libcdio-devel # Other -BuildRequires: pkgconfig gnome-vfs2-devel gtk2-devel samba-common +BuildRequires: pkgconfig gnome-vfs2-devel gtk2-devel +# samba-common in <= FC-6, libsmbclient-devel in FC7+ +BuildRequires: %{_includedir}/libsmbclient.h %package devel Summary: Xine library development files @@ -69,7 +77,8 @@ interprets many of the most common multimedia formats available - and some of the most uncommon formats, too. Non-default rpmbuild options: --without imagemagick: Disable ImageMagick support --without directfb: Disable DirectFB support ---with caca: Enable CACA support +--with freetype: Enable FreeType/Fontconfig support +--with antialiasing: Enable font antialiasing (with FreeType/FontConfig) %description devel This package contains development files for xine-lib. @@ -79,14 +88,13 @@ This package contains extra plugins for xine-lib: - aRts - EsounD - JACK + - Pulseaudio - GDK-Pixbuf - GNOME VFS - SMB - SDL - AA-lib -%if 0%{?_with_caca:1} - Libcaca -%endif %if 0%{!?_without_imagemagick:1} - Image decoding %endif @@ -102,15 +110,11 @@ This package contains extra plugins for xine-lib: touch -r configure.ac aclocal.m4 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp %patch1 -p1 -b .optflags -%patch2 -p1 -b .CVE-2007-1246 touch -r m4/optimizations.m4.stamp m4/optimizations.m4 -%patch3 -p0 -b .legacy-flac-init # Patch6 needed at least when compiling with external ffmpeg, #939. %patch6 -p1 -b .deepbind %patch7 -p0 -b .multilib-devel -find . -name "*.[hc]" | xargs chmod -c -x - # Avoid standard rpaths on lib64 archs: sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure @@ -133,8 +137,12 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %if 0%{?_without_imagemagick:1} --without-imagemagick \ %endif -%if 0%{!?_with_caca:1} - --without-caca \ +%if 0%{?_with_freetype:1} + --with-freetype \ + --with-fontconfig \ +%if 0%{?_with_antialiasing:1} + --enable-antialiasing \ +%endif %endif --disable-libfame \ --disable-faad \ @@ -174,7 +182,7 @@ rm -rf $RPM_BUILD_ROOT %files -f libxine1.lang %defattr(-,root,root,-) -%doc AUTHORS COPYING CREDITS ChangeLog* README TODO +%doc AUTHORS COPYING COPYING.LIB CREDITS ChangeLog* README TODO %doc __docs/README.* __docs/faq.* %dir %{codecdir} %{_datadir}/xine @@ -183,72 +191,95 @@ rm -rf $RPM_BUILD_ROOT %dir %{_libdir}/xine/ %dir %{_libdir}/xine/plugins/ %dir %{_libdir}/xine/plugins/%{version}/ -# I list all the plugins because I don't want a non-free plugin -# to sneak into a future version +%{_libdir}/xine/plugins/%{version}/mime.types +# Listing every plugin separately for better control over binary packages +# containing exactly the plugins we want, nothing accidentally snuck in +# nor dropped. +%dir %{_libdir}/xine/plugins/%{version}/post/ +%{_libdir}/xine/plugins/%{version}/post/xineplug_post_audio_filters.so +%{_libdir}/xine/plugins/%{version}/post/xineplug_post_goom.so +%{_libdir}/xine/plugins/%{version}/post/xineplug_post_mosaico.so +%{_libdir}/xine/plugins/%{version}/post/xineplug_post_switch.so +%{_libdir}/xine/plugins/%{version}/post/xineplug_post_visualizations.so +%if %{have_vidix} +%dir %{_libdir}/xine/plugins/%{version}/vidix/ +%{_libdir}/xine/plugins/%{version}/vidix/cyberblade_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/mach64_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/mga_crtc2_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/mga_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/nvidia_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/pm2_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/pm3_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/radeon_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/rage128_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/savage_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/sis_vid.so +%{_libdir}/xine/plugins/%{version}/vidix/unichrome_vid.so +%endif %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so -%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_oss.so -%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_fb.so %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_none.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_opengl.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so +%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so +%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_oss.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_bitplane.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_gsm610.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_lpcm.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so +%ifarch %ix86 +%{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so +%endif +%{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_spudvb.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so +%{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so +%ifarch %ix86 +%{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so +%endif +%{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_fli.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_flv.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_games.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_iff.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_image.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_matroska.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_mng.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_nsv.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_ogg.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_pva.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_qt.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_rawdv.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_real.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_sputext.so +%{_libdir}/xine/plugins/%{version}/xineplug_dmx_yuv_frames.so +%{_libdir}/xine/plugins/%{version}/xineplug_flac.so +%{_libdir}/xine/plugins/%{version}/xineplug_inp_cdda.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_dvb.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_v4l.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_file.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_http.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_net.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_pnm.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_cdda.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_stdin_fifo.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtsp.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_pvr.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_rtp.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_bitplane.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_lpcm.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_real_audio.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_spudvb.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_yuv_frames.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_real.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_iff.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_flv.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_image.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_matroska.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_ogg.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_fli.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_nsv.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_mng.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_pva.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_qt.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_rawdv.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_sputext.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_games.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so -%{_libdir}/xine/plugins/%{version}/xineplug_flac.so -%{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so -%ifarch %ix86 +%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtsp.so +%{_libdir}/xine/plugins/%{version}/xineplug_inp_stdin_fifo.so +%{_libdir}/xine/plugins/%{version}/xineplug_inp_v4l.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_fb.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_none.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_opengl.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so +%if %{have_vidix} %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so %endif -%ifnarch ppc64 s390 s390x -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so -%endif -%{_libdir}/xine/plugins/%{version}/post/ -%{_libdir}/xine/plugins/%{version}/vidix/ +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so +%{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so %files extras @@ -256,20 +287,19 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so +%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so -%if 0%{?_with_caca:1} -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so -%endif %if 0%{!?_without_imagemagick:1} %{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so %endif +%{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so +%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so %if 0%{!?_without_directfb:1} %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so %endif +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so %files devel @@ -284,8 +314,22 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/xine-config.1* - %changelog +* 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ä +- Exclude vidix dir on systems that don't have vidix. +- Specfile cleanups. + +* 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 - Apply upstream fix for CVE-2007-1246. From 942ecd933af5188706dc549e1a7b4700119ff693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sun, 22 Apr 2007 18:31:21 +0000 Subject: [PATCH 06/43] =?UTF-8?q?*=20Wed=20Apr=2018=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=201.1.6-1=20-=201.1.6?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 4 ++-- sources | 4 ++-- xine-lib-1.1.5-pthread-check.patch | 24 ------------------------ xine-lib-mk-autotools-patch.sh | 1 - xine-lib.spec | 10 ++++++---- 5 files changed, 10 insertions(+), 33 deletions(-) delete mode 100644 xine-lib-1.1.5-pthread-check.patch diff --git a/.cvsignore b/.cvsignore index 41883b2..1a3b46f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.5-pruned.tar.bz2 -xine-lib-1.1.5-autotools.patch.bz2 +xine-lib-1.1.6-pruned.tar.bz2 +xine-lib-1.1.6-autotools.patch.bz2 diff --git a/sources b/sources index f2e30be..0470388 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f903a0426a812ea70200b7a528f67b00 xine-lib-1.1.5-pruned.tar.bz2 -f955ece2fba4dfbbf22fbb2a8376ae60 xine-lib-1.1.5-autotools.patch.bz2 +3869f0045311b3638c5724cd1ac122e9 xine-lib-1.1.6-pruned.tar.bz2 +25742f2347a1d9c4c08476c82f3ec5fc xine-lib-1.1.6-autotools.patch.bz2 diff --git a/xine-lib-1.1.5-pthread-check.patch b/xine-lib-1.1.5-pthread-check.patch deleted file mode 100644 index 9a6a974..0000000 --- a/xine-lib-1.1.5-pthread-check.patch +++ /dev/null @@ -1,24 +0,0 @@ -Upstream changeset 8743:defc4f072bde + additional fix in fakethread(). - -diff -r d1512848e87b -r defc4f072bde m4/pthreads.m4 ---- a/m4/pthreads.m4 Tue Apr 10 17:08:22 2007 +0100 -+++ b/m4/pthreads.m4 Wed Apr 11 17:32:13 2007 +0200 -@@ -36,11 +36,15 @@ AC_DEFUN([CC_PTHREAD_FLAGS], [ - [ac_save_CFLAGS="$CFLAGS" - ac_save_LIBS="$LIBS" - CFLAGS="$CFLAGS $cc_cv_werror $PTHREAD_CFLAGS" -+ - LIBS="$LIBS $PTHREAD_LIBS" -- AC_COMPILE_IFELSE( -+ AC_LINK_IFELSE( - [AC_LANG_PROGRAM( -- [[#include ]], -- [[pthread_create(NULL, NULL, NULL, NULL);]] -+ [[#include -+ void *fakethread(void *arg) { return NULL; } -+ pthread_t fakevariable; -+ ]], -+ [[pthread_create(&fakevariable, NULL, &fakethread, NULL);]] - )], - [cc_cv_pthreads=yes], - [cc_cv_pthreads=no]) diff --git a/xine-lib-mk-autotools-patch.sh b/xine-lib-mk-autotools-patch.sh index 4166b06..93590b4 100644 --- a/xine-lib-mk-autotools-patch.sh +++ b/xine-lib-mk-autotools-patch.sh @@ -23,7 +23,6 @@ tar jxf xine-lib-$version-pruned.tar.bz2 cp -a xine-lib-$version xine-lib-$version-pruned cd xine-lib-$version -patch -p1 < ../xine-lib-$version-pthread-check.patch # XXX hopefully temporary ./autogen.sh noconfig rm -rf autom4te.cache *~ cd .. diff --git a/xine-lib.spec b/xine-lib.spec index 0dcdc74..6c822ce 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -11,7 +11,7 @@ Summary: Xine library Name: xine-lib -Version: 1.1.5 +Version: 1.1.6 Release: 1%{?dist} License: GPL Group: System Environment/Libraries @@ -23,10 +23,8 @@ Source0: %{name}-%{version}-pruned.tar.bz2 Source1: %{name}-cleanup-sources.sh Source2: %{name}-mk-autotools-patch.sh # autotools patch created with source2 -Patch0: %{name}-1.1.5-autotools.patch.bz2 +Patch0: %{name}-%{version}-autotools.patch.bz2 Patch1: %{name}-1.1.4-optflags.patch -# Patch2 applied while creating full autotools patch -Patch2: %{name}-1.1.5-pthread-check.patch Patch6: %{name}-1.1.1-deepbind-939.patch Patch7: %{name}-1.1.5-multilib-devel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -298,6 +296,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so %if 0%{!?_without_directfb:1} %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so %endif %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so @@ -315,6 +314,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Apr 18 2007 Ville Skyttä - 1.1.6-1 +- 1.1.6. + * Wed Apr 11 2007 Ville Skyttä - 1.1.5-1 - 1.1.5. - Include GSM 06.10 decoder (#228186). From 6593b35827fbc9d8413f6b6c5af64de8abe9d7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 25 Apr 2007 19:21:01 +0000 Subject: [PATCH 07/43] =?UTF-8?q?*=20Wed=20Apr=2025=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=201.1.6-2=20-=20Make?= =?UTF-8?q?=20Real=20codec=20search=20path=20/usr/lib(64)/codecs=20again?= =?UTF-8?q?=20(#237743).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xine-lib.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 6c822ce..f2a41cb 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -12,7 +12,7 @@ Summary: Xine library Name: xine-lib Version: 1.1.6 -Release: 1%{?dist} +Release: 2%{?dist} License: GPL Group: System Environment/Libraries URL: http://xinehq.de/ @@ -124,6 +124,7 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %configure --disable-dependency-tracking \ --with-xv-path=%{_libdir} \ --with-w32-path=%{codecdir} \ + --with-real-codecs-path=%{codecdir} \ --with-external-ffmpeg \ --with-external-libmpcdec \ --with-libflac \ @@ -182,8 +183,8 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc AUTHORS COPYING COPYING.LIB CREDITS ChangeLog* README TODO %doc __docs/README.* __docs/faq.* -%dir %{codecdir} -%{_datadir}/xine +%dir %{codecdir}/ +%{_datadir}/xine/ %{_libdir}/libxine.so.* %{_mandir}/man5/xine.5* %dir %{_libdir}/xine/ @@ -314,6 +315,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 - 1.1.6. From f6556dff0bd3b12f6dadd0f59ab58449d85b88a0 Mon Sep 17 00:00:00 2001 From: Aurelien Bompard Date: Sat, 14 Jul 2007 09:13:26 +0000 Subject: [PATCH 08/43] =?UTF-8?q?*=20Thu=20Jun=20=207=202007=20Ville=20Sky?= =?UTF-8?q?tt=C3=A4=20=20-=201.1.7-1=20-=201.1?= =?UTF-8?q?.7.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .cvsignore | 4 ++-- sources | 4 ++-- xine-lib.spec | 8 ++++++-- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1a3b46f..e98b803 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.6-pruned.tar.bz2 -xine-lib-1.1.6-autotools.patch.bz2 +xine-lib-1.1.7-pruned.tar.bz2 +xine-lib-1.1.7-autotools.patch.bz2 diff --git a/sources b/sources index 0470388..4131b00 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -3869f0045311b3638c5724cd1ac122e9 xine-lib-1.1.6-pruned.tar.bz2 -25742f2347a1d9c4c08476c82f3ec5fc xine-lib-1.1.6-autotools.patch.bz2 +8f0714de28dab403288bbccf1a8c30c2 xine-lib-1.1.7-pruned.tar.bz2 +6b7f1d168b8b367a8c7709db687c60f6 xine-lib-1.1.7-autotools.patch.bz2 diff --git a/xine-lib.spec b/xine-lib.spec index f2a41cb..2ee1dbc 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -11,8 +11,8 @@ Summary: Xine library Name: xine-lib -Version: 1.1.6 -Release: 2%{?dist} +Version: 1.1.7 +Release: 1%{?dist} License: GPL Group: System Environment/Libraries URL: http://xinehq.de/ @@ -129,6 +129,7 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" --with-external-libmpcdec \ --with-libflac \ --with-wavpack \ + --with-arts \ --enable-ipv6 \ %if 0%{!?_without_directfb:1} --enable-directfb \ @@ -315,6 +316,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Jun 7 2007 Ville Skyttä - 1.1.7-1 +- 1.1.7. + * Wed Apr 25 2007 Ville Skyttä - 1.1.6-2 - Make Real codec search path /usr/lib(64)/codecs again (#237743). From 1a8a2b6e69e981a4751c06d7e5e4fe1d91b2f290 Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Fri, 7 Sep 2007 18:39:27 +0000 Subject: [PATCH 09/43] Initialize branch EL-5 for xine-lib --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..42f697a --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-5 From 51c88ef60f2bed912b67bed9b22617ae804b67d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 10 Sep 2007 15:17:50 +0000 Subject: [PATCH 10/43] Sync with devel --- .cvsignore | 4 +- sources | 4 +- xine-lib.spec | 117 ++++++++++++++++++++++++++++++++++++-------------- 3 files changed, 89 insertions(+), 36 deletions(-) diff --git a/.cvsignore b/.cvsignore index e98b803..0426b0d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.7-pruned.tar.bz2 -xine-lib-1.1.7-autotools.patch.bz2 +xine-lib-1.1.8-pruned.tar.bz2 +xine-lib-1.1.8-autotools.patch.bz2 diff --git a/sources b/sources index 4131b00..00ae4ec 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -8f0714de28dab403288bbccf1a8c30c2 xine-lib-1.1.7-pruned.tar.bz2 -6b7f1d168b8b367a8c7709db687c60f6 xine-lib-1.1.7-autotools.patch.bz2 +6cbfae9d31fc138c7cb3c3d178e1286d xine-lib-1.1.8-pruned.tar.bz2 +b4a7c7a9af428b26667402d6dc180107 xine-lib-1.1.8-autotools.patch.bz2 diff --git a/xine-lib.spec b/xine-lib.spec index 2ee1dbc..c9a2d89 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,6 +1,11 @@ # TODO, sometime, maybe: # - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog -# - xcb stuff when it's available +# - drop the opengl video out plugin? +# http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html +# - move pulseaudio to main package from -extras? +# http://fedoraproject.org/wiki/Releases/FeaturePulseaudio +# --> not yet: +# http://www.redhat.com/archives/fedora-devel-list/2007-August/msg01411.html %define codecdir %{_libdir}/codecs %ifarch %{ix86} @@ -8,12 +13,17 @@ %else %define have_vidix 0 %endif +%if 0%{?fedora} >= 8 +%define with_xcb 1 +%else +%define with_xcb 0 +%endif Summary: Xine library Name: xine-lib -Version: 1.1.7 -Release: 1%{?dist} -License: GPL +Version: 1.1.8 +Release: 2%{?dist} +License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ # The tarball is generated from the upstream tarball using @@ -29,7 +39,11 @@ Patch6: %{name}-1.1.1-deepbind-939.patch Patch7: %{name}-1.1.5-multilib-devel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # X11 -BuildRequires: libX11-devel libXv-devel libXinerama-devel libXvMC-devel libGLU-devel +BuildRequires: libX11-devel libXv-devel libXinerama-devel libXvMC-devel +BuildRequires: libGLU-devel +%if %{with_xcb} +BuildRequires: libxcb-devel +%endif # Video BuildRequires: SDL-devel libtheora-devel libmng-devel BuildRequires: aalib-devel >= 1.4 @@ -61,6 +75,13 @@ Group: Development/Libraries Requires: %{name} = %{version}-%{release} Requires: pkgconfig zlib-devel +%package arts +Summary: aRts plugin for xine-lib +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +# -arts was split off the -extras subpackage at 1.1.7-3 +Obsoletes: xine-lib-extras < 1.1.7-3 + %package extras Summary: Additional plugins for xine-lib Group: System Environment/Libraries @@ -81,9 +102,11 @@ of the most uncommon formats, too. Non-default rpmbuild options: %description devel This package contains development files for xine-lib. +%description arts +This package contains the aRts extra plugin for xine-lib. + %description extras This package contains extra plugins for xine-lib: - - aRts - EsounD - JACK - Pulseaudio @@ -99,7 +122,9 @@ This package contains extra plugins for xine-lib: %if 0%{!?_without_directfb:1} - DirectFB output %endif - +%if %{with_xcb} + - XCB output +%endif %prep @@ -121,36 +146,37 @@ sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" " export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" " export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" -%configure --disable-dependency-tracking \ - --with-xv-path=%{_libdir} \ - --with-w32-path=%{codecdir} \ - --with-real-codecs-path=%{codecdir} \ - --with-external-ffmpeg \ - --with-external-libmpcdec \ - --with-libflac \ - --with-wavpack \ - --with-arts \ +# Keep list of options in mostly the same order as ./configure --help. +%configure \ + --disable-dependency-tracking \ --enable-ipv6 \ %if 0%{!?_without_directfb:1} --enable-directfb \ -%endif -%if 0%{?_without_imagemagick:1} - --without-imagemagick \ -%endif +%endif # directfb + --disable-a52dec \ + --disable-mad \ + --disable-dvdnavtest --with-external-dvdnav \ + --disable-vcd \ + --disable-asf \ + --disable-faad \ %if 0%{?_with_freetype:1} - --with-freetype \ - --with-fontconfig \ %if 0%{?_with_antialiasing:1} --enable-antialiasing \ -%endif -%endif - --disable-libfame \ - --disable-faad \ - --disable-mad \ - --disable-asf \ - --disable-vcd \ - --disable-a52dec \ - --with-external-dvdnav --disable-dvdnavtest +%endif # antialiasing + --with-freetype \ + --with-fontconfig \ +%endif # freetype + --with-external-ffmpeg \ + --with-xv-path=%{_libdir} \ + --with-libflac \ + --with-external-libmpcdec \ +%if 0%{?_without_imagemagick:1} + --without-imagemagick \ +%endif # imagemagick + --with-arts \ + --with-wavpack \ + --with-real-codecs-path=%{codecdir} \ + --with-w32-path=%{codecdir} make %{?_smp_mflags} @@ -282,9 +308,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so -%files extras +%files arts %defattr(-,root,root,-) %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so + +%files extras +%defattr(-,root,root,-) %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so @@ -301,6 +330,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so %endif %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so +%if %{with_xcb} +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so +%endif %files devel @@ -316,9 +349,29 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Sep 09 2007 Aurelien Bompard 1.1.8-2 +- 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 +- 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 +- 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 - 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 - Make Real codec search path /usr/lib(64)/codecs again (#237743). From 5e5e0125c82785ec10c2b796e707b1073bf0c7bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 10 Sep 2007 15:35:50 +0000 Subject: [PATCH 11/43] =?UTF-8?q?*=20Mon=20Sep=2010=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=201.1.8-2.1=20-=20Adj?= =?UTF-8?q?ust=20default=20-extras=20feature=20set=20for=20EPEL-5.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xine-lib.spec | 98 +++++++++++++++++++++++++++++++++++---------------- 1 file changed, 68 insertions(+), 30 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index c9a2d89..bd8c706 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -9,20 +9,32 @@ %define codecdir %{_libdir}/codecs %ifarch %{ix86} -%define have_vidix 1 + %define have_vidix 1 %else -%define have_vidix 0 + %define have_vidix 0 %endif %if 0%{?fedora} >= 8 -%define with_xcb 1 + %define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} %else -%define with_xcb 0 + %define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0} %endif +%if 0%{?fedora} + %define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1} + %define with_caca %{?_without_caca:0}%{!?_without_caca:1} + %define with_jack %{?_without_jack:0}%{!?_without_jack:1} + %define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1} +%else + %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} + %define with_caca %{?_with_caca:1}%{!?_with_caca:0} + %define with_jack %{?_with_jack:1}%{!?_with_jack:0} + %define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0} +%endif +%define with_dfb %{?_without_directfb:0}%{!?_without_directfb:1} Summary: Xine library Name: xine-lib Version: 1.1.8 -Release: 2%{?dist} +Release: 2%{?dist}.1 License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -43,25 +55,34 @@ BuildRequires: libX11-devel libXv-devel libXinerama-devel libXvMC-devel BuildRequires: libGLU-devel %if %{with_xcb} BuildRequires: libxcb-devel -%endif +%endif # xcb # Video BuildRequires: SDL-devel libtheora-devel libmng-devel +%if %{with_aalib} BuildRequires: aalib-devel >= 1.4 +%endif # aalib +%if %{with_caca} BuildRequires: libcaca-devel >= 0.99 -%if 0%{!?_without_directfb:1} +%endif # caca +%if %{with_dfb} BuildRequires: directfb-devel -%endif +%endif # dfb %if 0%{!?_without_imagemagick:1} BuildRequires: ImageMagick-devel >= 6.2.4.6-1 -%endif +%endif # imagemagick %if 0%{?_with_freetype:1} BuildRequires: fontconfig-devel -%endif +%endif # freetype # Audio BuildRequires: libogg-devel libvorbis-devel flac-devel libmodplug-devel BuildRequires: esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0 -BuildRequires: jack-audio-connection-kit-devel wavpack-devel libmpcdec-devel +BuildRequires: wavpack-devel libmpcdec-devel +%if %{with_pa} BuildRequires: pulseaudio-lib-devel +%endif # pa +%if %{with_jack} +BuildRequires: jack-audio-connection-kit-devel +%endif # jack # CDs BuildRequires: libcdio-devel # Other @@ -93,11 +114,9 @@ This package contains the Xine library. Xine is a free multimedia player. It can play back various media. It also decodes multimedia files from local disk drives, and displays multimedia streamed over the Internet. It interprets many of the most common multimedia formats available - and some -of the most uncommon formats, too. Non-default rpmbuild options: ---without imagemagick: Disable ImageMagick support ---without directfb: Disable DirectFB support ---with freetype: Enable FreeType/Fontconfig support ---with antialiasing: Enable font antialiasing (with FreeType/FontConfig) +of the most uncommon formats, too. --with/--without rpmbuild options +(some default values depend on target distribution): aalib, caca, directfb, +imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio, xcb. %description devel This package contains development files for xine-lib. @@ -108,23 +127,31 @@ This package contains the aRts extra plugin for xine-lib. %description extras This package contains extra plugins for xine-lib: - EsounD +%if %{with_jack} - JACK +%endif # jack +%if %{with_pa} - Pulseaudio +%endif # pa - GDK-Pixbuf - GNOME VFS - SMB - SDL +%if %{with_aalib} - AA-lib +%endif # aalib +%if %{with_caca} - Libcaca +%endif # caca %if 0%{!?_without_imagemagick:1} - Image decoding -%endif -%if 0%{!?_without_directfb:1} +%endif # imagemagick +%if %{with_dfb} - DirectFB output -%endif +%endif # dfb %if %{with_xcb} - XCB output -%endif +%endif # xcb %prep @@ -150,9 +177,9 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %configure \ --disable-dependency-tracking \ --enable-ipv6 \ -%if 0%{!?_without_directfb:1} +%if %{with_dfb} --enable-directfb \ -%endif # directfb +%endif # dfb --disable-a52dec \ --disable-mad \ --disable-dvdnavtest --with-external-dvdnav \ @@ -241,7 +268,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/vidix/savage_vid.so %{_libdir}/xine/plugins/%{version}/vidix/sis_vid.so %{_libdir}/xine/plugins/%{version}/vidix/unichrome_vid.so -%endif +%endif # vidix %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so @@ -252,7 +279,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so %ifarch %ix86 %{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so -%endif +%endif # ix86 %{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so %{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so @@ -262,7 +289,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so %ifarch %ix86 %{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so -%endif +%endif # ix86 %{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so %{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so %{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so @@ -300,7 +327,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so %if %{have_vidix} %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so -%endif +%endif # vidix %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so @@ -315,25 +342,33 @@ rm -rf $RPM_BUILD_ROOT %files extras %defattr(-,root,root,-) %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so +%if %{with_jack} %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so +%endif # jack +%if %{with_pa} %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so +%endif # pa %{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so %if 0%{!?_without_imagemagick:1} %{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so -%endif +%endif # imagemagick %{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so %{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so +%if %{with_aalib} %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so +%endif # aalib +%if %{with_caca} %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so -%if 0%{!?_without_directfb:1} +%endif # caca +%if %{with_dfb} %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so -%endif +%endif # dfb %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so %if %{with_xcb} %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so -%endif +%endif # xcb %files devel @@ -349,6 +384,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Sep 10 2007 Ville Skyttä - 1.1.8-2.1 +- Adjust default -extras feature set for EPEL-5. + * Sun Sep 09 2007 Aurelien Bompard 1.1.8-2 - remove the dependency from -extras to -arts, and use Obsoletes to provide an upgrade path From 1d5428d7f971e65091856d242459837b7c920dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 19 Sep 2007 19:04:25 +0000 Subject: [PATCH 12/43] =?UTF-8?q?*=20Sat=20Sep=2015=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=201.1.8-3=20-=20Move?= =?UTF-8?q?=20XCB=20plugins=20to=20the=20main=20package.=20-=20Make=20aali?= =?UTF-8?q?b,=20caca,=20pulseaudio,=20jack,=20and=20wavpack=20support=20op?= =?UTF-8?q?tional=20at=20build=20=20=20time=20in=20preparation=20for=20the?= =?UTF-8?q?=20first=20EPEL=20build.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xine-lib.spec | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index bd8c706..d953df1 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -23,18 +23,19 @@ %define with_caca %{?_without_caca:0}%{!?_without_caca:1} %define with_jack %{?_without_jack:0}%{!?_without_jack:1} %define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1} + %define with_wpack %{?_without_wavpack:0}%{!?_without_wavpack:1} %else %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} %define with_caca %{?_with_caca:1}%{!?_with_caca:0} %define with_jack %{?_with_jack:1}%{!?_with_jack:0} %define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0} + %define with_wpack %{?_with_wavpack:1}%{!?_with_wavpack:0} %endif -%define with_dfb %{?_without_directfb:0}%{!?_without_directfb:1} Summary: Xine library Name: xine-lib Version: 1.1.8 -Release: 2%{?dist}.1 +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -64,9 +65,9 @@ BuildRequires: aalib-devel >= 1.4 %if %{with_caca} BuildRequires: libcaca-devel >= 0.99 %endif # caca -%if %{with_dfb} +%if 0%{!?_without_directfb:1} BuildRequires: directfb-devel -%endif # dfb +%endif # directfb %if 0%{!?_without_imagemagick:1} BuildRequires: ImageMagick-devel >= 6.2.4.6-1 %endif # imagemagick @@ -76,7 +77,10 @@ BuildRequires: fontconfig-devel # Audio BuildRequires: libogg-devel libvorbis-devel flac-devel libmodplug-devel BuildRequires: esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0 -BuildRequires: wavpack-devel libmpcdec-devel +BuildRequires: libmpcdec-devel +%if %{with_wpack} +BuildRequires: wavpack-devel +%endif # wpack %if %{with_pa} BuildRequires: pulseaudio-lib-devel %endif # pa @@ -116,7 +120,8 @@ disk drives, and displays multimedia streamed over the Internet. It interprets many of the most common multimedia formats available - and some of the most uncommon formats, too. --with/--without rpmbuild options (some default values depend on target distribution): aalib, caca, directfb, -imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio, xcb. +imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio, +wavpack, xcb. %description devel This package contains development files for xine-lib. @@ -146,12 +151,9 @@ This package contains extra plugins for xine-lib: %if 0%{!?_without_imagemagick:1} - Image decoding %endif # imagemagick -%if %{with_dfb} +%if 0%{!?_without_directfb:1} - DirectFB output -%endif # dfb -%if %{with_xcb} - - XCB output -%endif # xcb +%endif # directfb %prep @@ -177,9 +179,9 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %configure \ --disable-dependency-tracking \ --enable-ipv6 \ -%if %{with_dfb} +%if 0%{!?_without_directfb:1} --enable-directfb \ -%endif # dfb +%endif # directfb --disable-a52dec \ --disable-mad \ --disable-dvdnavtest --with-external-dvdnav \ @@ -201,7 +203,9 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" --without-imagemagick \ %endif # imagemagick --with-arts \ +%if %{with_wpack} --with-wavpack \ +%endif --with-real-codecs-path=%{codecdir} \ --with-w32-path=%{codecdir} @@ -328,13 +332,16 @@ rm -rf $RPM_BUILD_ROOT %if %{have_vidix} %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so %endif # vidix +%if %{with_xcb} +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so +%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so +%endif # xcb %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so %{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so - %files arts %defattr(-,root,root,-) %{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so @@ -360,16 +367,11 @@ rm -rf $RPM_BUILD_ROOT %if %{with_caca} %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so %endif # caca -%if %{with_dfb} +%if 0%{!?_without_directfb:1} %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so -%endif # dfb +%endif # directfb %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so -%if %{with_xcb} -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so -%endif # xcb - %files devel %defattr(-,root,root,-) @@ -384,8 +386,10 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Mon Sep 10 2007 Ville Skyttä - 1.1.8-2.1 -- Adjust default -extras feature set for EPEL-5. +* 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. * Sun Sep 09 2007 Aurelien Bompard 1.1.8-2 - remove the dependency from -extras to -arts, and use Obsoletes to From 8d582f769dd43ea204ae84c476a4c81916b1403f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Wed, 19 Sep 2007 19:32:56 +0000 Subject: [PATCH 13/43] =?UTF-8?q?*=20Wed=20Sep=2019=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=201.1.8-4=20-=20Fix?= =?UTF-8?q?=20"--without=20wavpack"=20build.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xine-lib.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index d953df1..69784e8 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -35,7 +35,7 @@ Summary: Xine library Name: xine-lib Version: 1.1.8 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -340,7 +340,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so %{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so +%if %{with_wpack} %{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so +%endif # wpack %files arts %defattr(-,root,root,-) @@ -386,6 +388,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Sep 19 2007 Ville Skyttä - 1.1.8-4 +- Fix "--without wavpack" build. + * 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 From a3bdf0900975c7851c061ad93ba20dc4f53f1a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 24 Sep 2007 19:29:43 +0000 Subject: [PATCH 14/43] =?UTF-8?q?*=20Sun=20Sep=2023=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=201.1.8-5=20-=20Enabl?= =?UTF-8?q?e=20JACK=20support=20by=20default=20for=20all=20distros.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xine-lib.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 69784e8..052f450 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -18,16 +18,15 @@ %else %define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0} %endif + %define with_jack %{?_without_jack:0}%{!?_without_jack:1} %if 0%{?fedora} %define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1} %define with_caca %{?_without_caca:0}%{!?_without_caca:1} - %define with_jack %{?_without_jack:0}%{!?_without_jack:1} %define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1} %define with_wpack %{?_without_wavpack:0}%{!?_without_wavpack:1} %else %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} %define with_caca %{?_with_caca:1}%{!?_with_caca:0} - %define with_jack %{?_with_jack:1}%{!?_with_jack:0} %define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0} %define with_wpack %{?_with_wavpack:1}%{!?_with_wavpack:0} %endif @@ -35,7 +34,7 @@ Summary: Xine library Name: xine-lib Version: 1.1.8 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -388,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 - Fix "--without wavpack" build. From 8346e044af256faa4274182886726b4afc9d5a4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Thu, 27 Sep 2007 20:24:08 +0000 Subject: [PATCH 15/43] =?UTF-8?q?*=20Thu=20Sep=2027=202007=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=201.1.8-6=20-=20Enabl?= =?UTF-8?q?e=20wavpack=20support=20by=20default=20for=20all=20distros.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xine-lib.spec | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 052f450..41896b8 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -19,22 +19,21 @@ %define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0} %endif %define with_jack %{?_without_jack:0}%{!?_without_jack:1} + %define with_wpack %{?_without_wavpack:0}%{!?_without_wavpack:1} %if 0%{?fedora} %define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1} %define with_caca %{?_without_caca:0}%{!?_without_caca:1} %define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1} - %define with_wpack %{?_without_wavpack:0}%{!?_without_wavpack:1} %else %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} %define with_caca %{?_with_caca:1}%{!?_with_caca:0} %define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0} - %define with_wpack %{?_with_wavpack:1}%{!?_with_wavpack:0} %endif Summary: Xine library Name: xine-lib Version: 1.1.8 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -387,6 +386,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 - Enable JACK support by default for all distros. From 0598148c6197f8789667b12d1e415100750f675d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Sat, 12 Jan 2008 11:41:42 +0000 Subject: [PATCH 16/43] =?UTF-8?q?*=20Sat=20Jan=2012=202008=20Ville=20Skytt?= =?UTF-8?q?=C3=A4=20=20-=201.1.8-7=20-=20Inclu?= =?UTF-8?q?de=20RTSP=20security=20fixes=20from=201.1.9.1.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xine-lib-1.1.8-CVE-2008-0225.patch | 208 +++++++++++++++++++++++++++++ xine-lib.spec | 7 +- 2 files changed, 214 insertions(+), 1 deletion(-) create mode 100644 xine-lib-1.1.8-CVE-2008-0225.patch diff --git a/xine-lib-1.1.8-CVE-2008-0225.patch b/xine-lib-1.1.8-CVE-2008-0225.patch new file mode 100644 index 0000000..abb7fab --- /dev/null +++ b/xine-lib-1.1.8-CVE-2008-0225.patch @@ -0,0 +1,208 @@ +diff -r -Nu xine-lib-1.1.9/src/input/libreal/rmff.c xine-lib-1.1.9.1/src/input/libreal/rmff.c +--- xine-lib-1.1.9/src/input/libreal/rmff.c 2008-01-01 15:30:08.000000000 +0200 ++++ xine-lib-1.1.9.1/src/input/libreal/rmff.c 2008-01-11 15:40:28.000000000 +0200 +@@ -35,9 +35,13 @@ + * writes header data to a buffer + */ + +-static void rmff_dump_fileheader(rmff_fileheader_t *fileheader, char *buffer) { ++static int rmff_dump_fileheader(rmff_fileheader_t *fileheader, uint8_t *buffer, int bufsize) { ++ ++ if (!fileheader) return 0; ++ ++ if (bufsize < RMFF_FILEHEADER_SIZE) ++ return -1; + +- if (!fileheader) return; + fileheader->object_id=_X_BE_32(&fileheader->object_id); + fileheader->size=_X_BE_32(&fileheader->size); + fileheader->object_version=_X_BE_16(&fileheader->object_version); +@@ -53,11 +57,17 @@ + fileheader->file_version=_X_BE_32(&fileheader->file_version); + fileheader->num_headers=_X_BE_32(&fileheader->num_headers); + fileheader->object_id=_X_BE_32(&fileheader->object_id); ++ ++ return RMFF_FILEHEADER_SIZE; + } + +-static void rmff_dump_prop(rmff_prop_t *prop, char *buffer) { ++static int rmff_dump_prop(rmff_prop_t *prop, uint8_t *buffer, int bufsize) { ++ ++ if (!prop) return 0; ++ ++ if (bufsize < RMFF_PROPHEADER_SIZE) ++ return -1; + +- if (!prop) return; + prop->object_id=_X_BE_32(&prop->object_id); + prop->size=_X_BE_32(&prop->size); + prop->object_version=_X_BE_16(&prop->object_version); +@@ -93,13 +103,19 @@ + prop->num_streams=_X_BE_16(&prop->num_streams); + prop->flags=_X_BE_16(&prop->flags); + prop->object_id=_X_BE_32(&prop->object_id); ++ ++ return RMFF_PROPHEADER_SIZE; + } + +-static void rmff_dump_mdpr(rmff_mdpr_t *mdpr, char *buffer) { ++static int rmff_dump_mdpr(rmff_mdpr_t *mdpr, uint8_t *buffer, int bufsize) { + + int s1, s2, s3; + +- if (!mdpr) return; ++ if (!mdpr) return 0; ++ ++ if (bufsize < RMFF_MDPRHEADER_SIZE + mdpr->type_specific_len + mdpr->stream_name_size + mdpr->mime_type_size) ++ return -1; ++ + mdpr->object_id=_X_BE_32(&mdpr->object_id); + mdpr->size=_X_BE_32(&mdpr->size); + mdpr->object_version=_X_BE_16(&mdpr->object_version); +@@ -141,13 +157,19 @@ + mdpr->duration=_X_BE_32(&mdpr->duration); + mdpr->object_id=_X_BE_32(&mdpr->object_id); + ++ return RMFF_MDPRHEADER_SIZE + s1 + s2 + s3; + } + +-static void rmff_dump_cont(rmff_cont_t *cont, char *buffer) { ++static int rmff_dump_cont(rmff_cont_t *cont, uint8_t *buffer, int bufsize) { + + int p; + +- if (!cont) return; ++ if (!cont) return 0; ++ ++ if (bufsize < RMFF_CONTHEADER_SIZE + cont->title_len + cont->author_len + ++ cont->copyright_len + cont->comment_len) ++ return -1; ++ + cont->object_id=_X_BE_32(&cont->object_id); + cont->size=_X_BE_32(&cont->size); + cont->object_version=_X_BE_16(&cont->object_version); +@@ -181,11 +203,18 @@ + cont->size=_X_BE_32(&cont->size); + cont->object_version=_X_BE_16(&cont->object_version); + cont->object_id=_X_BE_32(&cont->object_id); ++ ++ return RMFF_CONTHEADER_SIZE + cont->title_len + cont->author_len + ++ cont->copyright_len + cont->comment_len; + } + +-static void rmff_dump_dataheader(rmff_data_t *data, char *buffer) { ++static int rmff_dump_dataheader(rmff_data_t *data, uint8_t *buffer, int bufsize) { ++ ++ if (!data) return 0; ++ ++ if (bufsize < RMFF_DATAHEADER_SIZE) ++ return -1; + +- if (!data) return; + data->object_id=_X_BE_32(&data->object_id); + data->size=_X_BE_32(&data->size); + data->object_version=_X_BE_16(&data->object_version); +@@ -201,31 +230,43 @@ + data->size=_X_BE_32(&data->size); + data->object_version=_X_BE_16(&data->object_version); + data->object_id=_X_BE_32(&data->object_id); ++ ++ return RMFF_DATAHEADER_SIZE; + } + +-int rmff_dump_header(rmff_header_t *h, char *buffer, int max) { ++int rmff_dump_header(rmff_header_t *h, void *buf_gen, int max) { ++ uint8_t *buffer = buf_gen; + +- int written=0; ++ int written=0, size; + rmff_mdpr_t **stream=h->streams; + +- rmff_dump_fileheader(h->fileheader, &buffer[written]); +- written+=h->fileheader->size; +- rmff_dump_prop(h->prop, &buffer[written]); +- written+=h->prop->size; +- rmff_dump_cont(h->cont, &buffer[written]); +- written+=h->cont->size; ++ if ((size=rmff_dump_fileheader(h->fileheader, &buffer[written], max)) < 0) ++ return -1; ++ written+=size; ++ max -= size; ++ if ((size=rmff_dump_prop(h->prop, &buffer[written], max)) < 0) ++ return -1; ++ written+=size; ++ max -= size; ++ if ((size=rmff_dump_cont(h->cont, &buffer[written], max)) < 0) ++ return -1; ++ written+=size; ++ max -= size; + if (stream) + { + while(*stream) + { +- rmff_dump_mdpr(*stream, &buffer[written]); +- written+=(*stream)->size; ++ if ((size=rmff_dump_mdpr(*stream, &buffer[written], max)) < 0) ++ return -1; ++ written+=size; ++ max -= size; + stream++; + } + } + +- rmff_dump_dataheader(h->data, &buffer[written]); +- written+=18; ++ if ((size=rmff_dump_dataheader(h->data, &buffer[written], max)) < 0) ++ return -1; ++ written+=size; + + return written; + } +diff -r -Nu xine-lib-1.1.9/src/input/libreal/rmff.h xine-lib-1.1.9.1/src/input/libreal/rmff.h +--- xine-lib-1.1.9/src/input/libreal/rmff.h 2008-01-01 15:30:08.000000000 +0200 ++++ xine-lib-1.1.9.1/src/input/libreal/rmff.h 2008-01-11 17:22:09.000000000 +0200 +@@ -39,6 +39,12 @@ + + #define RMFF_HEADER_SIZE 0x12 + ++#define RMFF_FILEHEADER_SIZE 18 ++#define RMFF_PROPHEADER_SIZE 50 ++#define RMFF_MDPRHEADER_SIZE 46 ++#define RMFF_CONTHEADER_SIZE 18 ++#define RMFF_DATAHEADER_SIZE 18 ++ + #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ + (((long)(unsigned char)(ch3) ) | \ + ( (long)(unsigned char)(ch2) << 8 ) | \ +@@ -245,7 +251,7 @@ + /* + * dumps the header to . is the size of + */ +-int rmff_dump_header(rmff_header_t *h, char *buffer, int max); ++int rmff_dump_header(rmff_header_t *h, void *buf_gen, int max); + + /* + * dumps a packet header +diff -r -Nu xine-lib-1.1.9/src/input/librtsp/rtsp_session.c xine-lib-1.1.9.1/src/input/librtsp/rtsp_session.c +--- xine-lib-1.1.9/src/input/librtsp/rtsp_session.c 2008-01-01 15:30:08.000000000 +0200 ++++ xine-lib-1.1.9.1/src/input/librtsp/rtsp_session.c 2008-01-11 06:11:52.000000000 +0200 +@@ -148,6 +148,11 @@ + + rtsp_session->header_left = + rtsp_session->header_len = rmff_dump_header(h,rtsp_session->header,HEADER_SIZE); ++ if (rtsp_session->header_len < 0) { ++ xprintf (stream->xine, XINE_VERBOSITY_LOG, ++ _("rtsp_session: rtsp server returned overly-large headers, session can not be established.\n")); ++ goto session_abort; ++ } + + xine_buffer_copyin(rtsp_session->recv, 0, rtsp_session->header, rtsp_session->header_len); + rtsp_session->recv_size = rtsp_session->header_len; +@@ -157,6 +162,7 @@ + { + xprintf(stream->xine, XINE_VERBOSITY_LOG, + _("rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"), server); ++ session_abort: + rtsp_close(rtsp_session->s); + free(server); + xine_buffer_free(rtsp_session->recv); diff --git a/xine-lib.spec b/xine-lib.spec index 41896b8..973800b 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -33,7 +33,7 @@ Summary: Xine library Name: xine-lib Version: 1.1.8 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -46,6 +46,7 @@ Source2: %{name}-mk-autotools-patch.sh # autotools patch created with source2 Patch0: %{name}-%{version}-autotools.patch.bz2 Patch1: %{name}-1.1.4-optflags.patch +Patch2: %{name}-1.1.8-CVE-2008-0225.patch Patch6: %{name}-1.1.1-deepbind-939.patch Patch7: %{name}-1.1.5-multilib-devel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -161,6 +162,7 @@ touch -r configure.ac aclocal.m4 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp %patch1 -p1 -b .optflags touch -r m4/optimizations.m4.stamp m4/optimizations.m4 +%patch2 -p1 -b .CVE-2008-0225 # Patch6 needed at least when compiling with external ffmpeg, #939. %patch6 -p1 -b .deepbind %patch7 -p0 -b .multilib-devel @@ -386,6 +388,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Jan 12 2008 Ville Skyttä - 1.1.8-7 +- Include RTSP security fixes from 1.1.9.1. + * Thu Sep 27 2007 Ville Skyttä - 1.1.8-6 - Enable wavpack support by default for all distros. From 37060d2e5b2a97660529f8fc2a83a721ecae0365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Fri, 8 Feb 2008 20:38:56 +0000 Subject: [PATCH 17/43] =?UTF-8?q?*=20Fri=20Feb=20=208=202008=20Ville=20Sky?= =?UTF-8?q?tt=C3=A4=20=20-=201.1.8-8=20-=20Inc?= =?UTF-8?q?lude=20ASF=20and=20FLAC=20comment=20security=20fixes=20from=201?= =?UTF-8?q?.1.10=20and=201.1.10.1.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xine-lib-1.1.8-CVE-2006-1664.patch | 38 +++++++++++++++++++++++ xine-lib-1.1.8-CVE-2008-0486.patch | 50 ++++++++++++++++++++++++++++++ xine-lib.spec | 9 +++++- 3 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 xine-lib-1.1.8-CVE-2006-1664.patch create mode 100644 xine-lib-1.1.8-CVE-2008-0486.patch diff --git a/xine-lib-1.1.8-CVE-2006-1664.patch b/xine-lib-1.1.8-CVE-2006-1664.patch new file mode 100644 index 0000000..8418d51 --- /dev/null +++ b/xine-lib-1.1.8-CVE-2006-1664.patch @@ -0,0 +1,38 @@ +diff -r 461fae9b8fca -r fb6d089b520d src/demuxers/demux_asf.c +--- a/src/demuxers/demux_asf.c Wed Jan 23 18:29:51 2008 +0000 ++++ b/src/demuxers/demux_asf.c Wed Jan 23 19:40:16 2008 +0000 +@@ -379,10 +379,21 @@ static int asf_read_header (demux_asf_t + char *asf_header_buffer = NULL; + + asf_header_len = get_le64(this); +- asf_header_buffer = alloca(asf_header_len); ++ if (asf_header_len > 4 * 1024 * 1024) ++ { ++ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, ++ "demux_asf: asf_read_header: overly-large header? (%"PRIu64" bytes)\n", ++ asf_header_len); ++ return 0; ++ } ++ ++ asf_header_buffer = malloc (asf_header_len); + + if (this->input->read (this->input, asf_header_buffer, asf_header_len) != asf_header_len) ++ { ++ free (asf_header_buffer); + return 0; ++ } + + /* delete previous header */ + if (this->asf_header) { +@@ -395,7 +406,11 @@ static int asf_read_header (demux_asf_t + */ + this->asf_header = asf_header_new(asf_header_buffer, asf_header_len); + if (!this->asf_header) ++ { ++ free (asf_header_buffer); + return 0; ++ } ++ free (asf_header_buffer); + + lprintf("asf header parsing ok\n"); + diff --git a/xine-lib-1.1.8-CVE-2008-0486.patch b/xine-lib-1.1.8-CVE-2008-0486.patch new file mode 100644 index 0000000..b9c409c --- /dev/null +++ b/xine-lib-1.1.8-CVE-2008-0486.patch @@ -0,0 +1,50 @@ +diff -r 6cce4115cd7d -r 71d64201b47e src/demuxers/demux_flac.c +--- a/src/demuxers/demux_flac.c Thu Feb 07 17:49:40 2008 +0000 ++++ b/src/demuxers/demux_flac.c Thu Feb 07 17:51:59 2008 +0000 +@@ -189,7 +189,7 @@ static int open_flac_file(demux_flac_t * + case 4: + lprintf ("VORBIS_COMMENT metadata\n"); + { +- char comments[block_length]; ++ char comments[block_length + 1]; /* last byte for NUL termination */ + char *ptr = comments; + uint32_t length, user_comment_list_length; + int cn; +@@ -202,18 +202,25 @@ static int open_flac_file(demux_flac_t * + + length = _X_LE_32(ptr); + ptr += 4 + length; ++ if (length >= block_length - 8) ++ return 0; /* bad length or too little left in the buffer */ + + user_comment_list_length = _X_LE_32(ptr); + ptr += 4; + + cn = 0; + for (; cn < user_comment_list_length; cn++) { ++ if (ptr > comments + block_length - 4) ++ return 0; /* too little left in the buffer */ ++ + length = _X_LE_32(ptr); + ptr += 4; ++ if (length >= block_length || ptr + length > comments + block_length) ++ return 0; /* bad length */ + + comment = (char*) ptr; + c = comment[length]; +- comment[length] = 0; ++ comment[length] = 0; /* NUL termination */ + + lprintf ("comment[%02d] = %s\n", cn, comment); + +@@ -248,8 +255,8 @@ static int open_flac_file(demux_flac_t * + } + + if ((tracknumber > 0) && (tracktotal > 0)) { +- char tn[16]; +- snprintf (tn, 16, "%02d/%02d", tracknumber, tracktotal); ++ char tn[24]; ++ snprintf (tn, 24, "%02d/%02d", tracknumber, tracktotal); + _x_meta_info_set(flac->stream, XINE_META_INFO_TRACK_NUMBER, tn); + } + else if (tracknumber > 0) { diff --git a/xine-lib.spec b/xine-lib.spec index 973800b..dfa1c29 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -33,7 +33,7 @@ Summary: Xine library Name: xine-lib Version: 1.1.8 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -47,6 +47,8 @@ Source2: %{name}-mk-autotools-patch.sh Patch0: %{name}-%{version}-autotools.patch.bz2 Patch1: %{name}-1.1.4-optflags.patch Patch2: %{name}-1.1.8-CVE-2008-0225.patch +Patch3: %{name}-1.1.8-CVE-2006-1664.patch +Patch4: %{name}-1.1.8-CVE-2008-0486.patch Patch6: %{name}-1.1.1-deepbind-939.patch Patch7: %{name}-1.1.5-multilib-devel.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) @@ -163,6 +165,8 @@ touch -r m4/optimizations.m4 m4/optimizations.m4.stamp %patch1 -p1 -b .optflags touch -r m4/optimizations.m4.stamp m4/optimizations.m4 %patch2 -p1 -b .CVE-2008-0225 +%patch3 -p1 -b .CVE-2006-1664 +%patch4 -p1 -b .CVE-2008-0486 # Patch6 needed at least when compiling with external ffmpeg, #939. %patch6 -p1 -b .deepbind %patch7 -p0 -b .multilib-devel @@ -388,6 +392,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 8 2008 Ville Skyttä - 1.1.8-8 +- Include ASF and FLAC comment security fixes from 1.1.10 and 1.1.10.1. + * Sat Jan 12 2008 Ville Skyttä - 1.1.8-7 - Include RTSP security fixes from 1.1.9.1. From a5e55c9a90d24b6592be87e0908b3fafa719e3a7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 24 Apr 2008 13:20:09 +0000 Subject: [PATCH 18/43] * Thu Apr 24 2008 Rex Dieter - 1.1.8-9 - CVE-2008-1878 (#443969) --- xine-lib-1.1.12-CVE-2008-1878.patch | 16 ++++++++++++++++ xine-lib.spec | 6 ++++++ 2 files changed, 22 insertions(+) create mode 100644 xine-lib-1.1.12-CVE-2008-1878.patch diff --git a/xine-lib-1.1.12-CVE-2008-1878.patch b/xine-lib-1.1.12-CVE-2008-1878.patch new file mode 100644 index 0000000..b51f875 --- /dev/null +++ b/xine-lib-1.1.12-CVE-2008-1878.patch @@ -0,0 +1,16 @@ +diff -up xine-lib-1.1.12/src/demuxers/demux_nsf.c.CVE-2008-1878 xine-lib-1.1.12/src/demuxers/demux_nsf.c +--- xine-lib-1.1.12/src/demuxers/demux_nsf.c.CVE-2008-1878 2008-03-28 09:24:50.000000000 -0500 ++++ xine-lib-1.1.12/src/demuxers/demux_nsf.c 2008-04-24 06:52:45.000000000 -0500 +@@ -106,9 +106,9 @@ static int open_nsf_file(demux_nsf_t *th + + this->total_songs = header[6]; + this->current_song = header[7]; +- this->title = strdup(&header[0x0E]); +- this->artist = strdup(&header[0x2E]); +- this->copyright = strdup(&header[0x4E]); ++ this->title = strndup((char*)&header[0x0E], 0x20); ++ this->artist = strndup((char*)&header[0x2E], 0x20); ++ this->copyright = strndup((char*)&header[0x4E], 0x20); + + this->filesize = this->input->get_length(this->input); + diff --git a/xine-lib.spec b/xine-lib.spec index dfa1c29..2990c84 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -51,6 +51,8 @@ Patch3: %{name}-1.1.8-CVE-2006-1664.patch Patch4: %{name}-1.1.8-CVE-2008-0486.patch Patch6: %{name}-1.1.1-deepbind-939.patch Patch7: %{name}-1.1.5-multilib-devel.patch +Patch8: %{name}-1.1.12-CVE-2008-1878.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # X11 BuildRequires: libX11-devel libXv-devel libXinerama-devel libXvMC-devel @@ -170,6 +172,7 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4 # Patch6 needed at least when compiling with external ffmpeg, #939. %patch6 -p1 -b .deepbind %patch7 -p0 -b .multilib-devel +%patch8 -p1 -b .CVE-2008-1878 # Avoid standard rpaths on lib64 archs: sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure @@ -392,6 +395,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Thu Apr 24 2008 Rex Dieter - 1.1.8-9 +- CVE-2008-1878 (#443969) + * Fri Feb 8 2008 Ville Skyttä - 1.1.8-8 - Include ASF and FLAC comment security fixes from 1.1.10 and 1.1.10.1. From 24c56bd0dd94d835abb8856014bf8435e5abe440 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 24 Apr 2008 13:21:30 +0000 Subject: [PATCH 19/43] Release++ --- xine-lib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 2990c84..85a667a 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -33,7 +33,7 @@ Summary: Xine library Name: xine-lib Version: 1.1.8 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ From 36901624795de0dbdfb4e91770133fd0120693b4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 22 Sep 2008 21:01:29 +0000 Subject: [PATCH 20/43] * Wed Aug 20 2008 Rex Dieter - 1.1.15-1 - xine-lib-1.1.15, plugin ABI 1.24 (rh#455752, CVE-2008-3231) - Obsoletes: -arts (f9+) --- .cvsignore | 4 +- sources | 4 +- xine-lib-1.1.12-CVE-2008-1878.patch | 16 -- xine-lib-1.1.15-ansi.patch | 12 + xine-lib-1.1.5-multilib-devel.patch | 40 --- xine-lib-1.1.8-CVE-2006-1664.patch | 38 --- xine-lib-1.1.8-CVE-2008-0225.patch | 208 -------------- xine-lib-1.1.8-CVE-2008-0486.patch | 50 ---- xine-lib-cleanup-sources.sh | 22 +- xine-lib.spec | 431 ++++++++++++++++------------ 10 files changed, 281 insertions(+), 544 deletions(-) delete mode 100644 xine-lib-1.1.12-CVE-2008-1878.patch create mode 100644 xine-lib-1.1.15-ansi.patch delete mode 100644 xine-lib-1.1.5-multilib-devel.patch delete mode 100644 xine-lib-1.1.8-CVE-2006-1664.patch delete mode 100644 xine-lib-1.1.8-CVE-2008-0225.patch delete mode 100644 xine-lib-1.1.8-CVE-2008-0486.patch diff --git a/.cvsignore b/.cvsignore index 0426b0d..3929296 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.8-pruned.tar.bz2 -xine-lib-1.1.8-autotools.patch.bz2 +xine-lib-1.1.15-autotools.patch.bz2 +xine-lib-1.1.15-pruned.tar.bz2 diff --git a/sources b/sources index 00ae4ec..15195de 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -6cbfae9d31fc138c7cb3c3d178e1286d xine-lib-1.1.8-pruned.tar.bz2 -b4a7c7a9af428b26667402d6dc180107 xine-lib-1.1.8-autotools.patch.bz2 +ffd74ec893a5f1167c69987a68f436fd xine-lib-1.1.15-autotools.patch.bz2 +acdbdc024382afac111eb076304448ed xine-lib-1.1.15-pruned.tar.bz2 diff --git a/xine-lib-1.1.12-CVE-2008-1878.patch b/xine-lib-1.1.12-CVE-2008-1878.patch deleted file mode 100644 index b51f875..0000000 --- a/xine-lib-1.1.12-CVE-2008-1878.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up xine-lib-1.1.12/src/demuxers/demux_nsf.c.CVE-2008-1878 xine-lib-1.1.12/src/demuxers/demux_nsf.c ---- xine-lib-1.1.12/src/demuxers/demux_nsf.c.CVE-2008-1878 2008-03-28 09:24:50.000000000 -0500 -+++ xine-lib-1.1.12/src/demuxers/demux_nsf.c 2008-04-24 06:52:45.000000000 -0500 -@@ -106,9 +106,9 @@ static int open_nsf_file(demux_nsf_t *th - - this->total_songs = header[6]; - this->current_song = header[7]; -- this->title = strdup(&header[0x0E]); -- this->artist = strdup(&header[0x2E]); -- this->copyright = strdup(&header[0x4E]); -+ this->title = strndup((char*)&header[0x0E], 0x20); -+ this->artist = strndup((char*)&header[0x2E], 0x20); -+ this->copyright = strndup((char*)&header[0x4E], 0x20); - - this->filesize = this->input->get_length(this->input); - diff --git a/xine-lib-1.1.15-ansi.patch b/xine-lib-1.1.15-ansi.patch new file mode 100644 index 0000000..d9f1b27 --- /dev/null +++ b/xine-lib-1.1.15-ansi.patch @@ -0,0 +1,12 @@ +diff -up xine-lib-1.1.15/src/xine-engine/buffer.h.ansi xine-lib-1.1.15/src/xine-engine/buffer.h +--- xine-lib-1.1.15/src/xine-engine/buffer.h.ansi 2008-07-16 16:01:56.000000000 -0500 ++++ xine-lib-1.1.15/src/xine-engine/buffer.h 2008-08-19 12:08:46.000000000 -0500 +@@ -676,7 +676,7 @@ void _x_bmiheader_le2me( xine_bmiheader + /* convert xine_waveformatex struct from little endian */ + void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED; + +-static inline _x_is_fourcc(void *ptr, void *tag) { ++static __inline _x_is_fourcc(void *ptr, void *tag) { + return memcmp(ptr, tag, 4) == 0; + } + diff --git a/xine-lib-1.1.5-multilib-devel.patch b/xine-lib-1.1.5-multilib-devel.patch deleted file mode 100644 index 5b5d05d..0000000 --- a/xine-lib-1.1.5-multilib-devel.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- misc/xine-config.in~ 2007-04-05 01:18:00.000000000 +0300 -+++ misc/xine-config.in 2007-04-11 01:32:44.000000000 +0300 -@@ -2,8 +2,8 @@ - # - # - --prefix=@XINE_CONFIG_PREFIX@ --exec_prefix=@exec_prefix@ -+prefix=$(pkg-config libxine --variable=prefix) -+exec_prefix=$(pkg-config libxine --variable=exec_prefix) - exec_prefix_set=no - - usage() -@@ -54,7 +54,7 @@ - echo_exec_prefix=yes - ;; - --version) -- echo @XINE_MAJOR@.@XINE_MINOR@.@XINE_SUB@ -+ pkg-config libxine --modversion - ;; - --acflags) - echo_acflags=yes -@@ -100,14 +100,14 @@ - fi - - if test "$echo_cflags" = "yes"; then -- echo -I@includedir@ @PTHREAD_CFLAGS@ -+ pkg-config libxine --cflags - fi - - if test "$echo_libs" = "yes"; then -- echo -L@libdir@ -lxine @ZLIB_LIBS@ @NET_LIBS@ @PTHREAD_LIBS@ @LIBICONV@ @RT_LIBS@ -+ pkg-config libxine --libs - fi - if test "$echo_plugindir" = "yes"; then -- echo "@XINE_PLUGINPATH@" -+ echo "$(pkg-config libxine --variable=libdir)/xine/plugins/$(pkg-config libxine --modversion)" - fi - if test "$echo_datadir" = "yes"; then - echo "@XINE_DATADIR@" diff --git a/xine-lib-1.1.8-CVE-2006-1664.patch b/xine-lib-1.1.8-CVE-2006-1664.patch deleted file mode 100644 index 8418d51..0000000 --- a/xine-lib-1.1.8-CVE-2006-1664.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff -r 461fae9b8fca -r fb6d089b520d src/demuxers/demux_asf.c ---- a/src/demuxers/demux_asf.c Wed Jan 23 18:29:51 2008 +0000 -+++ b/src/demuxers/demux_asf.c Wed Jan 23 19:40:16 2008 +0000 -@@ -379,10 +379,21 @@ static int asf_read_header (demux_asf_t - char *asf_header_buffer = NULL; - - asf_header_len = get_le64(this); -- asf_header_buffer = alloca(asf_header_len); -+ if (asf_header_len > 4 * 1024 * 1024) -+ { -+ xprintf(this->stream->xine, XINE_VERBOSITY_DEBUG, -+ "demux_asf: asf_read_header: overly-large header? (%"PRIu64" bytes)\n", -+ asf_header_len); -+ return 0; -+ } -+ -+ asf_header_buffer = malloc (asf_header_len); - - if (this->input->read (this->input, asf_header_buffer, asf_header_len) != asf_header_len) -+ { -+ free (asf_header_buffer); - return 0; -+ } - - /* delete previous header */ - if (this->asf_header) { -@@ -395,7 +406,11 @@ static int asf_read_header (demux_asf_t - */ - this->asf_header = asf_header_new(asf_header_buffer, asf_header_len); - if (!this->asf_header) -+ { -+ free (asf_header_buffer); - return 0; -+ } -+ free (asf_header_buffer); - - lprintf("asf header parsing ok\n"); - diff --git a/xine-lib-1.1.8-CVE-2008-0225.patch b/xine-lib-1.1.8-CVE-2008-0225.patch deleted file mode 100644 index abb7fab..0000000 --- a/xine-lib-1.1.8-CVE-2008-0225.patch +++ /dev/null @@ -1,208 +0,0 @@ -diff -r -Nu xine-lib-1.1.9/src/input/libreal/rmff.c xine-lib-1.1.9.1/src/input/libreal/rmff.c ---- xine-lib-1.1.9/src/input/libreal/rmff.c 2008-01-01 15:30:08.000000000 +0200 -+++ xine-lib-1.1.9.1/src/input/libreal/rmff.c 2008-01-11 15:40:28.000000000 +0200 -@@ -35,9 +35,13 @@ - * writes header data to a buffer - */ - --static void rmff_dump_fileheader(rmff_fileheader_t *fileheader, char *buffer) { -+static int rmff_dump_fileheader(rmff_fileheader_t *fileheader, uint8_t *buffer, int bufsize) { -+ -+ if (!fileheader) return 0; -+ -+ if (bufsize < RMFF_FILEHEADER_SIZE) -+ return -1; - -- if (!fileheader) return; - fileheader->object_id=_X_BE_32(&fileheader->object_id); - fileheader->size=_X_BE_32(&fileheader->size); - fileheader->object_version=_X_BE_16(&fileheader->object_version); -@@ -53,11 +57,17 @@ - fileheader->file_version=_X_BE_32(&fileheader->file_version); - fileheader->num_headers=_X_BE_32(&fileheader->num_headers); - fileheader->object_id=_X_BE_32(&fileheader->object_id); -+ -+ return RMFF_FILEHEADER_SIZE; - } - --static void rmff_dump_prop(rmff_prop_t *prop, char *buffer) { -+static int rmff_dump_prop(rmff_prop_t *prop, uint8_t *buffer, int bufsize) { -+ -+ if (!prop) return 0; -+ -+ if (bufsize < RMFF_PROPHEADER_SIZE) -+ return -1; - -- if (!prop) return; - prop->object_id=_X_BE_32(&prop->object_id); - prop->size=_X_BE_32(&prop->size); - prop->object_version=_X_BE_16(&prop->object_version); -@@ -93,13 +103,19 @@ - prop->num_streams=_X_BE_16(&prop->num_streams); - prop->flags=_X_BE_16(&prop->flags); - prop->object_id=_X_BE_32(&prop->object_id); -+ -+ return RMFF_PROPHEADER_SIZE; - } - --static void rmff_dump_mdpr(rmff_mdpr_t *mdpr, char *buffer) { -+static int rmff_dump_mdpr(rmff_mdpr_t *mdpr, uint8_t *buffer, int bufsize) { - - int s1, s2, s3; - -- if (!mdpr) return; -+ if (!mdpr) return 0; -+ -+ if (bufsize < RMFF_MDPRHEADER_SIZE + mdpr->type_specific_len + mdpr->stream_name_size + mdpr->mime_type_size) -+ return -1; -+ - mdpr->object_id=_X_BE_32(&mdpr->object_id); - mdpr->size=_X_BE_32(&mdpr->size); - mdpr->object_version=_X_BE_16(&mdpr->object_version); -@@ -141,13 +157,19 @@ - mdpr->duration=_X_BE_32(&mdpr->duration); - mdpr->object_id=_X_BE_32(&mdpr->object_id); - -+ return RMFF_MDPRHEADER_SIZE + s1 + s2 + s3; - } - --static void rmff_dump_cont(rmff_cont_t *cont, char *buffer) { -+static int rmff_dump_cont(rmff_cont_t *cont, uint8_t *buffer, int bufsize) { - - int p; - -- if (!cont) return; -+ if (!cont) return 0; -+ -+ if (bufsize < RMFF_CONTHEADER_SIZE + cont->title_len + cont->author_len + -+ cont->copyright_len + cont->comment_len) -+ return -1; -+ - cont->object_id=_X_BE_32(&cont->object_id); - cont->size=_X_BE_32(&cont->size); - cont->object_version=_X_BE_16(&cont->object_version); -@@ -181,11 +203,18 @@ - cont->size=_X_BE_32(&cont->size); - cont->object_version=_X_BE_16(&cont->object_version); - cont->object_id=_X_BE_32(&cont->object_id); -+ -+ return RMFF_CONTHEADER_SIZE + cont->title_len + cont->author_len + -+ cont->copyright_len + cont->comment_len; - } - --static void rmff_dump_dataheader(rmff_data_t *data, char *buffer) { -+static int rmff_dump_dataheader(rmff_data_t *data, uint8_t *buffer, int bufsize) { -+ -+ if (!data) return 0; -+ -+ if (bufsize < RMFF_DATAHEADER_SIZE) -+ return -1; - -- if (!data) return; - data->object_id=_X_BE_32(&data->object_id); - data->size=_X_BE_32(&data->size); - data->object_version=_X_BE_16(&data->object_version); -@@ -201,31 +230,43 @@ - data->size=_X_BE_32(&data->size); - data->object_version=_X_BE_16(&data->object_version); - data->object_id=_X_BE_32(&data->object_id); -+ -+ return RMFF_DATAHEADER_SIZE; - } - --int rmff_dump_header(rmff_header_t *h, char *buffer, int max) { -+int rmff_dump_header(rmff_header_t *h, void *buf_gen, int max) { -+ uint8_t *buffer = buf_gen; - -- int written=0; -+ int written=0, size; - rmff_mdpr_t **stream=h->streams; - -- rmff_dump_fileheader(h->fileheader, &buffer[written]); -- written+=h->fileheader->size; -- rmff_dump_prop(h->prop, &buffer[written]); -- written+=h->prop->size; -- rmff_dump_cont(h->cont, &buffer[written]); -- written+=h->cont->size; -+ if ((size=rmff_dump_fileheader(h->fileheader, &buffer[written], max)) < 0) -+ return -1; -+ written+=size; -+ max -= size; -+ if ((size=rmff_dump_prop(h->prop, &buffer[written], max)) < 0) -+ return -1; -+ written+=size; -+ max -= size; -+ if ((size=rmff_dump_cont(h->cont, &buffer[written], max)) < 0) -+ return -1; -+ written+=size; -+ max -= size; - if (stream) - { - while(*stream) - { -- rmff_dump_mdpr(*stream, &buffer[written]); -- written+=(*stream)->size; -+ if ((size=rmff_dump_mdpr(*stream, &buffer[written], max)) < 0) -+ return -1; -+ written+=size; -+ max -= size; - stream++; - } - } - -- rmff_dump_dataheader(h->data, &buffer[written]); -- written+=18; -+ if ((size=rmff_dump_dataheader(h->data, &buffer[written], max)) < 0) -+ return -1; -+ written+=size; - - return written; - } -diff -r -Nu xine-lib-1.1.9/src/input/libreal/rmff.h xine-lib-1.1.9.1/src/input/libreal/rmff.h ---- xine-lib-1.1.9/src/input/libreal/rmff.h 2008-01-01 15:30:08.000000000 +0200 -+++ xine-lib-1.1.9.1/src/input/libreal/rmff.h 2008-01-11 17:22:09.000000000 +0200 -@@ -39,6 +39,12 @@ - - #define RMFF_HEADER_SIZE 0x12 - -+#define RMFF_FILEHEADER_SIZE 18 -+#define RMFF_PROPHEADER_SIZE 50 -+#define RMFF_MDPRHEADER_SIZE 46 -+#define RMFF_CONTHEADER_SIZE 18 -+#define RMFF_DATAHEADER_SIZE 18 -+ - #define FOURCC_TAG( ch0, ch1, ch2, ch3 ) \ - (((long)(unsigned char)(ch3) ) | \ - ( (long)(unsigned char)(ch2) << 8 ) | \ -@@ -245,7 +251,7 @@ - /* - * dumps the header to . is the size of - */ --int rmff_dump_header(rmff_header_t *h, char *buffer, int max); -+int rmff_dump_header(rmff_header_t *h, void *buf_gen, int max); - - /* - * dumps a packet header -diff -r -Nu xine-lib-1.1.9/src/input/librtsp/rtsp_session.c xine-lib-1.1.9.1/src/input/librtsp/rtsp_session.c ---- xine-lib-1.1.9/src/input/librtsp/rtsp_session.c 2008-01-01 15:30:08.000000000 +0200 -+++ xine-lib-1.1.9.1/src/input/librtsp/rtsp_session.c 2008-01-11 06:11:52.000000000 +0200 -@@ -148,6 +148,11 @@ - - rtsp_session->header_left = - rtsp_session->header_len = rmff_dump_header(h,rtsp_session->header,HEADER_SIZE); -+ if (rtsp_session->header_len < 0) { -+ xprintf (stream->xine, XINE_VERBOSITY_LOG, -+ _("rtsp_session: rtsp server returned overly-large headers, session can not be established.\n")); -+ goto session_abort; -+ } - - xine_buffer_copyin(rtsp_session->recv, 0, rtsp_session->header, rtsp_session->header_len); - rtsp_session->recv_size = rtsp_session->header_len; -@@ -157,6 +162,7 @@ - { - xprintf(stream->xine, XINE_VERBOSITY_LOG, - _("rtsp_session: rtsp server type '%s' not supported yet. sorry.\n"), server); -+ session_abort: - rtsp_close(rtsp_session->s); - free(server); - xine_buffer_free(rtsp_session->recv); diff --git a/xine-lib-1.1.8-CVE-2008-0486.patch b/xine-lib-1.1.8-CVE-2008-0486.patch deleted file mode 100644 index b9c409c..0000000 --- a/xine-lib-1.1.8-CVE-2008-0486.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -r 6cce4115cd7d -r 71d64201b47e src/demuxers/demux_flac.c ---- a/src/demuxers/demux_flac.c Thu Feb 07 17:49:40 2008 +0000 -+++ b/src/demuxers/demux_flac.c Thu Feb 07 17:51:59 2008 +0000 -@@ -189,7 +189,7 @@ static int open_flac_file(demux_flac_t * - case 4: - lprintf ("VORBIS_COMMENT metadata\n"); - { -- char comments[block_length]; -+ char comments[block_length + 1]; /* last byte for NUL termination */ - char *ptr = comments; - uint32_t length, user_comment_list_length; - int cn; -@@ -202,18 +202,25 @@ static int open_flac_file(demux_flac_t * - - length = _X_LE_32(ptr); - ptr += 4 + length; -+ if (length >= block_length - 8) -+ return 0; /* bad length or too little left in the buffer */ - - user_comment_list_length = _X_LE_32(ptr); - ptr += 4; - - cn = 0; - for (; cn < user_comment_list_length; cn++) { -+ if (ptr > comments + block_length - 4) -+ return 0; /* too little left in the buffer */ -+ - length = _X_LE_32(ptr); - ptr += 4; -+ if (length >= block_length || ptr + length > comments + block_length) -+ return 0; /* bad length */ - - comment = (char*) ptr; - c = comment[length]; -- comment[length] = 0; -+ comment[length] = 0; /* NUL termination */ - - lprintf ("comment[%02d] = %s\n", cn, comment); - -@@ -248,8 +255,8 @@ static int open_flac_file(demux_flac_t * - } - - if ((tracknumber > 0) && (tracktotal > 0)) { -- char tn[16]; -- snprintf (tn, 16, "%02d/%02d", tracknumber, tracktotal); -+ char tn[24]; -+ snprintf (tn, 24, "%02d/%02d", tracknumber, tracktotal); - _x_meta_info_set(flac->stream, XINE_META_INFO_TRACK_NUMBER, tn); - } - else if (tracknumber > 0) { diff --git a/xine-lib-cleanup-sources.sh b/xine-lib-cleanup-sources.sh index 0a240f2..a905a3f 100755 --- a/xine-lib-cleanup-sources.sh +++ b/xine-lib-cleanup-sources.sh @@ -21,19 +21,27 @@ rm -rf $dir tar -xjf $tarball cd $dir +rmpluglib() +{ + echo "removing src/$1/$2..." + rm -rf src/$1/$2 + sed -i -e "s/SUBDIRS = \(.*\)$2\(.*\)/SUBDIRS = \1\2/g" src/$1/Makefile.am + sed -i -e "/^src\/$1\/$2/d" configure.ac +} + # Main libraries -for remove in libfaad libffmpeg libmad libmpeg2 dxr3 libspudec libspucmml libspucc liba52 libdts; do +for remove in libfaad libffmpeg libmad libmpeg2 dxr3 liba52 libdts; do echo "removing src/$remove..." rm -rf src/$remove sed -i -e "/$remove/d" src/Makefile.am sed -i -e "/^src\/$remove/d" configure.ac done # Input plugin libraries -for remove in libdvdnav vcd; do - echo "removing src/input/$remove..." - rm -rf src/input/$remove - sed -i -e "s/SUBDIRS = \(.*\)${remove}\(.*\)/SUBDIRS = \1\2/g" src/input/Makefile.am - sed -i -e "/^src\/input\/$remove/d" configure.ac +for remove in vcd; do + rmpluglib input vcd +done +for remove in ffmpeg; do + rmpluglib combined ffmpeg done # Input plugins for p in dvd vcd mms; do @@ -66,7 +74,7 @@ sed -i -e '/^xineplug_decode_nsf_la/,/^\s*$/d' \ -e /xineplug_decode_nsf/d \ -e 's/ nosefart//' \ src/libxineadec/Makefile.am -sed -i -e /nosefart/d configure.ac +sed -i -e '/nosefart\/Makefile/d' configure.ac # All clean ! diff --git a/xine-lib.spec b/xine-lib.spec index 85a667a..0386221 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -2,66 +2,71 @@ # - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog # - drop the opengl video out plugin? # http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html -# - move pulseaudio to main package from -extras? -# http://fedoraproject.org/wiki/Releases/FeaturePulseaudio -# --> not yet: -# http://www.redhat.com/archives/fedora-devel-list/2007-August/msg01411.html +# - external dvdnav - not compatible as of 1.1.11 and 4.1.1 +# - deprecate ESD support? + +%define abiver 1.24 +%define codecdir %{_libdir}/codecs -%define codecdir %{_libdir}/codecs %ifarch %{ix86} %define have_vidix 1 %else %define have_vidix 0 -%endif -%if 0%{?fedora} >= 8 - %define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} -%else - %define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0} -%endif - %define with_jack %{?_without_jack:0}%{!?_without_jack:1} - %define with_wpack %{?_without_wavpack:0}%{!?_without_wavpack:1} +%endif # ix86 + %if 0%{?fedora} %define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1} %define with_caca %{?_without_caca:0}%{!?_without_caca:1} %define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1} + %define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} %else %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} %define with_caca %{?_with_caca:1}%{!?_with_caca:0} %define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0} + %define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0} +%endif # Fedora + +%if 0%{?fedora} > 8 +%define _without_arts --without-arts %endif Summary: Xine library Name: xine-lib -Version: 1.1.8 -Release: 9%{?dist} +Version: 1.1.15 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ # The tarball is generated from the upstream tarball using # the script in SOURCE1. It prunes potentially patented code -#Source0: http://dl.sourceforge.net/xine/xine-lib-%{version}.tar.bz2 +#Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2 Source0: %{name}-%{version}-pruned.tar.bz2 Source1: %{name}-cleanup-sources.sh Source2: %{name}-mk-autotools-patch.sh # autotools patch created with source2 Patch0: %{name}-%{version}-autotools.patch.bz2 -Patch1: %{name}-1.1.4-optflags.patch -Patch2: %{name}-1.1.8-CVE-2008-0225.patch -Patch3: %{name}-1.1.8-CVE-2006-1664.patch -Patch4: %{name}-1.1.8-CVE-2008-0486.patch -Patch6: %{name}-1.1.1-deepbind-939.patch -Patch7: %{name}-1.1.5-multilib-devel.patch -Patch8: %{name}-1.1.12-CVE-2008-1878.patch - BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +Patch1: %{name}-1.1.4-optflags.patch +Patch6: %{name}-1.1.1-deepbind-939.patch +## upstream patches +# phonon-xine doesn't compile with xine-lib-1.1.15, http://bugs.kde.org/169365 +Patch100: xine-lib-1.1.15-ansi.patch + +Provides: xine-lib(plugin-abi) = %{abiver} # X11 -BuildRequires: libX11-devel libXv-devel libXinerama-devel libXvMC-devel +BuildRequires: libX11-devel +BuildRequires: libXv-devel +BuildRequires: libXinerama-devel +BuildRequires: libXvMC-devel BuildRequires: libGLU-devel %if %{with_xcb} BuildRequires: libxcb-devel %endif # xcb # Video -BuildRequires: SDL-devel libtheora-devel libmng-devel +BuildRequires: SDL-devel +BuildRequires: libtheora-devel +BuildRequires: libmng-devel %if %{with_aalib} BuildRequires: aalib-devel >= 1.4 %endif # aalib @@ -78,43 +83,34 @@ BuildRequires: ImageMagick-devel >= 6.2.4.6-1 BuildRequires: fontconfig-devel %endif # freetype # Audio -BuildRequires: libogg-devel libvorbis-devel flac-devel libmodplug-devel -BuildRequires: esound-devel speex-devel arts-devel alsa-lib-devel >= 0.9.0 +BuildRequires: alsa-lib-devel >= 0.9.0 +BuildRequires: esound-devel +BuildRequires: flac-devel +BuildRequires: jack-audio-connection-kit-devel +BuildRequires: libmodplug-devel BuildRequires: libmpcdec-devel -%if %{with_wpack} -BuildRequires: wavpack-devel -%endif # wpack +BuildRequires: libvorbis-devel %if %{with_pa} BuildRequires: pulseaudio-lib-devel %endif # pa -%if %{with_jack} -BuildRequires: jack-audio-connection-kit-devel -%endif # jack +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 gnome-vfs2-devel gtk2-devel -# samba-common in <= FC-6, libsmbclient-devel in FC7+ -BuildRequires: %{_includedir}/libsmbclient.h - -%package devel -Summary: Xine library development files -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig zlib-devel - -%package arts -Summary: aRts plugin for xine-lib -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} -# -arts was split off the -extras subpackage at 1.1.7-3 -Obsoletes: xine-lib-extras < 1.1.7-3 - -%package extras -Summary: Additional plugins for xine-lib -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} - +BuildRequires: pkgconfig +BuildRequires: gnome-vfs2-devel +BuildRequires: gtk2-devel +%if 0%{?fedora} > 6 || 0%{?rhel} > 5 +BuildRequires: libsmbclient-devel +%else +BuildRequires: samba-common +%endif %description This package contains the Xine library. Xine is a free multimedia player. @@ -123,24 +119,50 @@ disk drives, and displays multimedia streamed over the Internet. It interprets many of the most common multimedia formats available - and some of the most uncommon formats, too. --with/--without rpmbuild options (some default values depend on target distribution): aalib, caca, directfb, -imagemagick, freetype, antialiasing (with freetype), jack, pulseaudio, -wavpack, xcb. +imagemagick, freetype, antialiasing (with freetype), pulseaudio, xcb. -%description devel +%package devel +Summary: Xine library development files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release} +Requires: pkgconfig +Requires: zlib-devel + +%description devel This package contains development files for xine-lib. -%description arts +%package arts +Summary: aRts plugin for xine-lib +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +#Requires: xine-lib(plugin-abi) = %{abiver} +# -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 extra plugin for xine-lib. -%description extras +%package pulseaudio +Summary: Pulseaudio plugin for xine-lib +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +# -pulseaudio was split off -extras at 1.1.11.1-2 +#Obsoletes: xine-lib-extras < 1.1.11.1-2 + +%description pulseaudio +This package contains the pulseaudio plugin for xine-lib. + + +%package extras +Summary: Additional plugins for xine-lib +Group: System Environment/Libraries +Requires: %{name} = %{version}-%{release} +#Requires: xine-lib(plugin-abi) = %{abiver} + +%description extras This package contains extra plugins for xine-lib: - EsounD -%if %{with_jack} - JACK -%endif # jack -%if %{with_pa} - - Pulseaudio -%endif # pa - GDK-Pixbuf - GNOME VFS - SMB @@ -166,13 +188,10 @@ touch -r configure.ac aclocal.m4 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp %patch1 -p1 -b .optflags touch -r m4/optimizations.m4.stamp m4/optimizations.m4 -%patch2 -p1 -b .CVE-2008-0225 -%patch3 -p1 -b .CVE-2006-1664 -%patch4 -p1 -b .CVE-2008-0486 # Patch6 needed at least when compiling with external ffmpeg, #939. %patch6 -p1 -b .deepbind -%patch7 -p0 -b .multilib-devel -%patch8 -p1 -b .CVE-2008-1878 + +%patch100 -p1 -b .ansi # Avoid standard rpaths on lib64 archs: sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure @@ -191,7 +210,6 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %endif # directfb --disable-a52dec \ --disable-mad \ - --disable-dvdnavtest --with-external-dvdnav \ --disable-vcd \ --disable-asf \ --disable-faad \ @@ -209,10 +227,8 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %if 0%{?_without_imagemagick:1} --without-imagemagick \ %endif # imagemagick - --with-arts \ -%if %{with_wpack} + %{!?_without_arts:--with-arts} %{?_without_arts} \ --with-wavpack \ -%endif --with-real-codecs-path=%{codecdir} \ --with-w32-path=%{codecdir} @@ -254,155 +270,208 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/xine.5* %dir %{_libdir}/xine/ %dir %{_libdir}/xine/plugins/ -%dir %{_libdir}/xine/plugins/%{version}/ -%{_libdir}/xine/plugins/%{version}/mime.types +%dir %{_libdir}/xine/plugins/%{abiver}/ +%{_libdir}/xine/plugins/%{abiver}/mime.types # Listing every plugin separately for better control over binary packages # containing exactly the plugins we want, nothing accidentally snuck in # nor dropped. -%dir %{_libdir}/xine/plugins/%{version}/post/ -%{_libdir}/xine/plugins/%{version}/post/xineplug_post_audio_filters.so -%{_libdir}/xine/plugins/%{version}/post/xineplug_post_goom.so -%{_libdir}/xine/plugins/%{version}/post/xineplug_post_mosaico.so -%{_libdir}/xine/plugins/%{version}/post/xineplug_post_switch.so -%{_libdir}/xine/plugins/%{version}/post/xineplug_post_visualizations.so +%dir %{_libdir}/xine/plugins/%{abiver}/post/ +%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_audio_filters.so +%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_goom.so +%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_mosaico.so +%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_switch.so +%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_visualizations.so %if %{have_vidix} -%dir %{_libdir}/xine/plugins/%{version}/vidix/ -%{_libdir}/xine/plugins/%{version}/vidix/cyberblade_vid.so -%{_libdir}/xine/plugins/%{version}/vidix/mach64_vid.so -%{_libdir}/xine/plugins/%{version}/vidix/mga_crtc2_vid.so -%{_libdir}/xine/plugins/%{version}/vidix/mga_vid.so -%{_libdir}/xine/plugins/%{version}/vidix/nvidia_vid.so -%{_libdir}/xine/plugins/%{version}/vidix/pm2_vid.so -%{_libdir}/xine/plugins/%{version}/vidix/pm3_vid.so -%{_libdir}/xine/plugins/%{version}/vidix/radeon_vid.so -%{_libdir}/xine/plugins/%{version}/vidix/rage128_vid.so -%{_libdir}/xine/plugins/%{version}/vidix/savage_vid.so -%{_libdir}/xine/plugins/%{version}/vidix/sis_vid.so -%{_libdir}/xine/plugins/%{version}/vidix/unichrome_vid.so +%dir %{_libdir}/xine/plugins/%{abiver}/vidix/ +%{_libdir}/xine/plugins/%{abiver}/vidix/cyberblade_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/mach64_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/mga_crtc2_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/mga_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/nvidia_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/pm2_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/pm3_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/radeon_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/rage128_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/savage_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/sis_vid.so +%{_libdir}/xine/plugins/%{abiver}/vidix/unichrome_vid.so %endif # vidix -%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_alsa.so -%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_file.so -%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_none.so -%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_oss.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_bitplane.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_gsm610.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_lpcm.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_mpc.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_alsa.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_file.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_none.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_oss.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_bitplane.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gsm610.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_lpcm.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_mpc.so %ifarch %ix86 -%{_libdir}/xine/plugins/%{version}/xineplug_decode_qt.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_qt.so %endif # ix86 -%{_libdir}/xine/plugins/%{version}/xineplug_decode_real.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_rgb.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_speex.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_spudvb.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_sputext.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_theora.so -%{_libdir}/xine/plugins/%{version}/xineplug_decode_vorbis.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_real.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_rgb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_speex.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spu.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucc.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucmml.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spudvb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_sputext.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_theora.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_vorbis.so %ifarch %ix86 -%{_libdir}/xine/plugins/%{version}/xineplug_decode_w32dll.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_w32dll.so %endif # ix86 -%{_libdir}/xine/plugins/%{version}/xineplug_decode_yuv.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_audio.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_avi.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_fli.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_flv.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_games.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_iff.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_image.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_matroska.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_mng.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_nsv.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_ogg.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_pva.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_qt.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_rawdv.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_real.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_slave.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_sputext.so -%{_libdir}/xine/plugins/%{version}/xineplug_dmx_yuv_frames.so -%{_libdir}/xine/plugins/%{version}/xineplug_flac.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_cdda.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_dvb.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_file.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_http.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_net.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_pnm.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_pvr.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtp.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_rtsp.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_stdin_fifo.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_v4l.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_fb.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_none.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_opengl.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_syncfb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_yuv.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_audio.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_avi.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_fli.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_flv.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_games.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_iff.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_image.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_matroska.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mng.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_nsv.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_ogg.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_pva.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_qt.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_rawdv.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_real.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_slave.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_sputext.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv_frames.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_file.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_http.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_net.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pnm.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pvr.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtp.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtsp.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_stdin_fifo.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_v4l.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_fb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_none.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_opengl.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_raw.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_syncfb.so %if %{have_vidix} -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_vidix.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_vidix.so %endif # vidix %if %{with_xcb} -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbshm.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xcbxv.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbshm.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbxv.so %endif # xcb -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xshm.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xv.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xvmc.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xxmc.so -%if %{with_wpack} -%{_libdir}/xine/plugins/%{version}/xineplug_wavpack.so -%endif # wpack +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xshm.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xv.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xvmc.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xxmc.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_wavpack.so +%if 0%{!?_without_arts:1} %files arts %defattr(-,root,root,-) -%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_arts.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_arts.so +%endif + +%if %{with_pa} +%files pulseaudio +%defattr(-,root,root,-) +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so +%endif %files extras %defattr(-,root,root,-) -%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_esd.so -%if %{with_jack} -%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_jack.so -%endif # jack -%if %{with_pa} -%{_libdir}/xine/plugins/%{version}/xineplug_ao_out_pulseaudio.so -%endif # pa -%{_libdir}/xine/plugins/%{version}/xineplug_decode_gdk_pixbuf.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_esd.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_jack.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gdk_pixbuf.so %if 0%{!?_without_imagemagick:1} -%{_libdir}/xine/plugins/%{version}/xineplug_decode_image.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_image.so %endif # imagemagick -%{_libdir}/xine/plugins/%{version}/xineplug_inp_gnome_vfs.so -%{_libdir}/xine/plugins/%{version}/xineplug_inp_smb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_gnome_vfs.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_smb.so %if %{with_aalib} -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_aa.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so %endif # aalib %if %{with_caca} -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_caca.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so %endif # caca %if 0%{!?_without_directfb:1} -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_directfb.so -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_xdirectfb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so %endif # directfb -%{_libdir}/xine/plugins/%{version}/xineplug_vo_out_sdl.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_sdl.so %files devel %defattr(-,root,root,-) %doc __docs/hackersguide/* %{_bindir}/xine-config +%{_bindir}/xine-list* %{_datadir}/aclocal/xine.m4 %{_includedir}/xine.h %{_includedir}/xine/ %{_libdir}/libxine.so %{_libdir}/pkgconfig/libxine.pc %{_mandir}/man1/xine-config.1* +%{_mandir}/man1/xine-list*.1* %changelog -* Thu Apr 24 2008 Rex Dieter - 1.1.8-9 -- CVE-2008-1878 (#443969) +* Wed Aug 20 2008 Rex Dieter - 1.1.15-1 +- xine-lib-1.1.15, plugin ABI 1.24 (rh#455752, CVE-2008-3231) +- Obsoletes: -arts (f9+) -* Fri Feb 8 2008 Ville Skyttä - 1.1.8-8 -- Include ASF and FLAC comment security fixes from 1.1.10 and 1.1.10.1. +* Sun Apr 27 2008 Kevin Kofler - 1.1.12-3 +- rebuild for new ImageMagick (6.4.0.10) -* Sat Jan 12 2008 Ville Skyttä - 1.1.8-7 -- Include RTSP security fixes from 1.1.9.1. +* Thu Apr 24 2008 Rex Dieter - 1.1.12-2 +- CVE-2008-1878 + +* 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 +- Apply upstream fixes for Quicktime (#441705) and Matroska regressions + introduced in 1.1.11.1. + +* Mon Apr 07 2008 Rex Dieter - 1.1.11.1-2 +- pulse-rework2 patch (#439731) +- -pulseaudio subpkg (#439731) + +* 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 +- 1.1.11 (security update, #438182, CVE-2008-0073). +- Drop jack and wavpack build conditionals. +- Specfile cleanups. + +* 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 +- 1.1.10.1 (security update, #431541). + +* 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 +- 1.1.10 (security update). + +* 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 +- Disable upstream "discard buffers on ao close" 1.1.9 changeset (#429182). + +* 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 +- 1.1.9. * Thu Sep 27 2007 Ville Skyttä - 1.1.8-6 - Enable wavpack support by default for all distros. From af65ad3604003cc760d85dd8acd37c359d4c80f2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 7 Jan 2009 21:38:05 +0000 Subject: [PATCH 21/43] * Wed Jan 07 2009 Rex Dieter - 1.1.16-1 - xine-lib-1.1.16, plugin ABI 1.25 - --with-external-libdvdnav, include mpeg demuxers (#213597) --- .cvsignore | 4 +-- sources | 4 +-- xine-lib-1.1.15-ansi.patch | 12 --------- xine-lib-cleanup-sources.sh | 11 ++++---- xine-lib.spec | 50 ++++++++++++++++++++++++++----------- 5 files changed, 45 insertions(+), 36 deletions(-) delete mode 100644 xine-lib-1.1.15-ansi.patch diff --git a/.cvsignore b/.cvsignore index 3929296..606b324 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.15-autotools.patch.bz2 -xine-lib-1.1.15-pruned.tar.bz2 +xine-lib-1.1.16-autotools.patch.bz2 +xine-lib-1.1.16-pruned.tar.bz2 diff --git a/sources b/sources index 15195de..f89d6ad 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -ffd74ec893a5f1167c69987a68f436fd xine-lib-1.1.15-autotools.patch.bz2 -acdbdc024382afac111eb076304448ed xine-lib-1.1.15-pruned.tar.bz2 +fe8148f2a0ec7b2e75ad509e8086e33f xine-lib-1.1.16-autotools.patch.bz2 +512f31d8414ef4654ca366c0dce37301 xine-lib-1.1.16-pruned.tar.bz2 diff --git a/xine-lib-1.1.15-ansi.patch b/xine-lib-1.1.15-ansi.patch deleted file mode 100644 index d9f1b27..0000000 --- a/xine-lib-1.1.15-ansi.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xine-lib-1.1.15/src/xine-engine/buffer.h.ansi xine-lib-1.1.15/src/xine-engine/buffer.h ---- xine-lib-1.1.15/src/xine-engine/buffer.h.ansi 2008-07-16 16:01:56.000000000 -0500 -+++ xine-lib-1.1.15/src/xine-engine/buffer.h 2008-08-19 12:08:46.000000000 -0500 -@@ -676,7 +676,7 @@ void _x_bmiheader_le2me( xine_bmiheader - /* convert xine_waveformatex struct from little endian */ - void _x_waveformatex_le2me( xine_waveformatex *wavex ) XINE_PROTECTED; - --static inline _x_is_fourcc(void *ptr, void *tag) { -+static __inline _x_is_fourcc(void *ptr, void *tag) { - return memcmp(ptr, tag, 4) == 0; - } - diff --git a/xine-lib-cleanup-sources.sh b/xine-lib-cleanup-sources.sh index a905a3f..31cff0f 100755 --- a/xine-lib-cleanup-sources.sh +++ b/xine-lib-cleanup-sources.sh @@ -56,11 +56,12 @@ for p in dvd vcd mms; do sed -i -e "/xineplug_inp_$p/d" src/input/Makefile.am done # Demuxers -for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do - echo "removing $p demuxer..." - [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c - sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am -done +# These are ok now ( http://bugzilla.redhat.com/213597 ) +#for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do +# echo "removing $p demuxer..." +# [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c +# sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am +#done # Postprocessors echo "removing planar and deinterlace postprocessors..." sed -i -e 's/deinterlace //g' src/post/Makefile.am # see comments in speedy.c diff --git a/xine-lib.spec b/xine-lib.spec index 0386221..1a1756e 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -2,10 +2,9 @@ # - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog # - drop the opengl video out plugin? # http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html -# - external dvdnav - not compatible as of 1.1.11 and 4.1.1 # - deprecate ESD support? -%define abiver 1.24 +%define abiver 1.25 %define codecdir %{_libdir}/codecs %ifarch %{ix86} @@ -14,14 +13,16 @@ %define have_vidix 0 %endif # ix86 +%if 0%{?fedora} > 9 +%define _with_caca --with-caca +%endif + %if 0%{?fedora} %define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1} - %define with_caca %{?_without_caca:0}%{!?_without_caca:1} %define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1} %define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} %else %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} - %define with_caca %{?_with_caca:1}%{!?_with_caca:0} %define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0} %define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0} %endif # Fedora @@ -32,7 +33,7 @@ Summary: Xine library Name: xine-lib -Version: 1.1.15 +Version: 1.1.16 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -50,8 +51,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: %{name}-1.1.4-optflags.patch Patch6: %{name}-1.1.1-deepbind-939.patch ## upstream patches -# phonon-xine doesn't compile with xine-lib-1.1.15, http://bugs.kde.org/169365 -Patch100: xine-lib-1.1.15-ansi.patch Provides: xine-lib(plugin-abi) = %{abiver} # X11 @@ -70,8 +69,8 @@ BuildRequires: libmng-devel %if %{with_aalib} BuildRequires: aalib-devel >= 1.4 %endif # aalib -%if %{with_caca} -BuildRequires: libcaca-devel >= 0.99 +%if 0%{?_with_caca:1} +BuildRequires: libcaca-devel >= 0.99-0.5.beta16 %endif # caca %if 0%{!?_without_directfb:1} BuildRequires: directfb-devel @@ -111,6 +110,7 @@ BuildRequires: libsmbclient-devel %else BuildRequires: samba-common %endif +BuildRequires: libdvdnav-devel %description This package contains the Xine library. Xine is a free multimedia player. @@ -170,7 +170,7 @@ This package contains extra plugins for xine-lib: %if %{with_aalib} - AA-lib %endif # aalib -%if %{with_caca} +%if 0%{?_with_caca:1} - Libcaca %endif # caca %if 0%{!?_without_imagemagick:1} @@ -191,15 +191,14 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4 # Patch6 needed at least when compiling with external ffmpeg, #939. %patch6 -p1 -b .deepbind -%patch100 -p1 -b .ansi - -# Avoid standard rpaths on lib64 archs: -sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure +# Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex ) +#sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure %build export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" " export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" " +export FFMPEG_UTIL_CFLAGS=" " FFMPEG_UTIL_LIBS=" " export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" # Keep list of options in mostly the same order as ./configure --help. %configure \ @@ -223,10 +222,12 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" --with-external-ffmpeg \ --with-xv-path=%{_libdir} \ --with-libflac \ + --with-external-libdvdnav \ --with-external-libmpcdec \ %if 0%{?_without_imagemagick:1} --without-imagemagick \ %endif # imagemagick + %{?_with_caca} %{!?_with_caca:--without-caca} \ %{!?_without_arts:--with-arts} %{?_without_arts} \ --with-wavpack \ --with-real-codecs-path=%{codecdir} \ @@ -330,6 +331,11 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_image.so %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_matroska.so %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mng.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_block.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_elem.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_pes.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_ts.so %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_nsv.so %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_ogg.so %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_pva.so @@ -339,6 +345,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_slave.so %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_sputext.so %{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv_frames.so +%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv4mpeg2.so %{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so %{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so %{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so @@ -394,7 +401,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with_aalib} %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so %endif # aalib -%if %{with_caca} +%if 0%{?_with_caca:1} %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so %endif # caca %if 0%{!?_without_directfb:1} @@ -418,6 +425,19 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jan 07 2009 Rex Dieter - 1.1.16-1 +- xine-lib-1.1.16, plugin ABI 1.25 +- --with-external-libdvdnav, include mpeg demuxers (#213597) + +* Fri Dec 12 2008 Rex Dieter - 1.1.15-4 +- rebuild for pkgconfig deps + +* Tue Oct 28 2008 Kevin Kofler - 1.1.15-3 +- rebuild for new libcaca + +* Thu Oct 23 2008 Rex Dieter - 1.1.15-2 +- respin + * Wed Aug 20 2008 Rex Dieter - 1.1.15-1 - xine-lib-1.1.15, plugin ABI 1.24 (rh#455752, CVE-2008-3231) - Obsoletes: -arts (f9+) From 97c19f14e68f1aa164f649dad41591f039c4e22f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 18 Jan 2009 22:26:20 +0000 Subject: [PATCH 22/43] * Sun Jan 18 2009 Rex Dieter - 1.1.16-2 - drop deepbind patch (#480504) - caca support (EPEL) --- xine-lib.spec | 35 ++++++++++++++++++++++------------- 1 file changed, 22 insertions(+), 13 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 1a1756e..b702d38 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -13,8 +13,8 @@ %define have_vidix 0 %endif # ix86 -%if 0%{?fedora} > 9 -%define _with_caca --with-caca +%if 0%{?fedora} <= 9 + %define old_caca 1 %endif %if 0%{?fedora} @@ -34,7 +34,7 @@ Summary: Xine library Name: xine-lib Version: 1.1.16 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -50,6 +50,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: %{name}-1.1.4-optflags.patch Patch6: %{name}-1.1.1-deepbind-939.patch +Patch7: %{name}-1.1.16-old-caca.patch ## upstream patches Provides: xine-lib(plugin-abi) = %{abiver} @@ -69,9 +70,11 @@ BuildRequires: libmng-devel %if %{with_aalib} BuildRequires: aalib-devel >= 1.4 %endif # aalib -%if 0%{?_with_caca:1} -BuildRequires: libcaca-devel >= 0.99-0.5.beta16 -%endif # caca +%if 0%{?old_caca} +BuildRequires: libcaca-devel >= 0.99 +%else +BuildRequires: libcaca-devel >= 0.99-0.5.beta16 +%endif %if 0%{!?_without_directfb:1} BuildRequires: directfb-devel %endif # directfb @@ -170,9 +173,7 @@ This package contains extra plugins for xine-lib: %if %{with_aalib} - AA-lib %endif # aalib -%if 0%{?_with_caca:1} - Libcaca -%endif # caca %if 0%{!?_without_imagemagick:1} - Image decoding %endif # imagemagick @@ -188,8 +189,12 @@ touch -r configure.ac aclocal.m4 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp %patch1 -p1 -b .optflags touch -r m4/optimizations.m4.stamp m4/optimizations.m4 -# Patch6 needed at least when compiling with external ffmpeg, #939. -%patch6 -p1 -b .deepbind +# 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 +%if 0%{?old_caca} +%patch7 -p0 -b .old-caca +%endif # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex ) #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure @@ -227,7 +232,6 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %if 0%{?_without_imagemagick:1} --without-imagemagick \ %endif # imagemagick - %{?_with_caca} %{!?_with_caca:--without-caca} \ %{!?_without_arts:--with-arts} %{?_without_arts} \ --with-wavpack \ --with-real-codecs-path=%{codecdir} \ @@ -401,9 +405,7 @@ rm -rf $RPM_BUILD_ROOT %if %{with_aalib} %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so %endif # aalib -%if 0%{?_with_caca:1} %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so -%endif # caca %if 0%{!?_without_directfb:1} %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so %{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so @@ -425,6 +427,13 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jan 18 2009 Rex Dieter - 1.1.16-2 +- drop deepbind patch (#480504) +- caca support (EPEL) + +* Wed Jan 07 2009 Kevin Kofler - 1.1.16-1.1 +- patch for old libcaca in F9- + * Wed Jan 07 2009 Rex Dieter - 1.1.16-1 - xine-lib-1.1.16, plugin ABI 1.25 - --with-external-libdvdnav, include mpeg demuxers (#213597) From fe00119b9fb9e35f465e19225dc8ca0289a80192 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 18 Jan 2009 22:34:43 +0000 Subject: [PATCH 23/43] --with-caca, add awol patch --- xine-lib-1.1.16-old-caca.patch | 27 +++++++++++++++++++++++++++ xine-lib.spec | 3 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 xine-lib-1.1.16-old-caca.patch diff --git a/xine-lib-1.1.16-old-caca.patch b/xine-lib-1.1.16-old-caca.patch new file mode 100644 index 0000000..5a149a9 --- /dev/null +++ b/xine-lib-1.1.16-old-caca.patch @@ -0,0 +1,27 @@ +--- src/video_out/video_out_caca.c Tue Nov 18 21:13:55 2008 +0100 ++++ src/video_out/video_out_caca.c Mon Nov 10 16:33:51 2008 +0100 +@@ -276,7 +276,6 @@ static int caca_redraw_needed (vo_driver + + static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *visual_gen) { + caca_class_t *class = (caca_class_t *) class_gen; +- caca_display_t *dp = (caca_display_t *)visual_gen; + caca_driver_t *this; + + this = calloc(1, sizeof (caca_driver_t)); +@@ -301,13 +300,8 @@ static vo_driver_t *open_plugin (video_d + this->yuv2rgb_factory = yuv2rgb_factory_init(MODE_32_RGB, 0, NULL); + this->yuv2rgb_factory->set_csc_levels(this->yuv2rgb_factory, 0, 128, 128); + +- if (dp) { +- this->cv = caca_get_canvas(dp); +- this->dp = dp; +- } else { +- this->cv = cucul_create_canvas(0, 0); +- this->dp = caca_create_display(this->cv); +- } ++ this->cv = cucul_create_canvas(0, 0); ++ this->dp = caca_create_display(this->cv); + + caca_refresh_display(this->dp); + return &this->vo_driver; + diff --git a/xine-lib.spec b/xine-lib.spec index b702d38..04f68fc 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -121,7 +121,7 @@ It can play back various media. It also decodes multimedia files from local disk drives, and displays multimedia streamed over the Internet. It interprets many of the most common multimedia formats available - and some of the most uncommon formats, too. --with/--without rpmbuild options -(some default values depend on target distribution): aalib, caca, directfb, +(some default values depend on target distribution): aalib, directfb, imagemagick, freetype, antialiasing (with freetype), pulseaudio, xcb. %package devel @@ -220,6 +220,7 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %if 0%{?_with_freetype:1} %if 0%{?_with_antialiasing:1} --enable-antialiasing \ + --with-caca \ %endif # antialiasing --with-freetype \ --with-fontconfig \ From 4394b1f805effb36b9320346837117be0bc2c9d9 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 23 Jan 2009 19:53:42 +0000 Subject: [PATCH 24/43] * Fri Jan 23 2009 Rex Dieter - 1.1.16.1-1 - xine-lib-1.1.16.1 - include avsync patch (#470568) --- .cvsignore | 4 ++-- sources | 4 ++-- xine-lib-1.1.15-avsync_hack.patch | 22 ++++++++++++++++++++++ xine-lib.spec | 16 +++++++++++++--- 4 files changed, 39 insertions(+), 7 deletions(-) create mode 100644 xine-lib-1.1.15-avsync_hack.patch diff --git a/.cvsignore b/.cvsignore index 606b324..34a3b02 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.16-autotools.patch.bz2 -xine-lib-1.1.16-pruned.tar.bz2 +xine-lib-1.1.16.1-autotools.patch.bz2 +xine-lib-1.1.16.1-pruned.tar.bz2 diff --git a/sources b/sources index f89d6ad..9a7e9c8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -fe8148f2a0ec7b2e75ad509e8086e33f xine-lib-1.1.16-autotools.patch.bz2 -512f31d8414ef4654ca366c0dce37301 xine-lib-1.1.16-pruned.tar.bz2 +e3e061f93f36eae910b66cb0c973dbb8 xine-lib-1.1.16.1-autotools.patch.bz2 +aa1265b1007086c0906ec8134cfeacf6 xine-lib-1.1.16.1-pruned.tar.bz2 diff --git a/xine-lib-1.1.15-avsync_hack.patch b/xine-lib-1.1.15-avsync_hack.patch new file mode 100644 index 0000000..f33aba4 --- /dev/null +++ b/xine-lib-1.1.15-avsync_hack.patch @@ -0,0 +1,22 @@ +diff -uNr xine-lib-1.1.15.orig/src/xine-engine/audio_out.c xine-lib-1.1.15/src/xine-engine/audio_out.c +--- xine-lib-1.1.15.orig/src/xine-engine/audio_out.c 2008-07-10 18:19:10.000000000 +0200 ++++ xine-lib-1.1.15/src/xine-engine/audio_out.c 2009-01-10 21:57:20.000000000 +0100 +@@ -1151,8 +1151,17 @@ + + /* + * calculate gap: ++ * ++ * HACK (rwa): If we have no video stream we do not need an AV sync and so ++ * we assume a gap of 0. This seems to avoid the skips in the ++ * first seconds when playing audio-only via the "glitch-free" ++ * pulseaudio server. + */ +- gap = in_buf->vpts - hw_vpts; ++ if (in_buf && in_buf->stream && in_buf->stream->video_decoder_plugin) { ++ gap = in_buf->vpts - hw_vpts; ++ } else { ++ gap = 0; ++ } + lprintf ("hw_vpts : %" PRId64 " buffer_vpts : %" PRId64 " gap : %" PRId64 "\n", + hw_vpts, in_buf->vpts, gap); + diff --git a/xine-lib.spec b/xine-lib.spec index 04f68fc..c8a0f1a 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -33,8 +33,8 @@ Summary: Xine library Name: xine-lib -Version: 1.1.16 -Release: 2%{?dist} +Version: 1.1.16.1 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -50,7 +50,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: %{name}-1.1.4-optflags.patch Patch6: %{name}-1.1.1-deepbind-939.patch +# FIXME for 1.1.16.1 ? Patch7: %{name}-1.1.16-old-caca.patch +# http://bugzilla.redhat.com/470568 +Patch8: xine-lib-1.1.15-avsync_hack.patch ## upstream patches Provides: xine-lib(plugin-abi) = %{abiver} @@ -73,7 +76,7 @@ BuildRequires: aalib-devel >= 1.4 %if 0%{?old_caca} BuildRequires: libcaca-devel >= 0.99 %else -BuildRequires: libcaca-devel >= 0.99-0.5.beta16 +BuildRequires: libcaca-devel >= 0.99-0.5.beta14 %endif %if 0%{!?_without_directfb:1} BuildRequires: directfb-devel @@ -192,10 +195,13 @@ 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 + %if 0%{?old_caca} %patch7 -p0 -b .old-caca %endif +%patch8 -p1 -b .avsync_hack + # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex ) #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure @@ -428,6 +434,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Jan 23 2009 Rex Dieter - 1.1.16.1-1 +- xine-lib-1.1.16.1 +- include avsync patch (#470568) + * Sun Jan 18 2009 Rex Dieter - 1.1.16-2 - drop deepbind patch (#480504) - caca support (EPEL) From b98880929edc1df1e709178739c3fb95e25a4662 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 10 Feb 2009 23:36:41 +0000 Subject: [PATCH 25/43] * Tue Feb 10 2009 Rex Dieter - 1.1.16.2-1 - xine-lib-1.1.16.2 --- .cvsignore | 4 +- sources | 4 +- xine-lib-mk-autotools-patch.sh | 6 +- xine-lib-safe-audio-pause.patch | 122 ++++++++++++++++++++++++++++++++ xine-lib.spec | 49 ++++++++----- 5 files changed, 162 insertions(+), 23 deletions(-) create mode 100644 xine-lib-safe-audio-pause.patch diff --git a/.cvsignore b/.cvsignore index 34a3b02..8a0cd42 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.16.1-autotools.patch.bz2 -xine-lib-1.1.16.1-pruned.tar.bz2 +xine-lib-1.1.16.2-pruned.tar.bz2 +xine-lib-1.1.16.2-autotools.patch.bz2 diff --git a/sources b/sources index 9a7e9c8..95d5764 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e3e061f93f36eae910b66cb0c973dbb8 xine-lib-1.1.16.1-autotools.patch.bz2 -aa1265b1007086c0906ec8134cfeacf6 xine-lib-1.1.16.1-pruned.tar.bz2 +e2c3a178be02f5c32957b2716123aa28 xine-lib-1.1.16.2-pruned.tar.bz2 +07bf186d51b8315026453a2f21b33703 xine-lib-1.1.16.2-autotools.patch.bz2 diff --git a/xine-lib-mk-autotools-patch.sh b/xine-lib-mk-autotools-patch.sh index 93590b4..dc1e103 100644 --- a/xine-lib-mk-autotools-patch.sh +++ b/xine-lib-mk-autotools-patch.sh @@ -22,10 +22,12 @@ 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 -cd xine-lib-$version +pushd xine-lib-$version +# 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 *~ -cd .. +popd diff -Nru xine-lib-$version-pruned xine-lib-$version \ | bzip2 --best > xine-lib-$version-autotools.patch.bz2 diff --git a/xine-lib-safe-audio-pause.patch b/xine-lib-safe-audio-pause.patch new file mode 100644 index 0000000..4a4b70b --- /dev/null +++ b/xine-lib-safe-audio-pause.patch @@ -0,0 +1,122 @@ +diff -r ce4b1533a0af src/xine-engine/audio_out.c +--- a/src/xine-engine/audio_out.c Sun Jan 11 22:24:42 2009 +0000 ++++ b/src/xine-engine/audio_out.c Sat Feb 07 15:09:24 2009 -0200 +@@ -243,6 +243,7 @@ + audio_fifo_t *free_fifo; + audio_fifo_t *out_fifo; + int64_t last_audio_vpts; ++ pthread_mutex_t current_speed_lock; + uint32_t current_speed; /* the current playback speed */ + /* FIXME: replace all this->clock->speed with this->current_speed. we should make + * sure nobody will change speed without going through xine.c:set_speed_internal */ +@@ -1040,6 +1041,7 @@ + * we must process/free buffers otherwise the entire engine will stop. + */ + ++ pthread_mutex_lock(&this->current_speed_lock); + if ( this->audio_loop_running && + (this->clock->speed == XINE_SPEED_PAUSE || + (this->clock->speed != XINE_FINE_SPEED_NORMAL && +@@ -1055,6 +1057,7 @@ + _x_refcounter_dec(in_buf->stream->refcounter); + fifo_append (this->free_fifo, in_buf); + in_buf = NULL; ++ pthread_mutex_unlock(&this->current_speed_lock); + continue; + } + +@@ -1065,6 +1068,7 @@ + } + + lprintf ("loop:pause: I feel sleepy (%d buffers).\n", this->out_fifo->num_buffers); ++ pthread_mutex_unlock(&this->current_speed_lock); + xine_usec_sleep (10000); + lprintf ("loop:pause: I wake up.\n"); + continue; +@@ -1274,6 +1278,7 @@ + fifo_append (this->free_fifo, in_buf); + in_buf = NULL; + } ++ pthread_mutex_unlock(&this->current_speed_lock); + + /* Give other threads a chance to use functions which require this->driver_lock to + * be available. This is needed when using NPTL on Linux (and probably PThreads +@@ -1684,6 +1689,7 @@ + free (this->frame_buf[1]); + free (this->zero_space); + ++ pthread_mutex_destroy(&this->current_speed_lock); + pthread_mutex_destroy(&this->flush_audio_driver_lock); + pthread_cond_destroy(&this->flush_audio_driver_reached); + +@@ -1910,11 +1916,15 @@ + if (value != XINE_FINE_SPEED_NORMAL && value != XINE_SPEED_PAUSE && !this->slow_fast_audio ) + this->ao.control(&this->ao, AO_CTRL_FLUSH_BUFFERS, NULL); + ++ /* current_speed_lock is here to make sure the ao_loop will pause in a safe place. ++ * that is, we cannot pause writing to device, filling gaps etc. */ ++ pthread_mutex_lock(&this->current_speed_lock); + this->ao.control(&this->ao, + (value == XINE_SPEED_PAUSE) ? AO_CTRL_PLAY_PAUSE : AO_CTRL_PLAY_RESUME, NULL); + this->current_speed = value; + if( this->slow_fast_audio ) + ao_update_resample_factor(this); ++ pthread_mutex_unlock(&this->current_speed_lock); + break; + + default: +@@ -2056,6 +2066,7 @@ + this->driver = driver; + this->xine = xine; + this->clock = xine->clock; ++ this->current_speed = xine->clock->speed; + this->streams = xine_list_new(); + + /* warning: driver_lock is a recursive mutex. it must NOT be +@@ -2087,6 +2098,7 @@ + this->discard_buffers = 0; + this->zero_space = calloc (1, ZERO_BUF_SIZE * 4 * 6); /* MAX as 32bit, 6 channels. */ + ++ pthread_mutex_init( &this->current_speed_lock, NULL ); + pthread_mutex_init( &this->flush_audio_driver_lock, NULL ); + pthread_cond_init( &this->flush_audio_driver_reached, NULL ); + +diff -r ce4b1533a0af src/xine-engine/xine.c +--- a/src/xine-engine/xine.c Sun Jan 11 22:24:42 2009 +0000 ++++ b/src/xine-engine/xine.c Sat Feb 07 15:09:25 2009 -0200 +@@ -330,17 +330,20 @@ + + static void set_speed_internal (xine_stream_t *stream, int speed) { + xine_t *xine = stream->xine; ++ int old_speed = xine->clock->speed; + +- if (xine->clock->speed != XINE_SPEED_PAUSE && speed == XINE_SPEED_PAUSE) ++ if (old_speed != XINE_SPEED_PAUSE && speed == XINE_SPEED_PAUSE) + /* get all decoder and post threads in a state where they agree to be blocked */ + xine->port_ticket->revoke(xine->port_ticket, 0); + +- if (xine->clock->speed == XINE_SPEED_PAUSE && speed != XINE_SPEED_PAUSE) ++ if (old_speed == XINE_SPEED_PAUSE && speed != XINE_SPEED_PAUSE) + /* all decoder and post threads may continue now */ + xine->port_ticket->issue(xine->port_ticket, 0); + +- stream->xine->clock->set_fine_speed (stream->xine->clock, speed); +- ++ if (old_speed != XINE_SPEED_PAUSE && speed == XINE_SPEED_PAUSE) ++ /* set master clock so audio_out loop can pause in a safe place */ ++ stream->xine->clock->set_fine_speed (stream->xine->clock, speed); ++ + /* see coment on audio_out loop about audio_paused */ + if( stream->audio_out ) { + xine->port_ticket->acquire(xine->port_ticket, 1); +@@ -350,6 +353,10 @@ + + xine->port_ticket->release(xine->port_ticket, 1); + } ++ ++ if (old_speed == XINE_SPEED_PAUSE && speed != XINE_SPEED_PAUSE) ++ /* master clock is set after resuming the audio device (audio_out loop may continue) */ ++ stream->xine->clock->set_fine_speed (stream->xine->clock, speed); + } + + diff --git a/xine-lib.spec b/xine-lib.spec index c8a0f1a..5170e18 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -31,9 +31,9 @@ %define _without_arts --without-arts %endif -Summary: Xine library +Summary: A multimedia engine Name: xine-lib -Version: 1.1.16.1 +Version: 1.1.16.2 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -55,8 +55,12 @@ Patch7: %{name}-1.1.16-old-caca.patch # http://bugzilla.redhat.com/470568 Patch8: xine-lib-1.1.15-avsync_hack.patch ## upstream patches +Patch100: xine-lib-safe-audio-pause.patch Provides: xine-lib(plugin-abi) = %{abiver} +%if "%{?_isa}" != "%{nil}" +Provides: xine-lib(plugin-abi)%{?_isa} = %{abiver} +%endif # X11 BuildRequires: libX11-devel BuildRequires: libXv-devel @@ -119,13 +123,10 @@ BuildRequires: samba-common BuildRequires: libdvdnav-devel %description -This package contains the Xine library. Xine is a free multimedia player. -It can play back various media. It also decodes multimedia files from local -disk drives, and displays multimedia streamed over the Internet. It -interprets many of the most common multimedia formats available - and some -of the most uncommon formats, too. --with/--without rpmbuild options -(some default values depend on target distribution): aalib, directfb, -imagemagick, freetype, antialiasing (with freetype), pulseaudio, xcb. +This package contains the Xine library. It can be used to play back +various media, decode multimedia files from local disk drives, and display +multimedia streamed over the Internet. It interprets many of the most +common multimedia formats available - and some uncommon formats, too. %package devel Summary: Xine library development files @@ -135,10 +136,10 @@ Requires: pkgconfig Requires: zlib-devel %description devel -This package contains development files for xine-lib. +This package contains development files for %{name}. %package arts -Summary: aRts plugin for xine-lib +Summary: aRts plugin for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} #Requires: xine-lib(plugin-abi) = %{abiver} @@ -146,27 +147,27 @@ Requires: %{name} = %{version}-%{release} Obsoletes: xine-lib-extras < 1.1.7-3 %description arts -This package contains the aRts extra plugin for xine-lib. +This package contains the aRts plugin for %{name}. %package pulseaudio -Summary: Pulseaudio plugin for xine-lib +Summary: Pulseaudio plugin for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} # -pulseaudio was split off -extras at 1.1.11.1-2 #Obsoletes: xine-lib-extras < 1.1.11.1-2 %description pulseaudio -This package contains the pulseaudio plugin for xine-lib. +This package contains the pulseaudio plugin for %{name}. %package extras -Summary: Additional plugins for xine-lib +Summary: Additional plugins for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} #Requires: xine-lib(plugin-abi) = %{abiver} %description extras -This package contains extra plugins for xine-lib: +This package contains extra plugins for %{name}: - EsounD - JACK - GDK-Pixbuf @@ -202,6 +203,8 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4 %patch8 -p1 -b .avsync_hack +%patch100 -p1 -b .safe_audio_pause + # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex ) #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure @@ -234,7 +237,6 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" --with-external-ffmpeg \ --with-xv-path=%{_libdir} \ --with-libflac \ - --with-external-libdvdnav \ --with-external-libmpcdec \ %if 0%{?_without_imagemagick:1} --without-imagemagick \ @@ -434,6 +436,19 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 10 2009 Rex Dieter - 1.1.16.2-1 +- xine-lib-1.1.16.2 + +* Mon Feb 09 2009 Rex Dieter - 1.1.16.1-4 +- gapless-race-fix patch (kdebug#180339) + +* Sat Feb 07 2009 Rex Dieter - 1.1.16.1-3 +- safe-audio-pause patch (kdebug#180339) + +* Mon Jan 26 2009 Rex Dieter - 1.1.16.1-2 +- Provides: xine-lib(plugin-abi)%%{?_isa} = %%{abiver} +- touchup Summary/Description + * Fri Jan 23 2009 Rex Dieter - 1.1.16.1-1 - xine-lib-1.1.16.1 - include avsync patch (#470568) From 4fc0d681f8fb417c3fd5155ac0a6ad0315f455b3 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 19 Feb 2009 18:03:38 +0000 Subject: [PATCH 26/43] * Tue Feb 17 2009 Rex Dieter - 1.1.16.2-2 - xine-lib-safe-audio-pause3 patch (kdebug#180339) --- ....patch => xine-lib-safe-audio-pause3.patch | 48 +++++++++++-------- xine-lib.spec | 15 ++++-- 2 files changed, 41 insertions(+), 22 deletions(-) rename xine-lib-safe-audio-pause.patch => xine-lib-safe-audio-pause3.patch (75%) diff --git a/xine-lib-safe-audio-pause.patch b/xine-lib-safe-audio-pause3.patch similarity index 75% rename from xine-lib-safe-audio-pause.patch rename to xine-lib-safe-audio-pause3.patch index 4a4b70b..fdfbf8a 100644 --- a/xine-lib-safe-audio-pause.patch +++ b/xine-lib-safe-audio-pause3.patch @@ -1,6 +1,14 @@ -diff -r ce4b1533a0af src/xine-engine/audio_out.c ---- a/src/xine-engine/audio_out.c Sun Jan 11 22:24:42 2009 +0000 -+++ b/src/xine-engine/audio_out.c Sat Feb 07 15:09:24 2009 -0200 +# HG changeset patch +# User Miguel Freitas +# Date 1234834587 10800 +# Node ID 2208e465026c1e54318d36dad8ca180d52fcc318 +# Parent 24a9b3d531419405f71dbcf96da93876769eb990 +Protect audio loop so it cannot write to a paused device (fix +pause/resume freeze with pulseaudio). + +diff -r 24a9b3d53141 -r 2208e465026c src/xine-engine/audio_out.c +--- a/src/xine-engine/audio_out.c Fri Feb 13 18:01:29 2009 +0000 ++++ b/src/xine-engine/audio_out.c Mon Feb 16 22:36:27 2009 -0300 @@ -243,6 +243,7 @@ audio_fifo_t *free_fifo; audio_fifo_t *out_fifo; @@ -49,23 +57,25 @@ diff -r ce4b1533a0af src/xine-engine/audio_out.c pthread_mutex_destroy(&this->flush_audio_driver_lock); pthread_cond_destroy(&this->flush_audio_driver_reached); -@@ -1910,11 +1916,15 @@ +@@ -1910,8 +1916,15 @@ if (value != XINE_FINE_SPEED_NORMAL && value != XINE_SPEED_PAUSE && !this->slow_fast_audio ) this->ao.control(&this->ao, AO_CTRL_FLUSH_BUFFERS, NULL); -+ /* current_speed_lock is here to make sure the ao_loop will pause in a safe place. -+ * that is, we cannot pause writing to device, filling gaps etc. */ -+ pthread_mutex_lock(&this->current_speed_lock); - this->ao.control(&this->ao, - (value == XINE_SPEED_PAUSE) ? AO_CTRL_PLAY_PAUSE : AO_CTRL_PLAY_RESUME, NULL); +- this->ao.control(&this->ao, +- (value == XINE_SPEED_PAUSE) ? AO_CTRL_PLAY_PAUSE : AO_CTRL_PLAY_RESUME, NULL); ++ if( value == XINE_SPEED_PAUSE ) { ++ /* current_speed_lock is here to make sure the ao_loop will pause in a safe place. ++ * that is, we cannot pause writing to device, filling gaps etc. */ ++ pthread_mutex_lock(&this->current_speed_lock); ++ this->ao.control(&this->ao, AO_CTRL_PLAY_PAUSE, NULL); ++ pthread_mutex_unlock(&this->current_speed_lock); ++ } else { ++ this->ao.control(&this->ao, AO_CTRL_PLAY_RESUME, NULL); ++ } this->current_speed = value; if( this->slow_fast_audio ) ao_update_resample_factor(this); -+ pthread_mutex_unlock(&this->current_speed_lock); - break; - - default: -@@ -2056,6 +2066,7 @@ +@@ -2056,6 +2069,7 @@ this->driver = driver; this->xine = xine; this->clock = xine->clock; @@ -73,7 +83,7 @@ diff -r ce4b1533a0af src/xine-engine/audio_out.c this->streams = xine_list_new(); /* warning: driver_lock is a recursive mutex. it must NOT be -@@ -2087,6 +2098,7 @@ +@@ -2087,6 +2101,7 @@ this->discard_buffers = 0; this->zero_space = calloc (1, ZERO_BUF_SIZE * 4 * 6); /* MAX as 32bit, 6 channels. */ @@ -81,9 +91,9 @@ diff -r ce4b1533a0af src/xine-engine/audio_out.c pthread_mutex_init( &this->flush_audio_driver_lock, NULL ); pthread_cond_init( &this->flush_audio_driver_reached, NULL ); -diff -r ce4b1533a0af src/xine-engine/xine.c ---- a/src/xine-engine/xine.c Sun Jan 11 22:24:42 2009 +0000 -+++ b/src/xine-engine/xine.c Sat Feb 07 15:09:25 2009 -0200 +diff -r 24a9b3d53141 -r 2208e465026c src/xine-engine/xine.c +--- a/src/xine-engine/xine.c Fri Feb 13 18:01:29 2009 +0000 ++++ b/src/xine-engine/xine.c Mon Feb 16 22:36:27 2009 -0300 @@ -330,17 +330,20 @@ static void set_speed_internal (xine_stream_t *stream, int speed) { @@ -114,7 +124,7 @@ diff -r ce4b1533a0af src/xine-engine/xine.c xine->port_ticket->release(xine->port_ticket, 1); } + -+ if (old_speed == XINE_SPEED_PAUSE && speed != XINE_SPEED_PAUSE) ++ if (old_speed == XINE_SPEED_PAUSE || speed != XINE_SPEED_PAUSE) + /* master clock is set after resuming the audio device (audio_out loop may continue) */ + stream->xine->clock->set_fine_speed (stream->xine->clock, speed); } diff --git a/xine-lib.spec b/xine-lib.spec index 5170e18..ba2b3bf 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -34,7 +34,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.16.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -50,12 +50,11 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: %{name}-1.1.4-optflags.patch Patch6: %{name}-1.1.1-deepbind-939.patch -# FIXME for 1.1.16.1 ? Patch7: %{name}-1.1.16-old-caca.patch # http://bugzilla.redhat.com/470568 Patch8: xine-lib-1.1.15-avsync_hack.patch ## upstream patches -Patch100: xine-lib-safe-audio-pause.patch +Patch100: xine-lib-safe-audio-pause3.patch Provides: xine-lib(plugin-abi) = %{abiver} %if "%{?_isa}" != "%{nil}" @@ -188,6 +187,9 @@ This package contains extra plugins for %{name}: %prep %setup -q +%if 0%{?old_caca} +sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure.ac +%endif %patch0 -p1 -b .autotools touch -r configure.ac aclocal.m4 touch -r m4/optimizations.m4 m4/optimizations.m4.stamp @@ -198,6 +200,7 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4 #patch6 -p1 -b .deepbind %if 0%{?old_caca} +sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure %patch7 -p0 -b .old-caca %endif @@ -436,6 +439,12 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Feb 17 2009 Rex Dieter - 1.1.16.2-2 +- xine-lib-safe-audio-pause3 patch (kdebug#180339) + +* Tue Feb 10 2009 Kevin Kofler - 1.1.16.2-1.1 +- also patch the caca version check in configure(.ac) + * Tue Feb 10 2009 Rex Dieter - 1.1.16.2-1 - xine-lib-1.1.16.2 From 81b82aab5cd37a55aa5b52de407b31c9f22fefd2 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 20 Feb 2009 13:55:46 +0000 Subject: [PATCH 27/43] * Fri Feb 20 2009 Rex Dieter - 1.1.16.2-3 - xine-lib-devel muiltilib conflict (#477226) --- xine-lib-1.1.16.2-multilib.patch | 16 ++++++++++++++++ xine-lib.spec | 10 ++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 xine-lib-1.1.16.2-multilib.patch diff --git a/xine-lib-1.1.16.2-multilib.patch b/xine-lib-1.1.16.2-multilib.patch new file mode 100644 index 0000000..4609e63 --- /dev/null +++ b/xine-lib-1.1.16.2-multilib.patch @@ -0,0 +1,16 @@ +diff -up xine-lib-1.1.16.2/misc/xine-config.in.multilib xine-lib-1.1.16.2/misc/xine-config.in +--- xine-lib-1.1.16.2/misc/xine-config.in.multilib 2008-06-25 08:04:09.000000000 -0500 ++++ xine-lib-1.1.16.2/misc/xine-config.in 2009-02-20 07:34:27.000000000 -0600 +@@ -6,12 +6,6 @@ unset prefix + unset exec_prefix + unset args + +-PKG_CONFIG_PATH="`cat <<'EOF' +-@XINE_PKGCONFIG_DIR@ +-EOF +-`${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH" +-export PKG_CONFIG_PATH +- + usage() + { + cat <= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure %endif %patch8 -p1 -b .avsync_hack +%patch9 -p1 -b .multilib %patch100 -p1 -b .safe_audio_pause @@ -439,8 +442,11 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Feb 20 2009 Rex Dieter - 1.1.16.2-3 +- xine-lib-devel muiltilib conflict (#477226) + * Tue Feb 17 2009 Rex Dieter - 1.1.16.2-2 -- xine-lib-safe-audio-pause3 patch (kdebug#180339) +- xine-lib-safe-audio-pause3 patch (#486255, kdebug#180339) * Tue Feb 10 2009 Kevin Kofler - 1.1.16.2-1.1 - also patch the caca version check in configure(.ac) From a00e88d7c3a8e4dc7971b9d95bb0809ea48e0316 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 9 Apr 2009 13:01:31 +0000 Subject: [PATCH 28/43] * Fri Apr 03 2009 Rex Dieter - 1.1.16.3-1 - xine-lib-1.1.16.3, plugin-abi 1.26 --- .cvsignore | 4 +- sources | 4 +- xine-lib.spec | 239 ++++++++++++++++++++++++++------------------------ 3 files changed, 128 insertions(+), 119 deletions(-) diff --git a/.cvsignore b/.cvsignore index 8a0cd42..dbdfc40 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.16.2-pruned.tar.bz2 -xine-lib-1.1.16.2-autotools.patch.bz2 +xine-lib-1.1.16.3-autotools.patch.bz2 +xine-lib-1.1.16.3-pruned.tar.bz2 diff --git a/sources b/sources index 95d5764..3cc02d3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e2c3a178be02f5c32957b2716123aa28 xine-lib-1.1.16.2-pruned.tar.bz2 -07bf186d51b8315026453a2f21b33703 xine-lib-1.1.16.2-autotools.patch.bz2 +e50122a9323107564d58056b35256610 xine-lib-1.1.16.3-autotools.patch.bz2 +0cac86b7d74c1dcaa22f5a8cbc5ef578 xine-lib-1.1.16.3-pruned.tar.bz2 diff --git a/xine-lib.spec b/xine-lib.spec index aa0ffe4..7893457 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -4,7 +4,7 @@ # http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html # - deprecate ESD support? -%define abiver 1.25 +%define plugin_abi 1.26 %define codecdir %{_libdir}/codecs %ifarch %{ix86} @@ -33,8 +33,8 @@ Summary: A multimedia engine Name: xine-lib -Version: 1.1.16.2 -Release: 3%{?dist} +Version: 1.1.16.3 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -56,11 +56,10 @@ Patch8: xine-lib-1.1.15-avsync_hack.patch # http://bugzilla.redhat.com/477226 Patch9: xine-lib-1.1.16.2-multilib.patch ## upstream patches -Patch100: xine-lib-safe-audio-pause3.patch -Provides: xine-lib(plugin-abi) = %{abiver} +Provides: xine-lib(plugin-abi) = %{plugin_abi} %if "%{?_isa}" != "%{nil}" -Provides: xine-lib(plugin-abi)%{?_isa} = %{abiver} +Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi} %endif # X11 BuildRequires: libX11-devel @@ -143,7 +142,7 @@ This package contains development files for %{name}. Summary: aRts plugin for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -#Requires: xine-lib(plugin-abi) = %{abiver} +#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 @@ -165,7 +164,7 @@ This package contains the pulseaudio plugin for %{name}. Summary: Additional plugins for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -#Requires: xine-lib(plugin-abi) = %{abiver} +#Requires: xine-lib(plugin-abi) = %{plugin_abi} %description extras This package contains extra plugins for %{name}: @@ -209,8 +208,6 @@ sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure %patch8 -p1 -b .avsync_hack %patch9 -p1 -b .multilib -%patch100 -p1 -b .safe_audio_pause - # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex ) #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure @@ -290,142 +287,142 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man5/xine.5* %dir %{_libdir}/xine/ %dir %{_libdir}/xine/plugins/ -%dir %{_libdir}/xine/plugins/%{abiver}/ -%{_libdir}/xine/plugins/%{abiver}/mime.types +%dir %{_libdir}/xine/plugins/%{plugin_abi}/ +%{_libdir}/xine/plugins/%{plugin_abi}/mime.types # Listing every plugin separately for better control over binary packages # containing exactly the plugins we want, nothing accidentally snuck in # nor dropped. -%dir %{_libdir}/xine/plugins/%{abiver}/post/ -%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_audio_filters.so -%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_goom.so -%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_mosaico.so -%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_switch.so -%{_libdir}/xine/plugins/%{abiver}/post/xineplug_post_visualizations.so +%dir %{_libdir}/xine/plugins/%{plugin_abi}/post/ +%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_audio_filters.so +%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_goom.so +%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_mosaico.so +%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_switch.so +%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_visualizations.so %if %{have_vidix} -%dir %{_libdir}/xine/plugins/%{abiver}/vidix/ -%{_libdir}/xine/plugins/%{abiver}/vidix/cyberblade_vid.so -%{_libdir}/xine/plugins/%{abiver}/vidix/mach64_vid.so -%{_libdir}/xine/plugins/%{abiver}/vidix/mga_crtc2_vid.so -%{_libdir}/xine/plugins/%{abiver}/vidix/mga_vid.so -%{_libdir}/xine/plugins/%{abiver}/vidix/nvidia_vid.so -%{_libdir}/xine/plugins/%{abiver}/vidix/pm2_vid.so -%{_libdir}/xine/plugins/%{abiver}/vidix/pm3_vid.so -%{_libdir}/xine/plugins/%{abiver}/vidix/radeon_vid.so -%{_libdir}/xine/plugins/%{abiver}/vidix/rage128_vid.so -%{_libdir}/xine/plugins/%{abiver}/vidix/savage_vid.so -%{_libdir}/xine/plugins/%{abiver}/vidix/sis_vid.so -%{_libdir}/xine/plugins/%{abiver}/vidix/unichrome_vid.so +%dir %{_libdir}/xine/plugins/%{plugin_abi}/vidix/ +%{_libdir}/xine/plugins/%{plugin_abi}/vidix/cyberblade_vid.so +%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mach64_vid.so +%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mga_crtc2_vid.so +%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mga_vid.so +%{_libdir}/xine/plugins/%{plugin_abi}/vidix/nvidia_vid.so +%{_libdir}/xine/plugins/%{plugin_abi}/vidix/pm2_vid.so +%{_libdir}/xine/plugins/%{plugin_abi}/vidix/pm3_vid.so +%{_libdir}/xine/plugins/%{plugin_abi}/vidix/radeon_vid.so +%{_libdir}/xine/plugins/%{plugin_abi}/vidix/rage128_vid.so +%{_libdir}/xine/plugins/%{plugin_abi}/vidix/savage_vid.so +%{_libdir}/xine/plugins/%{plugin_abi}/vidix/sis_vid.so +%{_libdir}/xine/plugins/%{plugin_abi}/vidix/unichrome_vid.so %endif # vidix -%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_alsa.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_file.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_none.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_oss.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_bitplane.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gsm610.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_lpcm.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_mpc.so +%{_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_decode_bitplane.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gsm610.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_mpc.so %ifarch %ix86 -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_qt.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_qt.so %endif # ix86 -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_real.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_rgb.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_speex.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spu.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucc.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spucmml.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_spudvb.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_sputext.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_theora.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_vorbis.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_speex.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_sputext.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_theora.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vorbis.so %ifarch %ix86 -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_w32dll.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_w32dll.so %endif # ix86 -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_yuv.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_audio.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_avi.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_fli.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_flv.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_games.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_iff.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_image.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_matroska.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mng.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_block.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_elem.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_pes.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_mpeg_ts.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_nsv.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_ogg.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_pva.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_qt.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_rawdv.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_real.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_slave.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_sputext.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv_frames.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_dmx_yuv4mpeg2.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_flac.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_cdda.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_dvb.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_file.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_http.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_net.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pnm.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_pvr.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtp.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_rtsp.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_stdin_fifo.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_v4l.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_fb.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_none.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_opengl.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_raw.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_syncfb.so +%{_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_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_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_ogg.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_sputext.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_flac.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 +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_http.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_net.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pnm.so +%{_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 +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.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_raw.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_syncfb.so %if %{have_vidix} -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_vidix.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so %endif # vidix %if %{with_xcb} -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbshm.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xcbxv.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbshm.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbxv.so %endif # xcb -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xshm.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xv.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xvmc.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xxmc.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_wavpack.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xshm.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xv.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so %if 0%{!?_without_arts:1} %files arts %defattr(-,root,root,-) -%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_arts.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_arts.so %endif %if %{with_pa} %files pulseaudio %defattr(-,root,root,-) -%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_pulseaudio.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so %endif %files extras %defattr(-,root,root,-) -%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_esd.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_ao_out_jack.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_decode_gdk_pixbuf.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_esd.so +%{_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/%{abiver}/xineplug_decode_image.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so %endif # imagemagick -%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_gnome_vfs.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_inp_smb.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_gnome_vfs.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so %if %{with_aalib} -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_aa.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_aa.so %endif # aalib -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_caca.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_caca.so %if 0%{!?_without_directfb:1} -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_directfb.so -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_xdirectfb.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_directfb.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xdirectfb.so %endif # directfb -%{_libdir}/xine/plugins/%{abiver}/xineplug_vo_out_sdl.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_sdl.so %files devel %defattr(-,root,root,-) @@ -442,6 +439,18 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Apr 03 2009 Rex Dieter - 1.1.16.3-1 +- xine-lib-1.1.16.3, plugin-abi 1.26 + +* Thu Mar 26 2009 Rex Dieter - 1.1.16.2-6 +- add-mime-for-mod.patch + +* Tue Mar 10 2009 Kevin Kofler - 1.1.16.2-5 +- rebuild for new ImageMagick + +* Thu Feb 26 2009 Fedora Release Engineering - 1.1.16.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild + * Fri Feb 20 2009 Rex Dieter - 1.1.16.2-3 - xine-lib-devel muiltilib conflict (#477226) @@ -461,7 +470,7 @@ rm -rf $RPM_BUILD_ROOT - safe-audio-pause patch (kdebug#180339) * Mon Jan 26 2009 Rex Dieter - 1.1.16.1-2 -- Provides: xine-lib(plugin-abi)%%{?_isa} = %%{abiver} +- Provides: xine-lib(plugin-abi)%%{?_isa} = %%{plugin_abi} - touchup Summary/Description * Fri Jan 23 2009 Rex Dieter - 1.1.16.1-1 From 3ce3ad85964e859f3d381e5f420290d3d7e0431b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 10 Apr 2009 17:14:44 +0000 Subject: [PATCH 29/43] * Fri Apr 10 2009 Rex Dieter - 1.1.16.3-2 - fix modtracker mimetypes --- xine-lib-1.1.16.3-mod_mimetypes_typo.patch | 20 ++++++++++++++++++++ xine-lib.spec | 8 +++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 xine-lib-1.1.16.3-mod_mimetypes_typo.patch diff --git a/xine-lib-1.1.16.3-mod_mimetypes_typo.patch b/xine-lib-1.1.16.3-mod_mimetypes_typo.patch new file mode 100644 index 0000000..b10fabb --- /dev/null +++ b/xine-lib-1.1.16.3-mod_mimetypes_typo.patch @@ -0,0 +1,20 @@ +diff -up xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo xine-lib-1.1.16.3/src/demuxers/demux_mod.c +--- xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo 2009-03-25 14:28:40.000000000 -0500 ++++ xine-lib-1.1.16.3/src/demuxers/demux_mod.c 2009-04-10 10:15:04.000000000 -0500 +@@ -387,11 +387,11 @@ static const char *get_mimetypes (demux_ + "audio/x-s3m: s3m: ScreamTracker 3 Module;" + "audio/s3m: s3m: ScreamTracker 3 Module;" + "application/playerpro: 669: 669 Tracker Module;" +- "application/adrift; amf: ADRIFT Module File;" +- "audio/med; med; Amiga MED/OctaMED Tracker Module Sound File;" +- "audio/x-amf; amf: ADRIFT Module File;" +- "audio/x-xm; xm: FastTracker II Audio;" +- "audio/xm; xm: FastTracker II Audio;"; ++ "application/adrift: amf: ADRIFT Module File;" ++ "audio/med: med: Amiga MED/OctaMED Tracker Module Sound File;" ++ "audio/x-amf: amf: ADRIFT Module File;" ++ "audio/x-xm: xm: FastTracker II Audio;" ++ "audio/xm: xm: FastTracker II Audio;"; + } + + static void class_dispose (demux_class_t *this_gen) { diff --git a/xine-lib.spec b/xine-lib.spec index 7893457..253bd5f 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -34,7 +34,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.16.3 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ @@ -55,6 +55,8 @@ Patch7: %{name}-1.1.16-old-caca.patch Patch8: xine-lib-1.1.15-avsync_hack.patch # http://bugzilla.redhat.com/477226 Patch9: xine-lib-1.1.16.2-multilib.patch +## upstreamable patches +Patch50: xine-lib-1.1.16.3-mod_mimetypes_typo.patch ## upstream patches Provides: xine-lib(plugin-abi) = %{plugin_abi} @@ -207,6 +209,7 @@ sed -i -e 's/caca >= 0\.99beta14 cucul >= 0\.99beta14/caca cucul/g' configure %patch8 -p1 -b .avsync_hack %patch9 -p1 -b .multilib +%patch50 -p1 -b .mod_mimetypes_typo # Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex ) #sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure @@ -439,6 +442,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Fri Apr 10 2009 Rex Dieter - 1.1.16.3-2 +- fix modtracker mimetypes + * Fri Apr 03 2009 Rex Dieter - 1.1.16.3-1 - xine-lib-1.1.16.3, plugin-abi 1.26 From 3817db5039e2f086ad4b45fee815ea30606894ad Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 30 Apr 2009 15:11:26 +0000 Subject: [PATCH 30/43] bump-n-rebuild --- xine-lib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 253bd5f..08799c5 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -34,7 +34,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.16.3 -Release: 2%{?dist} +Release: 2%{?dist}.1 License: GPLv2+ Group: System Environment/Libraries URL: http://xinehq.de/ From ca4afa5f51152c6d88a2dfec21ce7154facfa6b5 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:32 +0000 Subject: [PATCH 31/43] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a1c167d..3f11a94 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xine-lib SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 727d12ce69d035761680beaafb8f392620334b7b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:33:33 +0000 Subject: [PATCH 32/43] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a1c167d..3f11a94 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ NAME := xine-lib SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 1622a9369f1bda10831df85cca567383cf8f5d23 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 30 Nov 2009 14:10:33 +0000 Subject: [PATCH 33/43] * Sun Nov 29 2009 Rex Dieter - 1.1.16.3-5 - move -pulseaudio into main pkg (f12+) - update URL --- xine-lib.spec | 36 +++++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 32b7bdf..f31b4c4 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -23,17 +23,21 @@ %define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0} %endif # Fedora -%if 0%{?fedora} > 8 +%if 0%{?fedora} > 8 || 0%{?rhel} > 5 %define _without_arts --without-arts %endif +%if 0%{?fedora} > 11 +%define pa_in_main 1 +%endif + Summary: A multimedia engine Name: xine-lib Version: 1.1.16.3 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Libraries -URL: http://xinehq.de/ +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 @@ -115,6 +119,11 @@ BuildRequires: samba-common %endif BuildRequires: libdvdnav-devel +%if 0%{?pa_in_main} +Obsoletes: xine-lib-pulseaudio < 1.1.16.3-5 +Provides: xine-lib-pulseaudio = %{version}-%{release} +%endif + %description This package contains the Xine library. It can be used to play back various media, decode multimedia files from local disk drives, and display @@ -146,8 +155,6 @@ This package contains the aRts plugin for %{name}. Summary: Pulseaudio plugin for %{name} Group: System Environment/Libraries Requires: %{name} = %{version}-%{release} -# -pulseaudio was split off -extras at 1.1.11.1-2 -#Obsoletes: xine-lib-extras < 1.1.11.1-2 %description pulseaudio This package contains the pulseaudio plugin for %{name}. @@ -378,18 +385,21 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so +%if %{with_pa} +%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,-) %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_arts.so %endif -%if %{with_pa} -%files pulseaudio -%defattr(-,root,root,-) -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so -%endif - %files extras %defattr(-,root,root,-) %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_esd.so @@ -425,6 +435,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Nov 29 2009 Rex Dieter - 1.1.16.3-5 +- move -pulseaudio into main pkg (f12+) +- update URL + * Mon Jul 27 2009 Fedora Release Engineering - 1.1.16.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild From 595aaf6d2ca24c51ccb8cf3a01ba09a6afdbada9 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 8 May 2010 02:29:15 +0000 Subject: [PATCH 34/43] Initialize branch EL-6 for xine-lib --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..46381b9 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +EL-6 From eb97b605e424c8eb054ff94db7e368a8680eb6c8 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 21 Jun 2010 12:32:45 +0000 Subject: [PATCH 35/43] * Sun Mar 07 2010 Rex Dieter - 1.1.18.1-1 - xine-lib-1.1.18.1 --- .cvsignore | 4 +- sources | 4 +- xine-lib-1.1.16.3-mod_mimetypes_typo.patch | 20 ---- ...patch => xine-lib-1.1.17-avsync_hack.patch | 14 +-- xine-lib-1.1.18.1-no_autopoint.patch | 17 ++++ xine-lib-mk-autotools-patch.sh | 1 + xine-lib.spec | 98 +++++++++++-------- 7 files changed, 88 insertions(+), 70 deletions(-) delete mode 100644 xine-lib-1.1.16.3-mod_mimetypes_typo.patch rename xine-lib-1.1.15-avsync_hack.patch => xine-lib-1.1.17-avsync_hack.patch (59%) create mode 100644 xine-lib-1.1.18.1-no_autopoint.patch diff --git a/.cvsignore b/.cvsignore index dbdfc40..9d21c9b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.16.3-autotools.patch.bz2 -xine-lib-1.1.16.3-pruned.tar.bz2 +xine-lib-1.1.18.1-autotools.patch.bz2 +xine-lib-1.1.18.1-pruned.tar.bz2 diff --git a/sources b/sources index 3cc02d3..cf9ff04 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e50122a9323107564d58056b35256610 xine-lib-1.1.16.3-autotools.patch.bz2 -0cac86b7d74c1dcaa22f5a8cbc5ef578 xine-lib-1.1.16.3-pruned.tar.bz2 +e2c45d451fd9d8ad3be680237ff5bcdf xine-lib-1.1.18.1-autotools.patch.bz2 +55de212f416d9d366cad7520ccd7a539 xine-lib-1.1.18.1-pruned.tar.bz2 diff --git a/xine-lib-1.1.16.3-mod_mimetypes_typo.patch b/xine-lib-1.1.16.3-mod_mimetypes_typo.patch deleted file mode 100644 index b10fabb..0000000 --- a/xine-lib-1.1.16.3-mod_mimetypes_typo.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo xine-lib-1.1.16.3/src/demuxers/demux_mod.c ---- xine-lib-1.1.16.3/src/demuxers/demux_mod.c.mod_mimetypes_typo 2009-03-25 14:28:40.000000000 -0500 -+++ xine-lib-1.1.16.3/src/demuxers/demux_mod.c 2009-04-10 10:15:04.000000000 -0500 -@@ -387,11 +387,11 @@ static const char *get_mimetypes (demux_ - "audio/x-s3m: s3m: ScreamTracker 3 Module;" - "audio/s3m: s3m: ScreamTracker 3 Module;" - "application/playerpro: 669: 669 Tracker Module;" -- "application/adrift; amf: ADRIFT Module File;" -- "audio/med; med; Amiga MED/OctaMED Tracker Module Sound File;" -- "audio/x-amf; amf: ADRIFT Module File;" -- "audio/x-xm; xm: FastTracker II Audio;" -- "audio/xm; xm: FastTracker II Audio;"; -+ "application/adrift: amf: ADRIFT Module File;" -+ "audio/med: med: Amiga MED/OctaMED Tracker Module Sound File;" -+ "audio/x-amf: amf: ADRIFT Module File;" -+ "audio/x-xm: xm: FastTracker II Audio;" -+ "audio/xm: xm: FastTracker II Audio;"; - } - - static void class_dispose (demux_class_t *this_gen) { diff --git a/xine-lib-1.1.15-avsync_hack.patch b/xine-lib-1.1.17-avsync_hack.patch similarity index 59% rename from xine-lib-1.1.15-avsync_hack.patch rename to xine-lib-1.1.17-avsync_hack.patch index f33aba4..5fa1ae1 100644 --- a/xine-lib-1.1.15-avsync_hack.patch +++ b/xine-lib-1.1.17-avsync_hack.patch @@ -1,8 +1,8 @@ -diff -uNr xine-lib-1.1.15.orig/src/xine-engine/audio_out.c xine-lib-1.1.15/src/xine-engine/audio_out.c ---- xine-lib-1.1.15.orig/src/xine-engine/audio_out.c 2008-07-10 18:19:10.000000000 +0200 -+++ xine-lib-1.1.15/src/xine-engine/audio_out.c 2009-01-10 21:57:20.000000000 +0100 -@@ -1151,8 +1151,17 @@ - +diff -up xine-lib-1.1.17/src/xine-engine/audio_out.c.avsync_hack xine-lib-1.1.17/src/xine-engine/audio_out.c +--- xine-lib-1.1.17/src/xine-engine/audio_out.c.avsync_hack 2009-11-30 19:33:30.000000000 -0600 ++++ xine-lib-1.1.17/src/xine-engine/audio_out.c 2009-12-02 09:07:37.622805780 -0600 +@@ -1156,8 +1156,17 @@ static void *ao_loop (void *this_gen) { + /* * calculate gap: + * @@ -13,9 +13,9 @@ diff -uNr xine-lib-1.1.15.orig/src/xine-engine/audio_out.c xine-lib-1.1.15/src/x */ - gap = in_buf->vpts - hw_vpts; + if (in_buf && in_buf->stream && in_buf->stream->video_decoder_plugin) { -+ gap = in_buf->vpts - hw_vpts; ++ gap = in_buf->vpts - hw_vpts; + } else { -+ gap = 0; ++ gap = 0; + } lprintf ("hw_vpts : %" PRId64 " buffer_vpts : %" PRId64 " gap : %" PRId64 "\n", hw_vpts, in_buf->vpts, gap); diff --git a/xine-lib-1.1.18.1-no_autopoint.patch b/xine-lib-1.1.18.1-no_autopoint.patch new file mode 100644 index 0000000..d5ee0cd --- /dev/null +++ b/xine-lib-1.1.18.1-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-mk-autotools-patch.sh b/xine-lib-mk-autotools-patch.sh index dc1e103..3cb6d1a 100644 --- a/xine-lib-mk-autotools-patch.sh +++ b/xine-lib-mk-autotools-patch.sh @@ -23,6 +23,7 @@ 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 diff --git a/xine-lib.spec b/xine-lib.spec index f31b4c4..17f16b7 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,10 +1,9 @@ # TODO, sometime, maybe: # - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog # - drop the opengl video out plugin? -# http://www.redhat.com/archives/fedora-legal-list/2007-August/msg00011.html # - deprecate ESD support? -%define plugin_abi 1.26 +%define plugin_abi 1.28 %define codecdir %{_libdir}/codecs %ifarch %{ix86} @@ -14,13 +13,15 @@ %endif # ix86 %if 0%{?fedora} - %define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1} - %define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1} - %define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} +%define _enable_v4l --enable-v4l --enable-libv4l +%define _disable_gnomevfs --disable-gnomevfs +%define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1} +%define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1} +%define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} %else - %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} - %define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0} - %define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0} +%define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} +%define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0} +%define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0} %endif # Fedora %if 0%{?fedora} > 8 || 0%{?rhel} > 5 @@ -33,41 +34,45 @@ Summary: A multimedia engine Name: xine-lib -Version: 1.1.16.3 -Release: 5%{?dist} +Version: 1.1.18.1 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries 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: %{name}-%{version}-pruned.tar.bz2 -Source1: %{name}-cleanup-sources.sh -Source2: %{name}-mk-autotools-patch.sh +Source0: xine-lib-%{version}-pruned.tar.bz2 +Source1: xine-lib-cleanup-sources.sh +Source2: xine-lib-mk-autotools-patch.sh # autotools patch created with source2 -Patch0: %{name}-%{version}-autotools.patch.bz2 +Patch0: xine-lib-%{version}-autotools.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -Patch1: %{name}-1.1.4-optflags.patch -Patch6: %{name}-1.1.1-deepbind-939.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.15-avsync_hack.patch +Patch8: xine-lib-1.1.17-avsync_hack.patch # http://bugzilla.redhat.com/477226 Patch9: xine-lib-1.1.16.2-multilib.patch ## upstreamable patches -Patch50: xine-lib-1.1.16.3-mod_mimetypes_typo.patch ## upstream patches -Provides: xine-lib(plugin-abi) = %{plugin_abi} -%if "%{?_isa}" != "%{nil}" -Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi} -%endif +Provides: xine-lib(plugin-abi) = %{plugin_abi} +%{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} + +BuildRequires: automake libtool # X11 BuildRequires: libX11-devel BuildRequires: libXv-devel BuildRequires: libXinerama-devel BuildRequires: libXvMC-devel BuildRequires: libGLU-devel +%if 0%{?_enable_v4l:1} +BuildRequires: libv4l-devel +%endif %if %{with_xcb} BuildRequires: libxcb-devel %endif # xcb @@ -110,7 +115,6 @@ BuildRequires: wavpack-devel BuildRequires: libcdio-devel # Other BuildRequires: pkgconfig -BuildRequires: gnome-vfs2-devel BuildRequires: gtk2-devel %if 0%{?fedora} > 6 || 0%{?rhel} > 5 BuildRequires: libsmbclient-devel @@ -133,39 +137,32 @@ common multimedia formats available - and some uncommon formats, too. %package devel Summary: Xine library development files Group: Development/Libraries -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig 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} = %{version}-%{release} +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}. %package pulseaudio Summary: Pulseaudio plugin for %{name} Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} - +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 -Requires: %{name} = %{version}-%{release} +Requires: %{name}%{?_isa} = %{version}-%{release} #Requires: xine-lib(plugin-abi) = %{plugin_abi} - %description extras This package contains extra plugins for %{name}: - EsounD @@ -196,12 +193,14 @@ 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 -%patch50 -p1 -b .mod_mimetypes_typo -# Avoid standard rpaths on lib64 archs: (autotools patch should handle this, no? -- Rex ) +# 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 @@ -217,6 +216,8 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %if 0%{!?_without_directfb:1} --enable-directfb \ %endif # directfb + %{?_enable_v4l}%{!?_enable_v4l:--disable-v4l --disable-libv4l} \ + %{?_disable_gnomevfs} \ --disable-a52dec \ --disable-mad \ --disable-vcd \ @@ -314,7 +315,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gsm610.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_lpcm.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_mpc.so -%ifarch %ix86 +%ifarch %{ix86} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_qt.so %endif # ix86 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_real.so @@ -324,6 +325,7 @@ rm -rf $RPM_BUILD_ROOT %{_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_sputext.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_theora.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vorbis.so @@ -367,6 +369,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.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 @@ -408,7 +411,6 @@ rm -rf $RPM_BUILD_ROOT %if 0%{!?_without_imagemagick:1} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so %endif # imagemagick -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_gnome_vfs.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so %if %{with_aalib} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_aa.so @@ -435,6 +437,24 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Mar 07 2010 Rex Dieter - 1.1.18.1-1 +- xine-lib-1.1.18.1 + +* Sun Mar 07 2010 Rex Dieter - 1.1.18-2 +- rebuild (ImageMagick) + +* Wed Feb 24 2010 Rex Dieter - 1.1.18-1 +- xine-lib-1.1.18, plugin-abi 1.28 (#567913) + +* Sat Dec 12 2009 Rex Dieter - 1.1.17-3 +- bump flac_decoder priority (rh#301861,xine#225) + +* Mon Dec 07 2009 Bastien Nocera 1.1.17-2 +- Remove gnome-vfs2 plugin, it's mostly useless + +* Wed Dec 02 2009 Rex Dieter - 1.1.17-1 +- xine-lib-1.1.17, plugin-abi 1.27 + * Sun Nov 29 2009 Rex Dieter - 1.1.16.3-5 - move -pulseaudio into main pkg (f12+) - update URL From d1fcff865880bf2be0c45af3159ea561cd676d03 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 21 Jun 2010 15:19:13 +0000 Subject: [PATCH 36/43] no libXvMC on el6/ppc64 --- xine-lib.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 17f16b7..a0e1b05 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -24,6 +24,12 @@ %define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0} %endif # Fedora +%if 0%{?rhel} > 5 +%ifarch ppc64 +%define no_xvmc 1 +%endif +%endif + %if 0%{?fedora} > 8 || 0%{?rhel} > 5 %define _without_arts --without-arts %endif @@ -68,7 +74,7 @@ BuildRequires: automake libtool BuildRequires: libX11-devel BuildRequires: libXv-devel BuildRequires: libXinerama-devel -BuildRequires: libXvMC-devel +%{!?no_xvmc:BuildRequires: libXvMC-devel} BuildRequires: libGLU-devel %if 0%{?_enable_v4l:1} BuildRequires: libv4l-devel @@ -384,7 +390,7 @@ rm -rf $RPM_BUILD_ROOT %endif # xcb %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xshm.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xv.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so +%{!?no_xvmc:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so From e79635e8dfbadb3836b91142126ec8b224e2a14d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 21 Jun 2010 15:35:39 +0000 Subject: [PATCH 37/43] fix for no libv4l --- xine-lib.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index a0e1b05..8c935ff 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -370,12 +370,14 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_http.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_net.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pnm.so -%{_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 +%if 0%{?_enable_v4l:1} +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so +%endif %{_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 From c0776ed69daf5d842711aa200e1c13ce6e704c44 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 21 Jun 2010 17:24:30 +0000 Subject: [PATCH 38/43] a few more el-6 fixes --- xine-lib.spec | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 8c935ff..0a2749f 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -13,15 +13,10 @@ %endif # ix86 %if 0%{?fedora} -%define _enable_v4l --enable-v4l --enable-libv4l %define _disable_gnomevfs --disable-gnomevfs %define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1} -%define with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1} -%define with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} %else %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} -%define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0} -%define with_xcb %{?_with_xcb:1}%{!?_with_xcb:0} %endif # Fedora %if 0%{?rhel} > 5 @@ -31,7 +26,10 @@ %endif %if 0%{?fedora} > 8 || 0%{?rhel} > 5 +%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} %endif %if 0%{?fedora} > 11 @@ -79,7 +77,7 @@ BuildRequires: libGLU-devel %if 0%{?_enable_v4l:1} BuildRequires: libv4l-devel %endif -%if %{with_xcb} +%if 0%{?_with_xcb:1} BuildRequires: libxcb-devel %endif # xcb # Video @@ -107,7 +105,7 @@ BuildRequires: jack-audio-connection-kit-devel BuildRequires: libmodplug-devel BuildRequires: libmpcdec-devel BuildRequires: libvorbis-devel -%if %{with_pa} +%if 0%{?_with_pa:1} BuildRequires: pulseaudio-lib-devel %endif # pa BuildRequires: speex-devel @@ -386,7 +384,7 @@ rm -rf $RPM_BUILD_ROOT %if %{have_vidix} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so %endif # vidix -%if %{with_xcb} +%if 0%{?_with_xcb:1} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbshm.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xcbxv.so %endif # xcb @@ -396,7 +394,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so -%if %{with_pa} +%if 0%{?_with_pa:1} %if ! 0%{?pa_in_main} %files pulseaudio %defattr(-,root,root,-) @@ -404,7 +402,6 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so %endif - %if 0%{!?_without_arts:1} %files arts %defattr(-,root,root,-) From 08481795c603c1ad048890e0dcd6d7475606993a Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 21 Jun 2010 18:15:18 +0000 Subject: [PATCH 39/43] more el-6 fixes --- xine-lib.spec | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 0a2749f..75e873d 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -19,9 +19,10 @@ %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} %endif # Fedora +%define _enable_xvmc --enable-xvmc %if 0%{?rhel} > 5 %ifarch ppc64 -%define no_xvmc 1 +%undefine _enable_xvmc %endif %endif @@ -32,7 +33,7 @@ %define _with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} %endif -%if 0%{?fedora} > 11 +%if 0%{?fedora} > 11 || 0%{?rhel} > 5 %define pa_in_main 1 %endif @@ -72,7 +73,7 @@ BuildRequires: automake libtool BuildRequires: libX11-devel BuildRequires: libXv-devel BuildRequires: libXinerama-devel -%{!?no_xvmc:BuildRequires: libXvMC-devel} +%{?_enable_xvmc:BuildRequires: libXvMC-devel} BuildRequires: libGLU-devel %if 0%{?_enable_v4l:1} BuildRequires: libv4l-devel @@ -221,6 +222,7 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" --enable-directfb \ %endif # directfb %{?_enable_v4l}%{!?_enable_v4l:--disable-v4l --disable-libv4l} \ + %{?_enable_xvmc}%{!?_enable_xvmc:--disable-xvmc} \ %{?_disable_gnomevfs} \ --disable-a52dec \ --disable-mad \ @@ -390,8 +392,10 @@ rm -rf $RPM_BUILD_ROOT %endif # xcb %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xshm.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xv.so -%{!?no_xvmc:%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so} +%if 0%{?_enable_xvmc:1} +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so +%endif %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so %if 0%{?_with_pa:1} From a3304f7fc88b80bb8b70ab52f910e8c60d03a132 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 13:23:43 +0000 Subject: [PATCH 40/43] dist-git conversion --- .cvsignore => .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .cvsignore => .gitignore (100%) diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore From 53f040ddbce0875fa601cb6adc45720bdf1cacca Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 13:23:57 +0000 Subject: [PATCH 41/43] dist-git conversion --- .cvsignore => .gitignore | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .cvsignore => .gitignore (100%) diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore From da58f27df9a7e59cbe69636eba16211bced0f0b4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 26 Aug 2014 14:49:56 -0500 Subject: [PATCH 42/43] 1.1.21-10 - add conditionals to support el5/el6, fix/cleanup other conditionals - omit libmodplug support (for now, FTBFS) --- xine-lib.spec | 97 ++++++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 84 insertions(+), 13 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 8365d82..1930e7d 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -11,6 +11,14 @@ %define have_vidix 0 %endif # ix86 +%if 0%{?fedora} +%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 @@ -31,10 +39,25 @@ %define _without_directfb 1 %endif +%define _enable_xvmc --enable-xvmc +%if 0%{?rhel} > 5 +%ifarch ppc64 +%undefine _enable_xvmc +%endif +%endif + +%if 0%{?fedora} > 8 || 0%{?rhel} > 5 +%define _enable_v4l --enable-v4l --enable-libv4l +%define _without_arts --without-arts +%define _with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1} +%define _with_xcb 1 +%define _with_smbclient 1 +%endif + Summary: A multimedia engine Name: xine-lib Version: 1.1.21 -Release: 9%{?dist} +Release: 10%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -65,23 +88,27 @@ BuildRequires: autoconf automake libtool BuildRequires: libX11-devel BuildRequires: libXv-devel BuildRequires: libXinerama-devel -BuildRequires: libXvMC-devel +%{?_enable_xvmc:BuildRequires: libXvMC-devel} BuildRequires: libGLU-devel +%if 0%{?_enable_v4l:1} BuildRequires: libv4l-devel +%endif +%if 0%{?_with_xcb} BuildRequires: libxcb-devel +%endif # Video BuildRequires: SDL-devel BuildRequires: libtheora-devel BuildRequires: libmng-devel +%if %{with_aalib} BuildRequires: aalib-devel >= 1.4 +%endif # aalib BuildRequires: libcaca-devel >= 0.99-0.5.beta14 %if 0%{!?_without_directfb:1} BuildRequires: directfb-devel %endif # directfb BuildRequires: ImageMagick-devel >= 6.2.4.6-1 -%if 0%{?_with_freetype:1} BuildRequires: fontconfig-devel -%endif # freetype # Audio BuildRequires: alsa-lib-devel >= 0.9.0 %if 0%{!?_without_esound:1} @@ -89,7 +116,9 @@ 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 BuildRequires: speex-devel @@ -98,21 +127,29 @@ BuildRequires: wavpack-devel BuildRequires: libcdio-devel # Other BuildRequires: pkgconfig +%if 0%{?_with_pa} BuildRequires: pkgconfig(libpulse) +%endif BuildRequires: gtk2-devel -BuildRequires: libsmbclient-devel +%if 0%{?_with_smbclient} +BuildRequires: pkgconfig(smbclient) +%endif BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel %if 0%{?bluray} BuildRequires: libbluray-devel %endif +%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 %description This package contains the Xine library. It can be used to play back @@ -143,13 +180,28 @@ This package contains extra plugins for %{name}: - GDK-Pixbuf - SMB - SDL +%if %{with_aalib} - AA-lib +%endif # aalib - Libcaca - Image decoding %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 @@ -176,32 +228,29 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %if 0%{!?_without_directfb:1} --enable-directfb \ %endif # directfb - --enable-v4l \ - --enable-libv4l \ - --enable-xvmc \ + %{?_enable_modplug}%{!?_enable_modplug:--disable-modplug} \ + %{?_enable_v4l}%{!?_enable_v4l:--disable-v4l --disable-libv4l} \ + %{?_enable_xvmc}%{!?_enable_xvmc:--disable-xvmc} \ --disable-gnomevfs \ --disable-a52dec \ --disable-mad \ --disable-vcd \ --disable-asf \ --disable-faad \ -%if 0%{?_with_freetype:1} -%if 0%{?_with_antialiasing:1} --enable-antialiasing \ -%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 \ - --without-arts \ %if 0%{?_without_esound:1} --without-esound \ %endif + %{!?_without_arts:--with-arts} %{?_without_arts} \ --with-wavpack \ --with-real-codecs-path=%{codecdir} \ --with-w32-path=%{codecdir} @@ -280,7 +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 @@ -341,11 +392,13 @@ rm -rf $RPM_BUILD_ROOT %{_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 +%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 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_none.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_opengl.so @@ -354,14 +407,24 @@ rm -rf $RPM_BUILD_ROOT %if %{have_vidix} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so %endif # vidix +%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 %{_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} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so +%endif %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so +%if 0%{!?_without_arts:1} +%files arts +%defattr(-,root,root,-) +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_arts.so +%endif + %files extras %defattr(-,root,root,-) %if 0%{!?_without_esound:1} @@ -370,8 +433,12 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_jack.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_gdk_pixbuf.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so +%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 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_caca.so %if 0%{!?_without_directfb:1} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_directfb.so @@ -394,6 +461,10 @@ 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 From c06726ca307dcc7a4a6c74d8ab1a4cceb0f0025c Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 20 Dec 2014 18:01:27 +0100 Subject: [PATCH 43/43] 2014-12-20: Retired because of broken deps: unresolved dependencies for xine-lib-extras-1.1.21-10.el5.i386: libcaca.so.0 --- .gitignore | 5 - Makefile | 21 - branch | 1 - dead.package | 4 + sources | 1 - xine-lib-1.1.16.2-multilib.patch | 16 - xine-lib-1.1.17-avsync_hack.patch | 22 - xine-lib-1.1.19-no_autopoint.patch | 17 - xine-lib-1.1.21-samba4.patch | 32 -- xine-lib-1.1.4-optflags.patch | 11 - xine-lib-cleanup-sources.sh | 90 ---- xine-lib-mk-autotools-patch.sh | 33 -- xine-lib.spec | 809 ----------------------------- 13 files changed, 4 insertions(+), 1058 deletions(-) delete mode 100644 .gitignore delete mode 100644 Makefile delete mode 100644 branch create mode 100644 dead.package delete mode 100644 sources delete mode 100644 xine-lib-1.1.16.2-multilib.patch delete mode 100644 xine-lib-1.1.17-avsync_hack.patch delete mode 100644 xine-lib-1.1.19-no_autopoint.patch delete mode 100644 xine-lib-1.1.21-samba4.patch delete mode 100644 xine-lib-1.1.4-optflags.patch delete mode 100755 xine-lib-cleanup-sources.sh delete mode 100644 xine-lib-mk-autotools-patch.sh delete mode 100644 xine-lib.spec diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 6f9a840..0000000 --- a/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -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/Makefile b/Makefile deleted file mode 100644 index 3f11a94..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xine-lib -# $Id$ -NAME := xine-lib -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/branch b/branch deleted file mode 100644 index 42f697a..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -EL-5 diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..7774a55 --- /dev/null +++ b/dead.package @@ -0,0 +1,4 @@ +2014-12-20: Retired because of broken deps: +unresolved dependencies for xine-lib-extras-1.1.21-10.el5.i386: +libcaca.so.0 + diff --git a/sources b/sources deleted file mode 100644 index fd1b3c5..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -1568a378a732bd9b69d418674ad4165c xine-lib-1.1.21-pruned.tar.xz diff --git a/xine-lib-1.1.16.2-multilib.patch b/xine-lib-1.1.16.2-multilib.patch deleted file mode 100644 index 4609e63..0000000 --- a/xine-lib-1.1.16.2-multilib.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff -up xine-lib-1.1.16.2/misc/xine-config.in.multilib xine-lib-1.1.16.2/misc/xine-config.in ---- xine-lib-1.1.16.2/misc/xine-config.in.multilib 2008-06-25 08:04:09.000000000 -0500 -+++ xine-lib-1.1.16.2/misc/xine-config.in 2009-02-20 07:34:27.000000000 -0600 -@@ -6,12 +6,6 @@ unset prefix - unset exec_prefix - unset args - --PKG_CONFIG_PATH="`cat <<'EOF' --@XINE_PKGCONFIG_DIR@ --EOF --`${PKG_CONFIG_PATH:+:}$PKG_CONFIG_PATH" --export PKG_CONFIG_PATH -- - usage() - { - cat <vpts - hw_vpts; -+ if (in_buf && in_buf->stream && in_buf->stream->video_decoder_plugin) { -+ gap = in_buf->vpts - hw_vpts; -+ } else { -+ gap = 0; -+ } - lprintf ("hw_vpts : %" PRId64 " buffer_vpts : %" PRId64 " gap : %" PRId64 "\n", - hw_vpts, in_buf->vpts, gap); - diff --git a/xine-lib-1.1.19-no_autopoint.patch b/xine-lib-1.1.19-no_autopoint.patch deleted file mode 100644 index d5ee0cd..0000000 --- a/xine-lib-1.1.19-no_autopoint.patch +++ /dev/null @@ -1,17 +0,0 @@ -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 deleted file mode 100644 index 6c5f67d..0000000 --- a/xine-lib-1.1.21-samba4.patch +++ /dev/null @@ -1,32 +0,0 @@ -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 deleted file mode 100644 index 72540f6..0000000 --- a/xine-lib-1.1.4-optflags.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xine-lib-1.1.4/m4/optimizations.m4~ 2006-06-17 18:20:56.000000000 +0300 -+++ xine-lib-1.1.4/m4/optimizations.m4 2007-01-30 23:03:27.000000000 +0200 -@@ -107,7 +107,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 deleted file mode 100755 index a250800..0000000 --- a/xine-lib-cleanup-sources.sh +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/bash - -if [ -z "$1" -o $# -ne 1 ]; then - echo "Usage: $0 " - exit 2 -fi - -version=$1 -tarball="xine-lib-$version.tar.xz" -dir="xine-lib-$version" -modtarball="xine-lib-$version-pruned.tar.xz" - - -if [ ! -f $tarball ]; then - echo "Can't find $tarball !" - exit 1 -fi - -echo "Uncompressing $tarball..." -rm -rf $dir -tar -xJf $tarball -cd $dir - -rmpluglib() -{ - echo "removing src/$1/$2..." - rm -rf src/$1/$2 - sed -i -e "s/SUBDIRS = \(.*\)$2\(.*\)/SUBDIRS = \1\2/g" src/$1/Makefile.am - sed -i -e "/^src\/$1\/$2/d" configure.ac -} - -# Main libraries -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 - sed -i -e "/^src\/$remove/d" configure.ac -done -# Input plugin libraries -for remove in vcd; do - rmpluglib input vcd -done -for remove in ffmpeg; do - rmpluglib combined ffmpeg -done -# Input plugins -# 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 -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 - # Remove from Makefile - sed -i -e "/xineplug_inp_$p/d" src/input/Makefile.am -done -# Demuxers -# These are ok now ( http://bugzilla.redhat.com/213597 ) -#for p in mpeg mpeg_block mpeg_ts mpeg_elem mpeg_pes yuv4mpeg2; do -# echo "removing $p demuxer..." -# [ -f src/demuxers/demux_$p.c ] && rm -f src/demuxers/demux_$p.c -# sed -i -e "/xineplug_dmx_$p/d" src/demuxers/Makefile.am -#done -# Postprocessors -echo "removing planar and deinterlace postprocessors..." -sed -i -e 's/deinterlace //g' src/post/Makefile.am # see comments in speedy.c -sed -i -e 's/planar //g' src/post/Makefile.am # requires libpostproc -sed -i -e '/post\/\(deinterlace\|planar\)/d' configure.ac -rm -rf src/post/{deinterlace,planar} -# NSF decoder -echo "removing NSF decoder..." -rm -rf src/libxineadec/{nosefart,nsf.c} -sed -i -e '/^xineplug_decode_nsf_la/,/^\s*$/d' \ - -e /xineplug_decode_nsf/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 -rm -rf $dir diff --git a/xine-lib-mk-autotools-patch.sh b/xine-lib-mk-autotools-patch.sh deleted file mode 100644 index dc1e103..0000000 --- a/xine-lib-mk-autotools-patch.sh +++ /dev/null @@ -1,33 +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 -# 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 deleted file mode 100644 index 1930e7d..0000000 --- a/xine-lib.spec +++ /dev/null @@ -1,809 +0,0 @@ -# TODO, sometime, maybe: -# - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog -# - drop the opengl video out plugin? - -%define plugin_abi 1.30 -%define codecdir %{_libdir}/codecs - -%ifarch %{ix86} - %define have_vidix 1 -%else - %define have_vidix 0 -%endif # ix86 - -%if 0%{?fedora} -%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 -%undefine _enable_xvmc -%endif -%endif - -%if 0%{?fedora} > 8 || 0%{?rhel} > 5 -%define _enable_v4l --enable-v4l --enable-libv4l -%define _without_arts --without-arts -%define _with_pa %{?_without_pulseaudio:0}%{!?_without_pulseaudio:1} -%define _with_xcb 1 -%define _with_smbclient 1 -%endif - -Summary: A multimedia engine -Name: xine-lib -Version: 1.1.21 -Release: 10%{?dist} -License: GPLv2+ -Group: System Environment/Libraries -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.xz -Source0: xine-lib-%{version}-pruned.tar.xz -Source1: xine-lib-cleanup-sources.sh -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 -# http://bugzilla.redhat.com/470568 -Patch2: xine-lib-1.1.17-avsync_hack.patch -# http://bugzilla.redhat.com/477226 -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}} - -# 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 -BuildRequires: libXinerama-devel -%{?_enable_xvmc:BuildRequires: libXvMC-devel} -BuildRequires: libGLU-devel -%if 0%{?_enable_v4l:1} -BuildRequires: libv4l-devel -%endif -%if 0%{?_with_xcb} -BuildRequires: libxcb-devel -%endif -# Video -BuildRequires: SDL-devel -BuildRequires: libtheora-devel -BuildRequires: libmng-devel -%if %{with_aalib} -BuildRequires: aalib-devel >= 1.4 -%endif # aalib -BuildRequires: libcaca-devel >= 0.99-0.5.beta14 -%if 0%{!?_without_directfb:1} -BuildRequires: directfb-devel -%endif # directfb -BuildRequires: ImageMagick-devel >= 6.2.4.6-1 -BuildRequires: fontconfig-devel -# 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 -BuildRequires: speex-devel -BuildRequires: wavpack-devel -# CDs -BuildRequires: libcdio-devel -# Other -BuildRequires: pkgconfig -%if 0%{?_with_pa} -BuildRequires: pkgconfig(libpulse) -%endif -BuildRequires: gtk2-devel -%if 0%{?_with_smbclient} -BuildRequires: pkgconfig(smbclient) -%endif -BuildRequires: libdvdnav-devel -BuildRequires: libdvdread-devel -%if 0%{?bluray} -BuildRequires: libbluray-devel -%endif - -%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 - -%description -This package contains the Xine library. It can be used to play back -various media, decode multimedia files from local disk drives, and display -multimedia streamed over the Internet. It interprets many of the most -common multimedia formats available - and some uncommon formats, too. - -%package devel -Summary: Xine library development files -Group: Development/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -Requires: pkgconfig -Requires: zlib-devel -%description devel -This package contains development files for %{name}. - -%package extras -Summary: Additional plugins for %{name} -Group: System Environment/Libraries -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 - - SMB - - SDL -%if %{with_aalib} - - AA-lib -%endif # aalib - - Libcaca - - Image decoding -%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 .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 -%patch2 -p1 -b .avsync_hack -%patch3 -p1 -b .multilib -%patch4 -p1 -b .samba4 - -./autogen.sh noconfig - - -%build -export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" " -export FFMPEG_POSTPROC_CFLAGS=" " FFMPEG_POSTPROC_LIBS=" " -export FFMPEG_UTIL_CFLAGS=" " FFMPEG_UTIL_LIBS=" " -export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" -# Keep list of options in mostly the same order as ./configure --help. -%configure \ - --disable-dependency-tracking \ - --enable-ipv6 \ -%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-a52dec \ - --disable-mad \ - --disable-vcd \ - --disable-asf \ - --disable-faad \ - --enable-antialiasing \ - --with-freetype \ - --with-fontconfig \ - --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_esound:1} - --without-esound \ -%endif - %{!?_without_arts:--with-arts} %{?_without_arts} \ - --with-wavpack \ - --with-real-codecs-path=%{codecdir} \ - --with-w32-path=%{codecdir} - -make %{?_smp_mflags} - - -%install -rm -rf $RPM_BUILD_ROOT __docs -make install DESTDIR=$RPM_BUILD_ROOT -%find_lang libxine1 -cp -pR $RPM_BUILD_ROOT%{_docdir}/xine-lib __docs -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.{dxr3,network_dvd} - -# 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 - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - -%files -f libxine1.lang -%defattr(-,root,root,-) -%doc AUTHORS COPYING COPYING.LIB CREDITS ChangeLog* README TODO -%doc __docs/README.* __docs/faq.* -%dir %{codecdir}/ -%{_datadir}/xine/ -%{_libdir}/libxine.so.* -%{_mandir}/man5/xine.5* -%dir %{_libdir}/xine/ -%dir %{_libdir}/xine/plugins/ -%dir %{_libdir}/xine/plugins/%{plugin_abi}/ -%{_libdir}/xine/plugins/%{plugin_abi}/mime.types -# Listing every plugin separately for better control over binary packages -# containing exactly the plugins we want, nothing accidentally snuck in -# nor dropped. -%dir %{_libdir}/xine/plugins/%{plugin_abi}/post/ -%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_audio_filters.so -%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_goom.so -%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_mosaico.so -%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_switch.so -%{_libdir}/xine/plugins/%{plugin_abi}/post/xineplug_post_visualizations.so -%if %{have_vidix} -%dir %{_libdir}/xine/plugins/%{plugin_abi}/vidix/ -%{_libdir}/xine/plugins/%{plugin_abi}/vidix/cyberblade_vid.so -%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mach64_vid.so -%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mga_crtc2_vid.so -%{_libdir}/xine/plugins/%{plugin_abi}/vidix/mga_vid.so -%{_libdir}/xine/plugins/%{plugin_abi}/vidix/nvidia_vid.so -%{_libdir}/xine/plugins/%{plugin_abi}/vidix/pm2_vid.so -%{_libdir}/xine/plugins/%{plugin_abi}/vidix/pm3_vid.so -%{_libdir}/xine/plugins/%{plugin_abi}/vidix/radeon_vid.so -%{_libdir}/xine/plugins/%{plugin_abi}/vidix/rage128_vid.so -%{_libdir}/xine/plugins/%{plugin_abi}/vidix/savage_vid.so -%{_libdir}/xine/plugins/%{plugin_abi}/vidix/sis_vid.so -%{_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 -%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 -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_mpc.so -%ifarch %{ix86} -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_qt.so -%endif # ix86 -%{_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_speex.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_sputext.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_theora.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vorbis.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_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_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_ogg.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_sputext.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_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 -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pnm.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 -%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 -%{_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_raw.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_syncfb.so -%if %{have_vidix} -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_vidix.so -%endif # vidix -%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 -%{_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} -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xvmc.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xxmc.so -%endif -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_wavpack.so - -%if 0%{!?_without_arts:1} -%files arts -%defattr(-,root,root,-) -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_arts.so -%endif - -%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 -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so -%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 -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_caca.so -%if 0%{!?_without_directfb:1} -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_directfb.so -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_xdirectfb.so -%endif # directfb -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_sdl.so - -%files devel -%defattr(-,root,root,-) -%doc __docs/hackersguide/* -%{_bindir}/xine-config -%{_bindir}/xine-list* -%{_datadir}/aclocal/xine.m4 -%{_includedir}/xine.h -%{_includedir}/xine/ -%{_libdir}/libxine.so -%{_libdir}/pkgconfig/libxine.pc -%{_mandir}/man1/xine-config.1* -%{_mandir}/man1/xine-list*.1* - - -%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 - -* Sun Mar 07 2010 Rex Dieter - 1.1.18-2 -- rebuild (ImageMagick) - -* Wed Feb 24 2010 Rex Dieter - 1.1.18-1 -- xine-lib-1.1.18, plugin-abi 1.28 (#567913) - -* Sat Dec 12 2009 Rex Dieter - 1.1.17-3 -- bump flac_decoder priority (rh#301861,xine#225) - -* Mon Dec 07 2009 Bastien Nocera 1.1.17-2 -- Remove gnome-vfs2 plugin, it's mostly useless - -* Wed Dec 02 2009 Rex Dieter - 1.1.17-1 -- xine-lib-1.1.17, plugin-abi 1.27 - -* Sun Nov 29 2009 Rex Dieter - 1.1.16.3-5 -- move -pulseaudio into main pkg (f12+) -- update URL - -* Mon Jul 27 2009 Fedora Release Engineering - 1.1.16.3-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild - -* Thu Jul 02 2009 Rex Dieter - 1.1.16.3-3 -- rebuild (DirectFB) - -* Fri Apr 17 2009 Rex Dieter - 1.1.16.3-2.1 -- drop old_caca hacks/patches (F-9) - -* Fri Apr 10 2009 Rex Dieter - 1.1.16.3-2 -- fix modtracker mimetypes - -* Fri Apr 03 2009 Rex Dieter - 1.1.16.3-1 -- xine-lib-1.1.16.3, plugin-abi 1.26 - -* Thu Mar 26 2009 Rex Dieter - 1.1.16.2-6 -- add-mime-for-mod.patch - -* Tue Mar 10 2009 Kevin Kofler - 1.1.16.2-5 -- rebuild for new ImageMagick - -* Thu Feb 26 2009 Fedora Release Engineering - 1.1.16.2-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild - -* Fri Feb 20 2009 Rex Dieter - 1.1.16.2-3 -- xine-lib-devel muiltilib conflict (#477226) - -* Tue Feb 17 2009 Rex Dieter - 1.1.16.2-2 -- xine-lib-safe-audio-pause3 patch (#486255, kdebug#180339) - -* Tue Feb 10 2009 Kevin Kofler - 1.1.16.2-1.1 -- also patch the caca version check in configure(.ac) - -* Tue Feb 10 2009 Rex Dieter - 1.1.16.2-1 -- xine-lib-1.1.16.2 - -* Mon Feb 09 2009 Rex Dieter - 1.1.16.1-4 -- gapless-race-fix patch (kdebug#180339) - -* Sat Feb 07 2009 Rex Dieter - 1.1.16.1-3 -- safe-audio-pause patch (kdebug#180339) - -* Mon Jan 26 2009 Rex Dieter - 1.1.16.1-2 -- Provides: xine-lib(plugin-abi)%%{?_isa} = %%{plugin_abi} -- touchup Summary/Description - -* Fri Jan 23 2009 Rex Dieter - 1.1.16.1-1 -- xine-lib-1.1.16.1 -- include avsync patch (#470568) - -* Sun Jan 18 2009 Rex Dieter - 1.1.16-2 -- drop deepbind patch (#480504) -- caca support (EPEL) - -* Wed Jan 07 2009 Kevin Kofler - 1.1.16-1.1 -- patch for old libcaca in F9- - -* Wed Jan 07 2009 Rex Dieter - 1.1.16-1 -- xine-lib-1.1.16, plugin ABI 1.25 -- --with-external-libdvdnav, include mpeg demuxers (#213597) - -* Fri Dec 12 2008 Rex Dieter - 1.1.15-4 -- rebuild for pkgconfig deps - -* Tue Oct 28 2008 Kevin Kofler - 1.1.15-3 -- rebuild for new libcaca - -* Thu Oct 23 2008 Rex Dieter - 1.1.15-2 -- respin - -* Wed Aug 20 2008 Rex Dieter - 1.1.15-1 -- xine-lib-1.1.15, plugin ABI 1.24 (rh#455752, CVE-2008-3231) -- Obsoletes: -arts (f9+) - -* Sun Apr 27 2008 Kevin Kofler - 1.1.12-3 -- rebuild for new ImageMagick (6.4.0.10) - -* Thu Apr 24 2008 Rex Dieter - 1.1.12-2 -- CVE-2008-1878 - -* 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 -- Apply upstream fixes for Quicktime (#441705) and Matroska regressions - introduced in 1.1.11.1. - -* Mon Apr 07 2008 Rex Dieter - 1.1.11.1-2 -- pulse-rework2 patch (#439731) -- -pulseaudio subpkg (#439731) - -* 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 -- 1.1.11 (security update, #438182, CVE-2008-0073). -- Drop jack and wavpack build conditionals. -- Specfile cleanups. - -* 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 -- 1.1.10.1 (security update, #431541). - -* 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 -- 1.1.10 (security update). - -* 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 -- Disable upstream "discard buffers on ao close" 1.1.9 changeset (#429182). - -* 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 -- 1.1.9. - -* 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 -- Enable JACK support by default for all distros. - -* Wed Sep 19 2007 Ville Skyttä - 1.1.8-4 -- Fix "--without wavpack" build. - -* 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. - -* Sun Sep 09 2007 Aurelien Bompard 1.1.8-2 -- 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 -- 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 -- 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 -- 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 -- Make Real codec search path /usr/lib(64)/codecs again (#237743). - -* Wed Apr 18 2007 Ville Skyttä - 1.1.6-1 -- 1.1.6. - -* 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ä -- Exclude vidix dir on systems that don't have vidix. -- Specfile cleanups. - -* 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 -- Apply upstream fix for CVE-2007-1246. - -* Wed Feb 14 2007 Ville Skyttä - 1.1.4-2 -- Rebuild. - -* 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 -- 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 -- Don't run autotools during build. - -* Mon Dec 04 2006 Aurelien Bompard 1.1.3-1 -- version 1.1.3 -- patch2 applied upstream -- Disable CACA support by default, needs newer than what's in FE ATM. -- Split extras plugins in a separate package -- Enable JACK support (in extras subpackage) -- Enable DirectFB support (in extras subpackage) - -* Sat Nov 11 2006 Aurelien Bompard 1.1.2-18 -- Make shn files available to amarok. References: - http://xine.cvs.sourceforge.net/xine/xine-lib/src/demuxers/demux_shn.c?r1=1.1.2.2&r2=1.2 - https://launchpad.net/distros/ubuntu/+source/xine-lib/+bug/63130 - -* Wed Oct 18 2006 Aurelien Bompard 1.1.2-17 -- cleanup docs -- remove mms -- delete more source files in the cleanup script -- drop patch3 (affecting mms) - -* Tue Oct 17 2006 Aurelien Bompard 1.1.2-16 -- fix files list -- add BR gtk2-devel -- remove xineplug_decode_gdk_pixbuf.so from x86-only - -* Mon Oct 16 2006 Aurelien Bompard 1.1.2-15 -- removed libdts -- drop dxr patch (it's removed from tarball) -- list xineplug_decode_gdk_pixbuf.so and xineplug_vo_out_vidix.so only on x86 - -* Sun Oct 15 2006 Aurelien Bompard 1.1.2-14 -- update SOURCE1 to remove liba52 from tarball (patented) - -* Tue Sep 12 2006 Aurelien Bompard 1.1.2-13 -- drop patches 2 and 4 - -* Fri Sep 08 2006 Aurelien Bompard 1.1.2-12 -- initial Fedora Extras package