From dce6e3f7da7808c0015848d31eaa63b6595537f6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 7 Jan 2009 20:32:58 +0000 Subject: [PATCH] * 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 | 35 ++++++++++++++++++++++++++--------- 5 files changed, 36 insertions(+), 30 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..3aad4b6 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} @@ -32,7 +31,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 +49,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 @@ -111,6 +108,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. @@ -191,15 +189,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,6 +220,7 @@ 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 \ @@ -330,6 +328,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 +342,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 @@ -418,6 +422,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+)