From 25c3a60902e8f309b1d4004529ef035de1b9ca89 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:40:59 +0000 Subject: [PATCH 01/61] 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 13a297343ea85c6b0605e88dd78517b655fc5b4d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 30 Nov 2009 02:08:09 +0000 Subject: [PATCH 02/61] * 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 5c46b58bf28d8f5b2f4440d128e920312e23b58c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 2 Dec 2009 18:27:27 +0000 Subject: [PATCH 03/61] * Wed Dec 02 2009 Rex Dieter - 1.1.17-1 - xine-lib-1.1.17, plugin-abi 1.27 --- .cvsignore | 4 +- sources | 4 +- xine-lib-1.1.15-avsync_hack.patch | 22 -------- xine-lib-1.1.16.3-mod_mimetypes_typo.patch | 20 ------- xine-lib-mk-autotools-patch.sh | 1 + xine-lib.spec | 61 +++++++++++----------- 6 files changed, 35 insertions(+), 77 deletions(-) delete mode 100644 xine-lib-1.1.15-avsync_hack.patch delete mode 100644 xine-lib-1.1.16.3-mod_mimetypes_typo.patch diff --git a/.cvsignore b/.cvsignore index dbdfc40..8f16768 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.17-pruned.tar.bz2 +xine-lib-1.1.17-autotools.patch.bz2 diff --git a/sources b/sources index 3cc02d3..b24e568 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 +4c2655e0c12520b1e6e78a72d59a62ce xine-lib-1.1.17-pruned.tar.bz2 +f4282ee36447d94765d89d06787012be xine-lib-1.1.17-autotools.patch.bz2 diff --git a/xine-lib-1.1.15-avsync_hack.patch b/xine-lib-1.1.15-avsync_hack.patch deleted file mode 100644 index f33aba4..0000000 --- a/xine-lib-1.1.15-avsync_hack.patch +++ /dev/null @@ -1,22 +0,0 @@ -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-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-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..5553318 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.27 %define codecdir %{_libdir}/codecs %ifarch %{ix86} @@ -33,35 +32,36 @@ Summary: A multimedia engine Name: xine-lib -Version: 1.1.16.3 -Release: 5%{?dist} +Version: 1.1.17 +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-1.1.17-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 @@ -133,39 +133,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 +189,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 @@ -314,7 +309,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 +319,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 @@ -435,6 +431,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 d4183433d2a3be052c4ca72530b9cfc4037c485f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 3 Dec 2009 15:38:44 +0000 Subject: [PATCH 04/61] awol/rebased patches --- xine-lib-1.1.17-avsync_hack.patch | 22 ++++++++++++++++++++++ xine-lib-1.1.17-no_autopoint.patch | 17 +++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 xine-lib-1.1.17-avsync_hack.patch create mode 100644 xine-lib-1.1.17-no_autopoint.patch diff --git a/xine-lib-1.1.17-avsync_hack.patch b/xine-lib-1.1.17-avsync_hack.patch new file mode 100644 index 0000000..5fa1ae1 --- /dev/null +++ b/xine-lib-1.1.17-avsync_hack.patch @@ -0,0 +1,22 @@ +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: ++ * ++ * 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-1.1.17-no_autopoint.patch b/xine-lib-1.1.17-no_autopoint.patch new file mode 100644 index 0000000..d5ee0cd --- /dev/null +++ b/xine-lib-1.1.17-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" + From 96fbf1ada3d23397713cce63db4587a511f11006 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Mon, 7 Dec 2009 13:55:57 +0000 Subject: [PATCH 05/61] * Mon Dec 07 2009 Bastien Nocera 1.1.17-2 - Remove gnome-vfs2 plugin, it's mostly useless --- xine-lib.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 5553318..d0c27db 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -33,7 +33,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.17 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -110,7 +110,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 @@ -404,7 +403,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 @@ -431,6 +429,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 89bd664627d9e93a165b42dc22ebd6fe0bdd775e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 14 Dec 2009 16:06:33 +0000 Subject: [PATCH 06/61] * Sat Dec 12 2009 Rex Dieter - 1.1.17-3 - bump flac_decoder priority (rh#301861,xine#225) --- xine-lib-1.1.17-flac_priority.patch | 12 ++++++++++++ xine-lib.spec | 7 +++++++ 2 files changed, 19 insertions(+) create mode 100644 xine-lib-1.1.17-flac_priority.patch diff --git a/xine-lib-1.1.17-flac_priority.patch b/xine-lib-1.1.17-flac_priority.patch new file mode 100644 index 0000000..68aae11 --- /dev/null +++ b/xine-lib-1.1.17-flac_priority.patch @@ -0,0 +1,12 @@ +diff -up xine-lib-1.1.17/src/combined/decoder_flac.c.flac_priority xine-lib-1.1.17/src/combined/decoder_flac.c +--- xine-lib-1.1.17/src/combined/decoder_flac.c.flac_priority 2009-11-30 14:55:46.000000000 -0600 ++++ xine-lib-1.1.17/src/combined/decoder_flac.c 2009-12-12 21:34:19.095500951 -0600 +@@ -426,7 +426,7 @@ static uint32_t audio_types[] = { + + static const decoder_info_t dec_info_audio = { + audio_types, /* supported types */ +- 5 /* priority */ ++ 8 /* priority */ + }; + + const plugin_info_t xine_plugin_info[] EXPORTED = { diff --git a/xine-lib.spec b/xine-lib.spec index d0c27db..a5fa05c 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -56,6 +56,9 @@ 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 +# https://bugzilla.redhat.com/show_bug.cgi?id=301861 +# http://bugs.xine-project.org/show_bug.cgi?id=225 +Patch50: xine-lib-1.1.17-flac_priority.patch ## upstream patches Provides: xine-lib(plugin-abi) = %{plugin_abi} @@ -190,6 +193,7 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4 #patch6 -p1 -b .deepbind %patch8 -p1 -b .avsync_hack %patch9 -p1 -b .multilib +%patch50 -p1 -b .flac_priority # autotools patch + touch'ing above seems to miss something, aclocal # runs on make anyway, let's use the ./autogen.sh hammer for now. @@ -429,6 +433,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 549b84b42382bb3ec56db5a8d8eccebb6b4f7dd0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 14 Dec 2009 16:09:13 +0000 Subject: [PATCH 07/61] Release++ --- xine-lib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index a5fa05c..5ed9d31 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -33,7 +33,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.17 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ From 3cc315a82c6c6cf83ae38cc8dcf352bd5cbb5a8e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 24 Feb 2010 15:07:47 +0000 Subject: [PATCH 08/61] * Wed Feb 24 2010 Rex Dieter - 1.1.18-1 - xine-lib-1.1.18, plugin-abi 1.28 (#567913) --- .cvsignore | 4 +-- sources | 4 +-- xine-lib-1.1.17-flac_priority.patch | 12 ------- ...atch => xine-lib-1.1.18-no_autopoint.patch | 0 xine-lib.spec | 35 +++++++++++-------- 5 files changed, 25 insertions(+), 30 deletions(-) delete mode 100644 xine-lib-1.1.17-flac_priority.patch rename xine-lib-1.1.17-no_autopoint.patch => xine-lib-1.1.18-no_autopoint.patch (100%) diff --git a/.cvsignore b/.cvsignore index 8f16768..07a7912 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.17-pruned.tar.bz2 -xine-lib-1.1.17-autotools.patch.bz2 +xine-lib-1.1.18-pruned.tar.bz2 +xine-lib-1.1.18-autotools.patch.bz2 diff --git a/sources b/sources index b24e568..53206ac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -4c2655e0c12520b1e6e78a72d59a62ce xine-lib-1.1.17-pruned.tar.bz2 -f4282ee36447d94765d89d06787012be xine-lib-1.1.17-autotools.patch.bz2 +8e93ff9da4839042680c8118f1c4cd3f xine-lib-1.1.18-pruned.tar.bz2 +2b8c6d3188a180fa763a44bb2ca9fe4c xine-lib-1.1.18-autotools.patch.bz2 diff --git a/xine-lib-1.1.17-flac_priority.patch b/xine-lib-1.1.17-flac_priority.patch deleted file mode 100644 index 68aae11..0000000 --- a/xine-lib-1.1.17-flac_priority.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up xine-lib-1.1.17/src/combined/decoder_flac.c.flac_priority xine-lib-1.1.17/src/combined/decoder_flac.c ---- xine-lib-1.1.17/src/combined/decoder_flac.c.flac_priority 2009-11-30 14:55:46.000000000 -0600 -+++ xine-lib-1.1.17/src/combined/decoder_flac.c 2009-12-12 21:34:19.095500951 -0600 -@@ -426,7 +426,7 @@ static uint32_t audio_types[] = { - - static const decoder_info_t dec_info_audio = { - audio_types, /* supported types */ -- 5 /* priority */ -+ 8 /* priority */ - }; - - const plugin_info_t xine_plugin_info[] EXPORTED = { diff --git a/xine-lib-1.1.17-no_autopoint.patch b/xine-lib-1.1.18-no_autopoint.patch similarity index 100% rename from xine-lib-1.1.17-no_autopoint.patch rename to xine-lib-1.1.18-no_autopoint.patch diff --git a/xine-lib.spec b/xine-lib.spec index 5ed9d31..895b2d3 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -3,7 +3,7 @@ # - drop the opengl video out plugin? # - deprecate ESD support? -%define plugin_abi 1.27 +%define plugin_abi 1.28 %define codecdir %{_libdir}/codecs %ifarch %{ix86} @@ -13,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 @@ -32,8 +34,8 @@ Summary: A multimedia engine Name: xine-lib -Version: 1.1.17 -Release: 3%{?dist} +Version: 1.1.18 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -49,16 +51,13 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: xine-lib-1.1.4-optflags.patch # used to help -Patch2: xine-lib-1.1.17-no_autopoint.patch +Patch2: xine-lib-1.1.18-no_autopoint.patch Patch6: xine-lib-1.1.1-deepbind-939.patch # http://bugzilla.redhat.com/470568 Patch8: xine-lib-1.1.17-avsync_hack.patch # http://bugzilla.redhat.com/477226 Patch9: xine-lib-1.1.16.2-multilib.patch ## upstreamable patches -# https://bugzilla.redhat.com/show_bug.cgi?id=301861 -# http://bugs.xine-project.org/show_bug.cgi?id=225 -Patch50: xine-lib-1.1.17-flac_priority.patch ## upstream patches Provides: xine-lib(plugin-abi) = %{plugin_abi} @@ -71,6 +70,9 @@ 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 @@ -193,7 +195,6 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4 #patch6 -p1 -b .deepbind %patch8 -p1 -b .avsync_hack %patch9 -p1 -b .multilib -%patch50 -p1 -b .flac_priority # autotools patch + touch'ing above seems to miss something, aclocal # runs on make anyway, let's use the ./autogen.sh hammer for now. @@ -215,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 \ @@ -366,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 @@ -433,6 +437,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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) From 277a2b42301e06fb936a8b26c9bf1793f399378f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 7 Mar 2010 15:05:51 +0000 Subject: [PATCH 09/61] * Sun Mar 07 2010 Rex Dieter - 1.1.18-2 - rebuild (ImageMagick) --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 895b2d3..c9df1d9 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -35,7 +35,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.18 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -437,6 +437,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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) From 68efe077519ac783c5be3b2a74382d336008b4a6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 7 Mar 2010 23:49:54 +0000 Subject: [PATCH 10/61] * Sun Mar 07 2010 Rex Dieter - 1.1.18.1-1 - xine-lib-1.1.18.1 --- .cvsignore | 4 ++-- sources | 4 ++-- ...autopoint.patch => xine-lib-1.1.18.1-no_autopoint.patch | 0 xine-lib.spec | 7 +++++-- 4 files changed, 9 insertions(+), 6 deletions(-) rename xine-lib-1.1.18-no_autopoint.patch => xine-lib-1.1.18.1-no_autopoint.patch (100%) diff --git a/.cvsignore b/.cvsignore index 07a7912..9d21c9b 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.18-pruned.tar.bz2 -xine-lib-1.1.18-autotools.patch.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 53206ac..cf9ff04 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -8e93ff9da4839042680c8118f1c4cd3f xine-lib-1.1.18-pruned.tar.bz2 -2b8c6d3188a180fa763a44bb2ca9fe4c xine-lib-1.1.18-autotools.patch.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.18-no_autopoint.patch b/xine-lib-1.1.18.1-no_autopoint.patch similarity index 100% rename from xine-lib-1.1.18-no_autopoint.patch rename to xine-lib-1.1.18.1-no_autopoint.patch diff --git a/xine-lib.spec b/xine-lib.spec index c9df1d9..c0b33dd 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -34,8 +34,8 @@ Summary: A multimedia engine Name: xine-lib -Version: 1.1.18 -Release: 2%{?dist} +Version: 1.1.18.1 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -437,6 +437,9 @@ 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) From dee332a2dadaad166460acbf471356c17efbeb3e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 8 Mar 2010 14:53:03 +0000 Subject: [PATCH 11/61] fix patch reference --- xine-lib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index c0b33dd..17f16b7 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -51,7 +51,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: xine-lib-1.1.4-optflags.patch # used to help -Patch2: xine-lib-1.1.18-no_autopoint.patch +Patch2: xine-lib-%{version}-no_autopoint.patch Patch6: xine-lib-1.1.1-deepbind-939.patch # http://bugzilla.redhat.com/470568 Patch8: xine-lib-1.1.17-avsync_hack.patch From 3adfd1633f2de5fcf86d415dc2ba2e6f81bb9bf6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 14 Apr 2010 18:13:31 +0000 Subject: [PATCH 12/61] -extras: don't mention gnome-vfs if it's not included --- xine-lib.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xine-lib.spec b/xine-lib.spec index 17f16b7..2df59cf 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -168,7 +168,9 @@ This package contains extra plugins for %{name}: - EsounD - JACK - GDK-Pixbuf +%if ! 0%{?_disable_gnomevfs:1} - GNOME VFS +%endif - SMB - SDL %if %{with_aalib} From a56e4a2f3c0b7b933bbd49cfc2fdc30bf150d68d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ville=20Skytt=C3=A4?= Date: Mon, 31 May 2010 21:55:59 +0000 Subject: [PATCH 13/61] =?UTF-8?q?*=20Tue=20Jun=20=201=202010=20Ville=20Sky?= =?UTF-8?q?tt=C3=A4=20=20-=201.1.18.1-2=20-=20Rebuild?= =?UTF-8?q?.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xine-lib.spec | 61 +++++++++++++++++++++++++++------------------------ 1 file changed, 32 insertions(+), 29 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 2df59cf..c7b6ef8 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -35,7 +35,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.18.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -439,6 +439,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 @@ -541,10 +544,10 @@ rm -rf $RPM_BUILD_ROOT * Thu Apr 24 2008 Rex Dieter - 1.1.12-2 - CVE-2008-1878 -* Wed Apr 16 2008 Ville Skyttä - 1.1.12-1 +* Wed Apr 16 2008 Ville Skyttä - 1.1.12-1 - 1.1.12 (plugin ABI 1.21); qt, mkv, and pulseaudio patches applied upstream. -* Wed Apr 9 2008 Ville Skyttä - 1.1.11.1-3 +* Wed Apr 9 2008 Ville Skyttä - 1.1.11.1-3 - Apply upstream fixes for Quicktime (#441705) and Matroska regressions introduced in 1.1.11.1. @@ -552,12 +555,12 @@ rm -rf $RPM_BUILD_ROOT - pulse-rework2 patch (#439731) - -pulseaudio subpkg (#439731) -* Sun Mar 30 2008 Ville Skyttä - 1.1.11.1-1 +* Sun Mar 30 2008 Ville Skyttä - 1.1.11.1-1 - 1.1.11.1 (security update, #438663, CVE-2008-1482). - Provide versioned xine-lib(plugin-abi) so 3rd party packages installing plugins can use it instead of requiring a version of xine-lib. -* Wed Mar 19 2008 Ville Skyttä - 1.1.11-1 +* Wed Mar 19 2008 Ville Skyttä - 1.1.11-1 - 1.1.11 (security update, #438182, CVE-2008-0073). - Drop jack and wavpack build conditionals. - Specfile cleanups. @@ -565,37 +568,37 @@ rm -rf $RPM_BUILD_ROOT * Fri Mar 7 2008 Rex Dieter - 1.1.10.1-1.1 - xcb support for f7+ (#373411) -* Fri Feb 8 2008 Ville Skyttä - 1.1.10.1-1 +* Fri Feb 8 2008 Ville Skyttä - 1.1.10.1-1 - 1.1.10.1 (security update, #431541). -* Sun Jan 27 2008 Ville Skyttä - 1.1.10-2 +* Sun Jan 27 2008 Ville Skyttä - 1.1.10-2 - Include spu, spucc, and spucmml decoders (#213597). -* Sun Jan 27 2008 Ville Skyttä - 1.1.10-1 +* Sun Jan 27 2008 Ville Skyttä - 1.1.10-1 - 1.1.10 (security update). -* Mon Jan 21 2008 Ville Skyttä - 1.1.9.1-3 +* Mon Jan 21 2008 Ville Skyttä - 1.1.9.1-3 - Fix version number in libxine.pc (#429487). -* Sun Jan 20 2008 Ville Skyttä - 1.1.9.1-2 +* Sun Jan 20 2008 Ville Skyttä - 1.1.9.1-2 - Disable upstream "discard buffers on ao close" 1.1.9 changeset (#429182). -* Sat Jan 12 2008 Ville Skyttä - 1.1.9.1-1 +* Sat Jan 12 2008 Ville Skyttä - 1.1.9.1-1 - 1.1.9.1 (security update). -* Sun Jan 6 2008 Ville Skyttä - 1.1.9-1 +* Sun Jan 6 2008 Ville Skyttä - 1.1.9-1 - 1.1.9. -* Thu Sep 27 2007 Ville Skyttä - 1.1.8-6 +* Thu Sep 27 2007 Ville Skyttä - 1.1.8-6 - Enable wavpack support by default for all distros. -* Sun Sep 23 2007 Ville Skyttä - 1.1.8-5 +* Sun Sep 23 2007 Ville Skyttä - 1.1.8-5 - Enable JACK support by default for all distros. -* Wed Sep 19 2007 Ville Skyttä - 1.1.8-4 +* Wed Sep 19 2007 Ville Skyttä - 1.1.8-4 - Fix "--without wavpack" build. -* Sat Sep 15 2007 Ville Skyttä - 1.1.8-3 +* Sat Sep 15 2007 Ville Skyttä - 1.1.8-3 - Move XCB plugins to the main package. - Make aalib, caca, pulseaudio, jack, and wavpack support optional at build time in preparation for the first EPEL build. @@ -604,63 +607,63 @@ rm -rf $RPM_BUILD_ROOT - remove the dependency from -extras to -arts, and use Obsoletes to provide an upgrade path -* Thu Aug 30 2007 Ville Skyttä - 1.1.8-1 +* Thu Aug 30 2007 Ville Skyttä - 1.1.8-1 - 1.1.8, "open" patch applied upstream. - Build XCB plugins by default for Fedora 8+ only. * Sat Aug 25 2007 Aurelien Bompard 1.1.7-3 - Split the aRts plugin into its own subpackage -* Tue Aug 14 2007 Ville Skyttä - 1.1.7-2 +* Tue Aug 14 2007 Ville Skyttä - 1.1.7-2 - Include XCB output plugins (in -extras at least for now). - Protect "open" with glibc 2.6.90 and -D_FORTIFY_SOURCE=2. - Clean up %%configure options. - License: GPLv2+ -* Thu Jun 7 2007 Ville Skyttä - 1.1.7-1 +* Thu Jun 7 2007 Ville Skyttä - 1.1.7-1 - 1.1.7. * Wed Jun 06 2007 Rex Dieter - 1.1.6-3 - respin (for libmpcdec) -* Wed Apr 25 2007 Ville Skyttä - 1.1.6-2 +* Wed Apr 25 2007 Ville Skyttä - 1.1.6-2 - Make Real codec search path /usr/lib(64)/codecs again (#237743). -* Wed Apr 18 2007 Ville Skyttä - 1.1.6-1 +* Wed Apr 18 2007 Ville Skyttä - 1.1.6-1 - 1.1.6. -* Wed Apr 11 2007 Ville Skyttä - 1.1.5-1 +* Wed Apr 11 2007 Ville Skyttä - 1.1.5-1 - 1.1.5. - Include GSM 06.10 decoder (#228186). - Re-enable CACA support. -* Sun Apr 8 2007 Ville Skyttä +* Sun Apr 8 2007 Ville Skyttä - Exclude vidix dir on systems that don't have vidix. - Specfile cleanups. -* Mon Mar 26 2007 Ville Skyttä - 1.1.4-4 +* Mon Mar 26 2007 Ville Skyttä - 1.1.4-4 - Add PulseAudio support (in -extras, #234035/Jost Diederichs). - Adjust Samba build dependencies to work for both <= and > FC6. - Add --with freetype and --with antialiasing build time options, default disabled, and an upstream patch for FreeType memory leak (#233194). -* Sat Mar 10 2007 Ville Skyttä - 1.1.4-3 +* Sat Mar 10 2007 Ville Skyttä - 1.1.4-3 - Apply upstream fix for CVE-2007-1246. -* Wed Feb 14 2007 Ville Skyttä - 1.1.4-2 +* Wed Feb 14 2007 Ville Skyttä - 1.1.4-2 - Rebuild. -* Wed Jan 31 2007 Ville Skyttä - 1.1.4-1 +* Wed Jan 31 2007 Ville Skyttä - 1.1.4-1 - 1.1.4, with wavpack and system libmpcdec support. * Thu Jan 18 2007 Aurelien Bompard 1.1.3-4 - rebuild -* Wed Jan 3 2007 Ville Skyttä - 1.1.3-3 +* Wed Jan 3 2007 Ville Skyttä - 1.1.3-3 - Fix libflac decoder with FLAC < 1.1.3 (#220961). - Apply upstream patch for FLAC >= 1.1.3. -* Sun Dec 17 2006 Ville Skyttä - 1.1.3-2 +* Sun Dec 17 2006 Ville Skyttä - 1.1.3-2 - Don't run autotools during build. * Mon Dec 04 2006 Aurelien Bompard 1.1.3-1 From 6f122026f013a43b44f5723d1a187edb0bb63406 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 21 Jun 2010 17:20:33 +0000 Subject: [PATCH 14/61] fix xcb bits for el-6 --- xine-lib.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index c7b6ef8..7bb8a4d 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -17,15 +17,14 @@ %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%{?fedora} > 8 || 0%{?rhel} > 5 -%define _without_arts --without-arts +%if 0%{?fedora} || 0%{?rhel} > 5 +%define _without_arts --without-art +%define _with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} %endif %if 0%{?fedora} > 11 @@ -73,7 +72,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 @@ -380,7 +379,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 From ba91530bdd8353ecbe0cecb2c28ce7f9e0e57b76 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 21 Jun 2010 19:22:43 +0000 Subject: [PATCH 15/61] sync changes from EL-6 branch --- xine-lib.spec | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 7bb8a4d..4aa99ac 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -13,21 +13,27 @@ %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} %else %define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} -%define with_pa %{?_with_pulseaudio:1}%{!?_with_pulseaudio:0} %endif # Fedora -%if 0%{?fedora} || 0%{?rhel} > 5 -%define _without_arts --without-art -%define _with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} +%define _enable_xvmc --enable-xvmc +%if 0%{?rhel} > 5 +%ifarch ppc64 +%undefine _enable_xvmc +%endif %endif -%if 0%{?fedora} > 11 +%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 || 0%{?rhel} > 5 %define pa_in_main 1 %endif @@ -67,7 +73,7 @@ BuildRequires: 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 @@ -100,7 +106,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 @@ -167,9 +173,7 @@ This package contains extra plugins for %{name}: - EsounD - JACK - GDK-Pixbuf -%if ! 0%{?_disable_gnomevfs:1} - GNOME VFS -%endif - SMB - SDL %if %{with_aalib} @@ -218,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 \ @@ -365,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 @@ -385,11 +392,13 @@ 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 +%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 %{with_pa} +%if 0%{?_with_pa:1} %if ! 0%{?pa_in_main} %files pulseaudio %defattr(-,root,root,-) @@ -397,7 +406,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 3a547b7aa9047b4cd6d3d5fe85cb8e432fc718a6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 21 Jun 2010 19:24:44 +0000 Subject: [PATCH 16/61] put back gnome-vfs exclusion in %%description --- xine-lib.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 4aa99ac..0e48428 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -173,7 +173,9 @@ This package contains extra plugins for %{name}: - EsounD - JACK - GDK-Pixbuf - - GNOME VFS +%if ! 0%{?_disable_gnomevfs:1} + - GNOME VFS +%endif - SMB - SDL %if %{with_aalib} From 583b25cbebc55b62838424ecb71d912ed09c822e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 19 Jul 2010 17:17:00 +0000 Subject: [PATCH 17/61] * Mon Jul 19 2010 Rex Dieter - 1.1.18.1-3 - no directfb on arm (yet) --- xine-lib.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 0e48428..3602256 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -26,6 +26,10 @@ %endif %endif +%ifarch %{arm} +%define _without_directfb 1 +%endif + %if 0%{?fedora} > 8 || 0%{?rhel} > 5 %define _enable_v4l --enable-v4l --enable-libv4l %define _without_arts --without-arts @@ -40,7 +44,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.18.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -448,6 +452,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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. From 016fec2ced2ffcd87c9965c053a030b15a044447 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 26 Jul 2010 14:01:58 +0000 Subject: [PATCH 18/61] * Sun Jul 25 2010 Rex Dieter - 1.1.19-1 - 1.1.19 --- .cvsignore | 4 ++-- sources | 4 ++-- ...point.patch => xine-lib-1.1.19-no_autopoint.patch | 0 xine-lib-mk-autotools-patch.sh | 2 +- xine-lib.spec | 12 ++++++++---- 5 files changed, 13 insertions(+), 9 deletions(-) rename xine-lib-1.1.18.1-no_autopoint.patch => xine-lib-1.1.19-no_autopoint.patch (100%) diff --git a/.cvsignore b/.cvsignore index 9d21c9b..de99961 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1,2 +1,2 @@ -xine-lib-1.1.18.1-autotools.patch.bz2 -xine-lib-1.1.18.1-pruned.tar.bz2 +xine-lib-1.1.19-autotools.patch.bz2 +xine-lib-1.1.19-pruned.tar.bz2 diff --git a/sources b/sources index cf9ff04..ac4cd83 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e2c45d451fd9d8ad3be680237ff5bcdf xine-lib-1.1.18.1-autotools.patch.bz2 -55de212f416d9d366cad7520ccd7a539 xine-lib-1.1.18.1-pruned.tar.bz2 +e80686751441fb75ce075b097f1af75d xine-lib-1.1.19-autotools.patch.bz2 +552e3e38f1afb77428f6aaa08e13b0d2 xine-lib-1.1.19-pruned.tar.bz2 diff --git a/xine-lib-1.1.18.1-no_autopoint.patch b/xine-lib-1.1.19-no_autopoint.patch similarity index 100% rename from xine-lib-1.1.18.1-no_autopoint.patch rename to xine-lib-1.1.19-no_autopoint.patch diff --git a/xine-lib-mk-autotools-patch.sh b/xine-lib-mk-autotools-patch.sh index 3cb6d1a..1c524c5 100644 --- a/xine-lib-mk-autotools-patch.sh +++ b/xine-lib-mk-autotools-patch.sh @@ -23,7 +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 +#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 3602256..b147ceb 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -3,7 +3,7 @@ # - drop the opengl video out plugin? # - deprecate ESD support? -%define plugin_abi 1.28 +%define plugin_abi 1.29 %define codecdir %{_libdir}/codecs %ifarch %{ix86} @@ -43,8 +43,8 @@ Summary: A multimedia engine Name: xine-lib -Version: 1.1.18.1 -Release: 3%{?dist} +Version: 1.1.19 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -131,6 +131,7 @@ BuildRequires: libsmbclient-devel BuildRequires: samba-common %endif BuildRequires: libdvdnav-devel +BuildRequires: libdvdread-devel %if 0%{?pa_in_main} Obsoletes: xine-lib-pulseaudio < 1.1.16.3-5 @@ -341,7 +342,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_sputext.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_theora.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_vorbis.so -%ifarch %ix86 +%ifarch %{ix86} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_w32dll.so %endif # ix86 %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_yuv.so @@ -452,6 +453,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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) From 143cd6dae967d9c934bcc98b00a3bd72d7131ffe Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 26 Jul 2010 15:38:19 +0000 Subject: [PATCH 19/61] BR: gettext --- xine-lib.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xine-lib.spec b/xine-lib.spec index b147ceb..4f815f4 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -73,6 +73,7 @@ Provides: xine-lib(plugin-abi) = %{plugin_abi} %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} BuildRequires: automake libtool +BuildRequires: gettext # X11 BuildRequires: libX11-devel BuildRequires: libXv-devel From c4c909b1a9e6cc0e2189d01be266b1cda8ce0e3d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 26 Jul 2010 15:59:54 +0000 Subject: [PATCH 20/61] gettext-devel ? --- xine-lib.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 4f815f4..7f79a4e 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -73,7 +73,8 @@ Provides: xine-lib(plugin-abi) = %{plugin_abi} %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} BuildRequires: automake libtool -BuildRequires: gettext +# for /usr/bin/autopoint +BuildRequires: gettext-devel # X11 BuildRequires: libX11-devel BuildRequires: libXv-devel From 84ca12a84b921c2a00ae8990bb306ebd526347aa Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 26 Jul 2010 16:07:10 +0000 Subject: [PATCH 21/61] re-enable no_autopoint patch, the pain is just not worth it --- sources | 2 +- xine-lib-mk-autotools-patch.sh | 2 +- xine-lib.spec | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/sources b/sources index ac4cd83..7be858d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -e80686751441fb75ce075b097f1af75d xine-lib-1.1.19-autotools.patch.bz2 +1a77122fa938a3f8cb85cef231236c39 xine-lib-1.1.19-autotools.patch.bz2 552e3e38f1afb77428f6aaa08e13b0d2 xine-lib-1.1.19-pruned.tar.bz2 diff --git a/xine-lib-mk-autotools-patch.sh b/xine-lib-mk-autotools-patch.sh index 1c524c5..3cb6d1a 100644 --- a/xine-lib-mk-autotools-patch.sh +++ b/xine-lib-mk-autotools-patch.sh @@ -23,7 +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 +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 7f79a4e..b147ceb 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -73,8 +73,6 @@ Provides: xine-lib(plugin-abi) = %{plugin_abi} %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} BuildRequires: automake libtool -# for /usr/bin/autopoint -BuildRequires: gettext-devel # X11 BuildRequires: libX11-devel BuildRequires: libXv-devel From d21dbfca70f6535cb49e3aeac4ba0a3dc437a2c6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 13:22:27 +0000 Subject: [PATCH 22/61] 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 14b33c734c2db5f59e25a31b6305e705953a8197 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 15 Sep 2010 07:33:07 -0500 Subject: [PATCH 23/61] - rebuild (ImageMagick) --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index b147ceb..20b8dbf 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -44,7 +44,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.19 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -453,6 +453,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 91d1fcc33f0c057b52568eb0c7060584336946f5 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 28 Nov 2010 15:48:53 +0100 Subject: [PATCH 24/61] * Sun Nov 28 2010 Kevin Kofler - 1.1.19-3 - rebuild for new directfb (1.4.11) --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 20b8dbf..09ee7d2 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -44,7 +44,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.19 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -453,6 +453,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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) From af04f9092826764b0a5cf430e986d86e11f0cc7c Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 24 Jan 2011 08:55:18 -0600 Subject: [PATCH 25/61] - xvmclib header changes, fixes ftbfs (#635653,#661071) --- xine-lib-1.1.19-xvmclib_header.patch | 11 +++++++++++ xine-lib.spec | 8 +++++++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 xine-lib-1.1.19-xvmclib_header.patch diff --git a/xine-lib-1.1.19-xvmclib_header.patch b/xine-lib-1.1.19-xvmclib_header.patch new file mode 100644 index 0000000..880250c --- /dev/null +++ b/xine-lib-1.1.19-xvmclib_header.patch @@ -0,0 +1,11 @@ +diff -up xine-lib-1.1.19/src/video_out/xxmc.h.ftbfs xine-lib-1.1.19/src/video_out/xxmc.h +--- xine-lib-1.1.19/src/video_out/xxmc.h.ftbfs 2010-03-09 16:17:05.000000000 -0600 ++++ xine-lib-1.1.19/src/video_out/xxmc.h 2011-01-24 08:48:28.516631749 -0600 +@@ -79,6 +79,7 @@ + #include + #ifdef HAVE_VLDXVMC + #include ++ #include + #else + #include + #include diff --git a/xine-lib.spec b/xine-lib.spec index 09ee7d2..771fe4d 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -44,7 +44,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.19 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -67,6 +67,8 @@ 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 +# fixes ftbfs for xvmc header reshuffling +Patch50: xine-lib-1.1.19-xvmclib_header.patch ## upstream patches Provides: xine-lib(plugin-abi) = %{plugin_abi} @@ -207,6 +209,7 @@ touch -r m4/optimizations.m4.stamp m4/optimizations.m4 #patch6 -p1 -b .deepbind %patch8 -p1 -b .avsync_hack %patch9 -p1 -b .multilib +%patch50 -p1 -b .xvmclib_header # autotools patch + touch'ing above seems to miss something, aclocal # runs on make anyway, let's use the ./autogen.sh hammer for now. @@ -453,6 +456,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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) From 941d67e1e4beec7b114b368638958cdc1b80f964 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 7 Feb 2011 23:14:53 -0600 Subject: [PATCH 26/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 771fe4d..b69280e 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -44,7 +44,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.19 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -456,6 +456,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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) From 4c0623f6462211f3bd512edce7139e0be847a783 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 14 Feb 2011 08:25:29 -0600 Subject: [PATCH 27/61] - split v4l, libv4l handling --- xine-lib.spec | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index b69280e..b43f805 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -31,7 +31,8 @@ %endif %if 0%{?fedora} > 8 || 0%{?rhel} > 5 -%define _enable_v4l --enable-v4l --enable-libv4l +%define _enable_v4l --enable-v4l +%define _enable_libv4l --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} @@ -44,7 +45,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.19 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -81,7 +82,7 @@ BuildRequires: libXv-devel BuildRequires: libXinerama-devel %{?_enable_xvmc:BuildRequires: libXvMC-devel} BuildRequires: libGLU-devel -%if 0%{?_enable_v4l:1} +%if 0%{?_enable_libv4l:1} BuildRequires: libv4l-devel %endif %if 0%{?_with_xcb:1} @@ -231,7 +232,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} \ + %{?_enable_v4l}%{!?_enable_v4l:--disable-v4l} \ + %{?_enable_libv4l}%{!?_enable_libv4l:--disable-libv4l} \ %{?_enable_xvmc}%{!?_enable_xvmc:--disable-xvmc} \ %{?_disable_gnomevfs} \ --disable-a52dec \ @@ -386,6 +388,8 @@ rm -rf $RPM_BUILD_ROOT %if 0%{?_enable_v4l:1} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so +%endif +%if 0%{?_enable_libv4l:1) %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so %endif %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so @@ -456,6 +460,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Feb 14 2011 Rex Dieter 1.1.19-6 +- split v4l, libv4l handling + * Mon Feb 07 2011 Fedora Release Engineering - 1.1.19-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild From 0f41a42622a2890712568d49eeb4bd286ddc56ad Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 14 Feb 2011 08:56:29 -0600 Subject: [PATCH 28/61] - omit v4l(1) bits (f15+) --- xine-lib.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/xine-lib.spec b/xine-lib.spec index b43f805..726c3c0 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -38,6 +38,10 @@ %define _with_xcb %{?_without_xcb:0}%{!?_without_xcb:1} %endif +%if 0%{?fedora} > 14 +%undefine _enable_v4l +%endif + %if 0%{?fedora} > 11 || 0%{?rhel} > 5 %define pa_in_main 1 %endif @@ -462,6 +466,7 @@ rm -rf $RPM_BUILD_ROOT %changelog * 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 From ecb7e8977815b8feca645fbc7ae618d8d9b09913 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 14 Feb 2011 10:45:46 -0600 Subject: [PATCH 29/61] another approach, disabling v4l support hammers both v4l1 and v4l2 --- xine-lib.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 726c3c0..087da2c 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -39,7 +39,7 @@ %endif %if 0%{?fedora} > 14 -%undefine _enable_v4l +%define _disable_v4l1 1 %endif %if 0%{?fedora} > 11 || 0%{?rhel} > 5 @@ -283,6 +283,12 @@ rm -Rf $RPM_BUILD_ROOT%{_libdir}/libxine.la __docs/README \ # Directory for binary codecs mkdir -p $RPM_BUILD_ROOT%{codecdir} +# unpackaged files +%if 0%{?_disable_v4l1:1} +rm -fv $RPM_BUILD_ROOT%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so +rm -fv $RPM_BUILD_ROOT%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so +%endif + %clean rm -rf $RPM_BUILD_ROOT @@ -390,10 +396,10 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_rtsp.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_stdin_fifo.so %if 0%{?_enable_v4l:1} +%if ! 0%{?_disable_v4l1:1} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_pvr.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l.so %endif -%if 0%{?_enable_libv4l:1) %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_v4l2.so %endif %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_vo_out_fb.so From fc45a321b84f471a440fe28fe92791b1c89e5c00 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Fri, 15 Jul 2011 18:34:40 +0200 Subject: [PATCH 30/61] * Fri Jul 15 2011 Kevin Kofler 1.1.19-7 - rebuild for new DirectFB (1.5.0) --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 087da2c..b47ff84 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -49,7 +49,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.19 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -470,6 +470,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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+) From fffc4c3b90583bc0decf855fb60319bda8f64753 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Nov 2011 01:40:14 +0100 Subject: [PATCH 31/61] xine-lib-cleanup-sources.sh: Use .xz tarballs. --- xine-lib-cleanup-sources.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xine-lib-cleanup-sources.sh b/xine-lib-cleanup-sources.sh index 31cff0f..f7ba13e 100755 --- a/xine-lib-cleanup-sources.sh +++ b/xine-lib-cleanup-sources.sh @@ -6,9 +6,9 @@ if [ -z "$1" -o $# -ne 1 ]; then fi version=$1 -tarball="xine-lib-$version.tar.bz2" +tarball="xine-lib-$version.tar.xz" dir="xine-lib-$version" -modtarball="xine-lib-$version-pruned.tar.bz2" +modtarball="xine-lib-$version-pruned.tar.xz" if [ ! -f $tarball ]; then @@ -18,7 +18,7 @@ fi echo "Uncompressing $tarball..." rm -rf $dir -tar -xjf $tarball +tar -xJf $tarball cd $dir rmpluglib() @@ -81,5 +81,5 @@ sed -i -e '/nosefart\/Makefile/d' configure.ac cd .. echo "Generating $modtarball..." -tar -cjf $modtarball $dir +tar -cJf $modtarball $dir rm -rf $dir From c02680866f0435267e45c45280a7fd598bc103d3 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Nov 2011 01:47:21 +0100 Subject: [PATCH 32/61] xine-lib-cleanup-sources.sh: Also remove libmpeg2new. --- xine-lib-cleanup-sources.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xine-lib-cleanup-sources.sh b/xine-lib-cleanup-sources.sh index f7ba13e..1cabc9c 100755 --- a/xine-lib-cleanup-sources.sh +++ b/xine-lib-cleanup-sources.sh @@ -30,7 +30,7 @@ rmpluglib() } # Main libraries -for remove in libfaad libffmpeg libmad libmpeg2 dxr3 liba52 libdts; do +for remove in libfaad libffmpeg libmad libmpeg2 libmpeg2new dxr3 liba52 libdts; do echo "removing src/$remove..." rm -rf src/$remove sed -i -e "/$remove/d" src/Makefile.am From 23f22cd378b4b2a44ea7e0c766d186995965cb1d Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Nov 2011 01:55:58 +0100 Subject: [PATCH 33/61] xine-lib-cleanup-sources.sh: Fix removing unwanted input plugin files. EXTRA_DIST is not an actual use of the file. --- xine-lib-cleanup-sources.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xine-lib-cleanup-sources.sh b/xine-lib-cleanup-sources.sh index 1cabc9c..1ccd7cc 100755 --- a/xine-lib-cleanup-sources.sh +++ b/xine-lib-cleanup-sources.sh @@ -48,7 +48,7 @@ for p in dvd vcd mms; do echo "removing $p input plugin..." # Remove sources for sourcefile in `awk '/^xineplug_inp_'$p'_la_SOURCES/ { $1=""; $2=""; print $0}' src/input/Makefile.am`; do - if [ "`grep -c $sourcefile src/input/Makefile.am`" -le 1 ]; then # if this file is only used for this plugin + if [ "`grep -v '^EXTRA_DIST = ' src/input/Makefile.am | grep -c $sourcefile`" -le 1 ]; then # if this file is only used for this plugin rm -f src/input/$sourcefile fi done From 7a494c091c9b8764003f880428e1d68f198d455a Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Nov 2011 02:01:49 +0100 Subject: [PATCH 34/61] xine-lib-cleanup-sources.sh: Remove patches for forbidden libraries. While they don't seem to contain any actually encumbered code, I feel it's safer to not have them in there. They're useless for us in any case. --- xine-lib-cleanup-sources.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xine-lib-cleanup-sources.sh b/xine-lib-cleanup-sources.sh index 1ccd7cc..6a1aa82 100755 --- a/xine-lib-cleanup-sources.sh +++ b/xine-lib-cleanup-sources.sh @@ -76,6 +76,8 @@ sed -i -e '/^xineplug_decode_nsf_la/,/^\s*$/d' \ -e 's/ nosefart//' \ src/libxineadec/Makefile.am sed -i -e '/nosefart\/Makefile/d' configure.ac +# Patches for forbidden libraries +rm -fv misc/lib*.patch win32/scripts/*.patch # All clean ! From f955cb1ab13016fa3fb3a680725522905f34c3d1 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Nov 2011 02:58:05 +0100 Subject: [PATCH 35/61] * 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 --- .gitignore | 1 + sources | 3 +- xine-lib-mk-autotools-patch.sh | 34 ------- xine-lib.spec | 167 +++++++++------------------------ 4 files changed, 48 insertions(+), 157 deletions(-) delete mode 100644 xine-lib-mk-autotools-patch.sh diff --git a/.gitignore b/.gitignore index de99961..4d5df15 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ xine-lib-1.1.19-autotools.patch.bz2 xine-lib-1.1.19-pruned.tar.bz2 +/xine-lib-1.1.20-pruned.tar.xz diff --git a/sources b/sources index 7be858d..cf0f1a3 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -1a77122fa938a3f8cb85cef231236c39 xine-lib-1.1.19-autotools.patch.bz2 -552e3e38f1afb77428f6aaa08e13b0d2 xine-lib-1.1.19-pruned.tar.bz2 +0a916dc5456276402ab2002dd68ded50 xine-lib-1.1.20-pruned.tar.xz diff --git a/xine-lib-mk-autotools-patch.sh b/xine-lib-mk-autotools-patch.sh deleted file mode 100644 index 3cb6d1a..0000000 --- a/xine-lib-mk-autotools-patch.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/bin/sh - -# be sure to have all build deps + libtool installed before running this - -set -e - -if [ -z "$1" -o $# -ne 1 ]; then - echo "Usage: $0 " - exit 2 -fi - -version=$1 - -# missing dependency on autoconf >= (apparently) 2.61 in upstream autofoo files -acversion="$(rpm -q --qf=%{VERSION} autoconf)" -case $acversion in - 2.6*) ;; - *) echo "ERROR: autoconf >= 2.61 required" ; exit 1 ;; -esac - -rm -rf xine-lib-$version xine-lib-$version-pruned -tar jxf xine-lib-$version-pruned.tar.bz2 -cp -a xine-lib-$version xine-lib-$version-pruned - -pushd xine-lib-$version -patch -p1 < ../xine-lib-${version}-no_autopoint.patch -# extra work for to omit old libtool-related crud -rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4 -./autogen.sh noconfig -rm -rf autom4te.cache *~ -popd - -diff -Nru xine-lib-$version-pruned xine-lib-$version \ -| bzip2 --best > xine-lib-$version-autotools.patch.bz2 diff --git a/xine-lib.spec b/xine-lib.spec index b47ff84..798ba4e 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -1,7 +1,6 @@ # TODO, sometime, maybe: # - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog # - drop the opengl video out plugin? -# - deprecate ESD support? %define plugin_abi 1.29 %define codecdir %{_libdir}/codecs @@ -12,61 +11,34 @@ %define have_vidix 0 %endif # ix86 -%if 0%{?fedora} -%define _disable_gnomevfs --disable-gnomevfs -%define with_aalib %{?_without_aalib:0}%{!?_without_aalib:1} -%else -%define with_aalib %{?_with_aalib:1}%{!?_with_aalib:0} -%endif # Fedora - -%define _enable_xvmc --enable-xvmc -%if 0%{?rhel} > 5 -%ifarch ppc64 -%undefine _enable_xvmc -%endif -%endif - -%ifarch %{arm} +%ifarch %{arm} %define _without_directfb 1 %endif -%if 0%{?fedora} > 8 || 0%{?rhel} > 5 -%define _enable_v4l --enable-v4l -%define _enable_libv4l --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} > 14 +%if 0%{?fedora} > 14 %define _disable_v4l1 1 %endif -%if 0%{?fedora} > 11 || 0%{?rhel} > 5 -%define pa_in_main 1 +%if 0%{?fedora} > 16 +%define _without_esound 1 %endif -Summary: A multimedia engine +Summary: A multimedia engine Name: xine-lib -Version: 1.1.19 -Release: 7%{?dist} +Version: 1.1.20 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries -URL: http://www.xine-project.org/ +URL: http://www.xine-project.org/ # The tarball is generated from the upstream tarball using # the script in SOURCE1. It prunes potentially patented code -#Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.bz2 -Source0: xine-lib-%{version}-pruned.tar.bz2 +#Source0: http://downloads.sourceforge.net/xine/xine-lib-%{version}.tar.xz +Source0: xine-lib-%{version}-pruned.tar.xz Source1: xine-lib-cleanup-sources.sh -Source2: xine-lib-mk-autotools-patch.sh -# autotools patch created with source2 -Patch0: xine-lib-%{version}-autotools.patch.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch0: xine-lib-1.1.19-no_autopoint.patch Patch1: xine-lib-1.1.4-optflags.patch -# used to help -Patch2: xine-lib-%{version}-no_autopoint.patch -Patch6: xine-lib-1.1.1-deepbind-939.patch # http://bugzilla.redhat.com/470568 Patch8: xine-lib-1.1.17-avsync_hack.patch # http://bugzilla.redhat.com/477226 @@ -79,71 +51,56 @@ Patch50: xine-lib-1.1.19-xvmclib_header.patch Provides: xine-lib(plugin-abi) = %{plugin_abi} %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} -BuildRequires: automake libtool +BuildRequires: autoconf automake libtool # X11 BuildRequires: libX11-devel BuildRequires: libXv-devel BuildRequires: libXinerama-devel -%{?_enable_xvmc:BuildRequires: libXvMC-devel} +BuildRequires: libXvMC-devel BuildRequires: libGLU-devel -%if 0%{?_enable_libv4l:1} BuildRequires: libv4l-devel -%endif -%if 0%{?_with_xcb:1} BuildRequires: libxcb-devel -%endif # xcb # 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 -%if 0%{!?_without_imagemagick:1} BuildRequires: ImageMagick-devel >= 6.2.4.6-1 -%endif # imagemagick %if 0%{?_with_freetype:1} BuildRequires: fontconfig-devel %endif # freetype # Audio BuildRequires: alsa-lib-devel >= 0.9.0 +%if 0%{!?_without_esound:1} BuildRequires: esound-devel +%endif # esound BuildRequires: flac-devel BuildRequires: jack-audio-connection-kit-devel BuildRequires: libmodplug-devel BuildRequires: libmpcdec-devel BuildRequires: libvorbis-devel -%if 0%{?_with_pa:1} BuildRequires: pulseaudio-lib-devel -%endif # pa BuildRequires: speex-devel -%if 0%{?_without_arts:1} -Obsoletes: xine-lib-arts < %{version}-%{release} -%else -BuildRequires: arts-devel -%endif BuildRequires: wavpack-devel # CDs BuildRequires: libcdio-devel # Other BuildRequires: pkgconfig BuildRequires: gtk2-devel -%if 0%{?fedora} > 6 || 0%{?rhel} > 5 BuildRequires: libsmbclient-devel -%else -BuildRequires: samba-common -%endif BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel -%if 0%{?pa_in_main} +# Dropped in Fedora 9 +Obsoletes: xine-lib-arts < %{version}-%{release} + +# Included in main package since Fedora 12 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 @@ -160,21 +117,6 @@ Requires: zlib-devel %description devel This package contains development files for %{name}. -%package arts -Summary: aRts plugin for %{name} -Group: System Environment/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -#Requires: xine-lib(plugin-abi) = %{plugin_abi} -%description arts -This package contains the aRts plugin for %{name}. - -%package pulseaudio -Summary: Pulseaudio plugin for %{name} -Group: System Environment/Libraries -Requires: %{name}%{?_isa} = %{version}-%{release} -%description pulseaudio -This package contains the pulseaudio plugin for %{name}. - %package extras Summary: Additional plugins for %{name} Group: System Environment/Libraries @@ -182,21 +124,16 @@ 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 -%if ! 0%{?_disable_gnomevfs:1} - - GNOME VFS -%endif - SMB - SDL -%if %{with_aalib} - AA-lib -%endif # aalib - Libcaca -%if 0%{!?_without_imagemagick:1} - Image decoding -%endif # imagemagick %if 0%{!?_without_directfb:1} - DirectFB output %endif # directfb @@ -204,14 +141,15 @@ This package contains extra plugins for %{name}: %prep %setup -q -%patch0 -p1 -b .autotools +%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 +./autogen.sh noconfig +rm -rf autom4te.cache *~ 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 -# 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 .xvmclib_header @@ -236,10 +174,10 @@ 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} \ - %{?_enable_libv4l}%{!?_enable_libv4l:--disable-libv4l} \ - %{?_enable_xvmc}%{!?_enable_xvmc:--disable-xvmc} \ - %{?_disable_gnomevfs} \ + --enable-v4l \ + --enable-libv4l \ + --enable-xvmc \ + --disable-gnomevfs \ --disable-a52dec \ --disable-mad \ --disable-vcd \ @@ -248,19 +186,19 @@ 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 \ %endif # freetype + --with-caca \ --with-external-ffmpeg \ --with-xv-path=%{_libdir} \ --with-libflac \ --with-external-libmpcdec \ -%if 0%{?_without_imagemagick:1} - --without-imagemagick \ -%endif # imagemagick - %{!?_without_arts:--with-arts} %{?_without_arts} \ + --without-arts \ +%if 0%{?_without_esound:1} + --without-esound \ +%endif --with-wavpack \ --with-real-codecs-path=%{codecdir} \ --with-w32-path=%{codecdir} @@ -339,6 +277,7 @@ 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 +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.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 @@ -395,13 +334,11 @@ 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 @@ -410,44 +347,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:1} %{_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/%{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%{?_with_pa:1} -%if ! 0%{?pa_in_main} -%files pulseaudio -%defattr(-,root,root,-) -%endif -%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_ao_out_pulseaudio.so -%endif - -%if 0%{!?_without_arts:1} -%files arts -%defattr(-,root,root,-) -%{_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 -%if 0%{!?_without_imagemagick:1} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_decode_image.so -%endif # imagemagick %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_smb.so -%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 @@ -470,6 +387,14 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 + * Fri Jul 15 2011 Kevin Kofler 1.1.19-7 - rebuild for new DirectFB (1.5.0) From ad825765e9a9b162b49e1c6d0197bbdbd6f000e1 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Nov 2011 03:00:42 +0100 Subject: [PATCH 36/61] Delete unused deepbind patch. --- xine-lib-1.1.1-deepbind-939.patch | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 xine-lib-1.1.1-deepbind-939.patch diff --git a/xine-lib-1.1.1-deepbind-939.patch b/xine-lib-1.1.1-deepbind-939.patch deleted file mode 100644 index b04400b..0000000 --- a/xine-lib-1.1.1-deepbind-939.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- xine-lib-1.1.1/src/xine-engine/load_plugins.c.~1~ 2005-09-19 09:14:02.000000000 -0700 -+++ xine-lib-1.1.1/src/xine-engine/load_plugins.c 2006-04-22 23:07:33.000000000 -0700 -@@ -591,7 +591,7 @@ static void collect_plugins(xine_t *this - printf("load_plugins: %s not cached\n", str); - #endif - -- if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL)) == NULL) { -+ if(!info && (lib = dlopen (str, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)) == NULL) { - const char *error = dlerror(); - /* too noisy -- but good to catch unresolved references */ - xprintf(this, XINE_VERBOSITY_LOG, -@@ -649,7 +649,7 @@ static int _load_plugin_class(xine_t *th - /* load the dynamic library if needed */ - if (!node->file->lib_handle) { - lprintf("dlopen %s\n", filename); -- if ((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL)) == NULL) { -+ if ((lib = dlopen (filename, RTLD_LAZY | RTLD_GLOBAL | RTLD_DEEPBIND)) == NULL) { - const char *error = dlerror(); - - xine_log (this, XINE_LOG_PLUGIN, From 809c5f3c59b688b83cca49f4831ec373fe84f2cd Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Nov 2011 03:12:42 +0100 Subject: [PATCH 37/61] - drop xvmclib_header patch, fixed upstream --- xine-lib-1.1.19-xvmclib_header.patch | 11 ----------- xine-lib.spec | 6 +----- 2 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 xine-lib-1.1.19-xvmclib_header.patch diff --git a/xine-lib-1.1.19-xvmclib_header.patch b/xine-lib-1.1.19-xvmclib_header.patch deleted file mode 100644 index 880250c..0000000 --- a/xine-lib-1.1.19-xvmclib_header.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up xine-lib-1.1.19/src/video_out/xxmc.h.ftbfs xine-lib-1.1.19/src/video_out/xxmc.h ---- xine-lib-1.1.19/src/video_out/xxmc.h.ftbfs 2010-03-09 16:17:05.000000000 -0600 -+++ xine-lib-1.1.19/src/video_out/xxmc.h 2011-01-24 08:48:28.516631749 -0600 -@@ -79,6 +79,7 @@ - #include - #ifdef HAVE_VLDXVMC - #include -+ #include - #else - #include - #include diff --git a/xine-lib.spec b/xine-lib.spec index 798ba4e..3bdf3b8 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -43,10 +43,6 @@ Patch1: xine-lib-1.1.4-optflags.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 -# fixes ftbfs for xvmc header reshuffling -Patch50: xine-lib-1.1.19-xvmclib_header.patch -## upstream patches Provides: xine-lib(plugin-abi) = %{plugin_abi} %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} @@ -152,7 +148,6 @@ touch -r m4/optimizations.m4 m4/optimizations.m4.stamp touch -r m4/optimizations.m4.stamp m4/optimizations.m4 %patch8 -p1 -b .avsync_hack %patch9 -p1 -b .multilib -%patch50 -p1 -b .xvmclib_header # autotools patch + touch'ing above seems to miss something, aclocal # runs on make anyway, let's use the ./autogen.sh hammer for now. @@ -394,6 +389,7 @@ rm -rf $RPM_BUILD_ROOT - 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 * Fri Jul 15 2011 Kevin Kofler 1.1.19-7 - rebuild for new DirectFB (1.5.0) From 4b30f13d69768cb66f0ee64bf29f7c04ac595d54 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Nov 2011 04:30:29 +0100 Subject: [PATCH 38/61] - don't build the bundled libdvdnav (unused because DVD input is disabled) - plugin ABI is now 1.30 - cat config.log and exit 1 to debug smbc_init detection issue --- xine-lib.spec | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 3bdf3b8..944fbea 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -2,7 +2,7 @@ # - libstk: http://www.libstk.net/ - probably not, see 1.1.5 ChangeLog # - drop the opengl video out plugin? -%define plugin_abi 1.29 +%define plugin_abi 1.30 %define codecdir %{_libdir}/codecs %ifarch %{ix86} @@ -140,22 +140,12 @@ This package contains extra plugins for %{name}: %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 -./autogen.sh noconfig -rm -rf autom4te.cache *~ -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 %patch8 -p1 -b .avsync_hack %patch9 -p1 -b .multilib -# autotools patch + touch'ing above seems to miss something, aclocal -# runs on make anyway, let's use the ./autogen.sh hammer for now. ./autogen.sh noconfig -#Avoid standard rpaths on lib64 archs: (autotools patch handles this too) -#sed -i -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure - %build export FFMPEG_CFLAGS=" " FFMPEG_LIBS=" " @@ -187,6 +177,7 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" %endif # freetype --with-caca \ --with-external-ffmpeg \ + --with-external-dvdnav \ --with-xv-path=%{_libdir} \ --with-libflac \ --with-external-libmpcdec \ @@ -198,6 +189,9 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" --with-real-codecs-path=%{codecdir} \ --with-w32-path=%{codecdir} +cat config.log +exit 1 + make %{?_smp_mflags} @@ -390,6 +384,8 @@ rm -rf $RPM_BUILD_ROOT - drop autotools patch, run autogen.sh in %%prep instead - drop unused deepbind patch - drop xvmclib_header patch, fixed upstream +- don't build the bundled libdvdnav (unused because DVD input is disabled) +- plugin ABI is now 1.30 * Fri Jul 15 2011 Kevin Kofler 1.1.19-7 - rebuild for new DirectFB (1.5.0) From a06944aa29a396eb128912ba268c1200c010e4e6 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Nov 2011 04:42:26 +0100 Subject: [PATCH 39/61] Don't patch configure in the optflags patch since we regenerate it anyway. --- xine-lib-1.1.4-optflags.patch | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/xine-lib-1.1.4-optflags.patch b/xine-lib-1.1.4-optflags.patch index a76864a..72540f6 100644 --- a/xine-lib-1.1.4-optflags.patch +++ b/xine-lib-1.1.4-optflags.patch @@ -9,14 +9,3 @@ archopt_val= case "$host_or_hostalias" in ---- xine-lib-1.1.4/configure~ 2007-01-30 23:02:56.000000000 +0200 -+++ xine-lib-1.1.4/configure 2007-01-30 23:03:40.000000000 +0200 -@@ -47754,7 +47754,7 @@ - - DEBUG_CFLAGS="-O $DEBUG_CFLAGS" - -- if test x"$sarchopt" != "xno"; then -+ if false ; then - archopt_val= - - case "$host_or_hostalias" in From 5002673aba5c6dae60e097e83b245826bee6715f Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Nov 2011 04:56:23 +0100 Subject: [PATCH 40/61] Remove config.log debugging. (It turns out that Samba has unresolved symbols.) --- xine-lib.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 944fbea..35ae72a 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -189,9 +189,6 @@ export SDL_CFLAGS="$(sdl-config --cflags)" SDL_LIBS="$(sdl-config --libs)" --with-real-codecs-path=%{codecdir} \ --with-w32-path=%{codecdir} -cat config.log -exit 1 - make %{?_smp_mflags} From ce16711891c38ec1bbe5262c1b4259aac850e128 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Nov 2011 05:31:39 +0100 Subject: [PATCH 41/61] It turns out libdvdnav IS used, in the spudec plugin. (Or rather, it uses one file from it, which is now in libdvdread.) --- xine-lib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 35ae72a..1eaa0ef 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -381,7 +381,7 @@ rm -rf $RPM_BUILD_ROOT - drop autotools patch, run autogen.sh in %%prep instead - drop unused deepbind patch - drop xvmclib_header patch, fixed upstream -- don't build the bundled libdvdnav (unused because DVD input is disabled) +- use the system libdvdnav (and libdvdread) instead of the bundled one - plugin ABI is now 1.30 * Fri Jul 15 2011 Kevin Kofler 1.1.19-7 From 838da37aa8bf874de45943593a8eb547fdd0a779 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 20 Nov 2011 05:51:21 +0100 Subject: [PATCH 42/61] - fix system libdvdnav support to also link libdvdread --- xine-lib-1.1.20-link-libdvdread.patch | 11 +++++++++++ xine-lib.spec | 5 +++++ 2 files changed, 16 insertions(+) create mode 100644 xine-lib-1.1.20-link-libdvdread.patch diff --git a/xine-lib-1.1.20-link-libdvdread.patch b/xine-lib-1.1.20-link-libdvdread.patch new file mode 100644 index 0000000..c714aad --- /dev/null +++ b/xine-lib-1.1.20-link-libdvdread.patch @@ -0,0 +1,11 @@ +diff -ur xine-lib-1.1.20/configure.ac xine-lib-1.1.20-link-libdvdread/configure.ac +--- xine-lib-1.1.20/configure.ac 2011-11-13 02:36:20.000000000 +0100 ++++ xine-lib-1.1.20-link-libdvdread/configure.ac 2011-11-20 05:46:16.000000000 +0100 +@@ -1773,6 +1773,7 @@ + AM_PATH_DVDNAV(0.1.9, + AC_DEFINE(HAVE_DVDNAV,1,[Define this if you have a suitable version of libdvdnav]), + [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])]) ++ AC_CHECK_LIB(dvdread, navRead_DSI, DVDNAV_LIBS="$DVDNAV_LIBS -ldvdread",) + else + AC_MSG_RESULT([Use included DVDNAV support]) + fi diff --git a/xine-lib.spec b/xine-lib.spec index 1eaa0ef..38b18a9 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -43,6 +43,9 @@ Patch1: xine-lib-1.1.4-optflags.patch Patch8: xine-lib-1.1.17-avsync_hack.patch # http://bugzilla.redhat.com/477226 Patch9: xine-lib-1.1.16.2-multilib.patch +# fix system libdvdnav support to also link libdvdread +# otherwise, we get unresolved symbols in the spudec plugin +Patch10: xine-lib-1.1.20-link-libdvdread.patch Provides: xine-lib(plugin-abi) = %{plugin_abi} %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} @@ -143,6 +146,7 @@ rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4 %patch1 -p1 -b .optflags %patch8 -p1 -b .avsync_hack %patch9 -p1 -b .multilib +%patch10 -p1 -b .link-libdvdread ./autogen.sh noconfig @@ -382,6 +386,7 @@ rm -rf $RPM_BUILD_ROOT - 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 From 831d52d6c33a1ef158930bb59d19d81be78a4096 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 3 Jan 2012 16:12:20 +0100 Subject: [PATCH 43/61] * Tue Jan 03 2011 Kevin Kofler 1.1.20.1-1 - update to 1.1.20.1 (bugfix release) - drop upstreamed link-libdvdread patch --- .gitignore | 1 + sources | 2 +- xine-lib.spec | 10 +++++----- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4d5df15..cd0f87f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xine-lib-1.1.19-autotools.patch.bz2 xine-lib-1.1.19-pruned.tar.bz2 /xine-lib-1.1.20-pruned.tar.xz +/xine-lib-1.1.20.1-pruned.tar.xz diff --git a/sources b/sources index cf0f1a3..d1fab77 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a916dc5456276402ab2002dd68ded50 xine-lib-1.1.20-pruned.tar.xz +46d9f91395feb50237ac385aa6654b26 xine-lib-1.1.20.1-pruned.tar.xz diff --git a/xine-lib.spec b/xine-lib.spec index 38b18a9..2921665 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -25,7 +25,7 @@ Summary: A multimedia engine Name: xine-lib -Version: 1.1.20 +Version: 1.1.20.1 Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries @@ -43,9 +43,6 @@ Patch1: xine-lib-1.1.4-optflags.patch Patch8: xine-lib-1.1.17-avsync_hack.patch # http://bugzilla.redhat.com/477226 Patch9: xine-lib-1.1.16.2-multilib.patch -# fix system libdvdnav support to also link libdvdread -# otherwise, we get unresolved symbols in the spudec plugin -Patch10: xine-lib-1.1.20-link-libdvdread.patch Provides: xine-lib(plugin-abi) = %{plugin_abi} %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} @@ -146,7 +143,6 @@ rm -f configure ltmain.sh libtool m4/libtool.m4 m4/ltoptions.m4 m4/ltversion.m4 %patch1 -p1 -b .optflags %patch8 -p1 -b .avsync_hack %patch9 -p1 -b .multilib -%patch10 -p1 -b .link-libdvdread ./autogen.sh noconfig @@ -377,6 +373,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Jan 03 2011 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 From 666fd2482ee8915d8828834d5951a8d86f7dc68b Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 3 Jan 2012 16:15:22 +0100 Subject: [PATCH 44/61] =?UTF-8?q?s/2011/2012/,=20duh=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- xine-lib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 2921665..7bd8afb 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -373,7 +373,7 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Tue Jan 03 2011 Kevin Kofler 1.1.20.1-1 +* Tue Jan 03 2012 Kevin Kofler 1.1.20.1-1 - update to 1.1.20.1 (bugfix release) - drop upstreamed link-libdvdread patch From 4a6eed5ac591c6332b2677ed902c8d9634be313a Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 3 Jan 2012 16:33:48 +0100 Subject: [PATCH 45/61] Delete obsolete patch. --- xine-lib-1.1.20-link-libdvdread.patch | 11 ----------- 1 file changed, 11 deletions(-) delete mode 100644 xine-lib-1.1.20-link-libdvdread.patch diff --git a/xine-lib-1.1.20-link-libdvdread.patch b/xine-lib-1.1.20-link-libdvdread.patch deleted file mode 100644 index c714aad..0000000 --- a/xine-lib-1.1.20-link-libdvdread.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur xine-lib-1.1.20/configure.ac xine-lib-1.1.20-link-libdvdread/configure.ac ---- xine-lib-1.1.20/configure.ac 2011-11-13 02:36:20.000000000 +0100 -+++ xine-lib-1.1.20-link-libdvdread/configure.ac 2011-11-20 05:46:16.000000000 +0100 -@@ -1773,6 +1773,7 @@ - AM_PATH_DVDNAV(0.1.9, - AC_DEFINE(HAVE_DVDNAV,1,[Define this if you have a suitable version of libdvdnav]), - [AC_MSG_RESULT([*** no usable version of libdvdnav found, using internal copy ***])]) -+ AC_CHECK_LIB(dvdread, navRead_DSI, DVDNAV_LIBS="$DVDNAV_LIBS -ldvdread",) - else - AC_MSG_RESULT([Use included DVDNAV support]) - fi From 3843e1c31bc7ea855f1687176162e954d7d48fc8 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sat, 14 Jan 2012 02:58:08 -0600 Subject: [PATCH 46/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 7bd8afb..40ec7b2 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -26,7 +26,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.20.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -373,6 +373,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 069aba18f74f62bf2f27b3fc35bf191ede1b0e03 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 10 Mar 2012 08:16:20 -0600 Subject: [PATCH 47/61] rebuild (ImageMagick) --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 40ec7b2..51128a8 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -26,7 +26,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.20.1 -Release: 2%{?dist} +Release: 3%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -373,6 +373,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 175663444c00adbafa2bcb7b9f42fa836beade14 Mon Sep 17 00:00:00 2001 From: "Pavel Alexeev (aka Pahan-Hubbitus)" Date: Sun, 3 Jun 2012 02:09:52 +0400 Subject: [PATCH 48/61] Rebuild for ImageMagick update http://lists.fedoraproject.org/pipermail/devel/2012-May/167462.html --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 7bd8afb..5185c70 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -26,7 +26,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.20.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -373,6 +373,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sun Jun 3 2012 Pavel Alexeev 1.1.20.1-2 +- Rebuild for ImageMagick update http://lists.fedoraproject.org/pipermail/devel/2012-May/167462.html + * Tue Jan 03 2012 Kevin Kofler 1.1.20.1-1 - update to 1.1.20.1 (bugfix release) - drop upstreamed link-libdvdread patch From 50ba62cfcd6d8622b4f6840b4b683efe2df3318d Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sat, 23 Jun 2012 12:01:23 +0200 Subject: [PATCH 49/61] Update to 1.1.21, enable libbluray support * Tue Jun 12 2012 Xavier Bachelot 1.1.21-1 - Update to 1.1.21. - Enable libbluray support. --- .gitignore | 1 + sources | 2 +- xine-lib.spec | 10 ++++++++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cd0f87f..6f9a840 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xine-lib-1.1.19-autotools.patch.bz2 xine-lib-1.1.19-pruned.tar.bz2 /xine-lib-1.1.20-pruned.tar.xz /xine-lib-1.1.20.1-pruned.tar.xz +/xine-lib-1.1.21-pruned.tar.xz diff --git a/sources b/sources index d1fab77..cce5cd6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -46d9f91395feb50237ac385aa6654b26 xine-lib-1.1.20.1-pruned.tar.xz +121b82650df35c7d701586889edc9aab xine-lib-1.1.21-pruned.tar.xz diff --git a/xine-lib.spec b/xine-lib.spec index 51128a8..54d791b 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -25,8 +25,8 @@ Summary: A multimedia engine Name: xine-lib -Version: 1.1.20.1 -Release: 3%{?dist} +Version: 1.1.21 +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -90,6 +90,7 @@ BuildRequires: gtk2-devel BuildRequires: libsmbclient-devel BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel +BuildRequires: libbluray-devel # Dropped in Fedora 9 Obsoletes: xine-lib-arts < %{version}-%{release} @@ -311,6 +312,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv_frames.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv4mpeg2.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_flac.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_bluray.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_cdda.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvb.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_file.so @@ -373,6 +375,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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) From ad948d47c8744b87933139840d6fcf8f268de682 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sat, 23 Jun 2012 05:32:58 -0500 Subject: [PATCH 50/61] s/pulseaudio-lib-devel/pkgconfig(libpulse)/ or use pulseaudio-libs-devel these days, that old name was deprecated long ago --- xine-lib.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 54d791b..17aedfa 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -79,13 +79,13 @@ BuildRequires: jack-audio-connection-kit-devel BuildRequires: libmodplug-devel BuildRequires: libmpcdec-devel BuildRequires: libvorbis-devel -BuildRequires: pulseaudio-lib-devel BuildRequires: speex-devel BuildRequires: wavpack-devel # CDs BuildRequires: libcdio-devel # Other BuildRequires: pkgconfig +BuildRequires: pkgconfig(libpulse) BuildRequires: gtk2-devel BuildRequires: libsmbclient-devel BuildRequires: libdvdnav-devel From 7537d5e2da03a62eef237d576b2fd9cb397c27a6 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 16 Jul 2012 21:50:44 +0200 Subject: [PATCH 51/61] - do not remove DVD plugin, not encumbered (only uses libdvdread/libdvdnav) * Mon Jul 16 2012 Kevin Kofler 1.1.21-2 - do not remove DVD plugin, not encumbered (only uses libdvdread/libdvdnav) It makes no sense to remove the DVD input plugin when: * the libdvd* libraries which do all the actual work are in Fedora, * GStreamer also ships the exact equivalent functionality in Fedora and * we are now shipping the BluRay input plugin in Fedora. The DVD input plugin does not include nor depend on any decoding or decryption code, it only wraps the libdvdread and libdvdnav libraries. (The same goes for the BluRay plugin, except libbluray is used there.) --- sources | 2 +- xine-lib-cleanup-sources.sh | 5 ++++- xine-lib.spec | 9 ++++++++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/sources b/sources index cce5cd6..fd1b3c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -121b82650df35c7d701586889edc9aab xine-lib-1.1.21-pruned.tar.xz +1568a378a732bd9b69d418674ad4165c xine-lib-1.1.21-pruned.tar.xz diff --git a/xine-lib-cleanup-sources.sh b/xine-lib-cleanup-sources.sh index 6a1aa82..a250800 100755 --- a/xine-lib-cleanup-sources.sh +++ b/xine-lib-cleanup-sources.sh @@ -44,7 +44,10 @@ for remove in ffmpeg; do rmpluglib combined ffmpeg done # Input plugins -for p in dvd vcd mms; do +# DVD reading (dvd input plugin) has now been in Fedora for a while (libdvdread, +# libdvdnav), the xine-lib code only wraps those libraries. (Decrypting and +# decoding are of course still separate and forbidden in Fedora.) +for p in vcd mms; do echo "removing $p input plugin..." # Remove sources for sourcefile in `awk '/^xineplug_inp_'$p'_la_SOURCES/ { $1=""; $2=""; print $0}' src/input/Makefile.am`; do diff --git a/xine-lib.spec b/xine-lib.spec index 17aedfa..2f2352c 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -26,7 +26,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.21 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -47,6 +47,9 @@ Patch9: xine-lib-1.1.16.2-multilib.patch Provides: xine-lib(plugin-abi) = %{plugin_abi} %{?_isa:Provides: xine-lib(plugin-abi)%{?_isa} = %{plugin_abi}} +# DVD plugin moved from there +Conflicts: xine-lib-extras-freeworld < 1.1.21-3 + BuildRequires: autoconf automake libtool # X11 BuildRequires: libX11-devel @@ -315,6 +318,7 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_bluray.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_cdda.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvb.so +%{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvd.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_file.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_http.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_net.so @@ -375,6 +379,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jul 16 2012 Kevin Kofler 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. From 93d016bc79677b19244ed6b99f0968aeb6c7b38c Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sat, 21 Jul 2012 12:07:40 +0200 Subject: [PATCH 52/61] Revert "Rebuild for ImageMagick update http://lists.fedoraproject.org/pipermail/devel/2012-May/167462.html" This reverts commit 175663444c00adbafa2bcb7b9f42fa836beade14. Syncing from master instead. --- xine-lib.spec | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/xine-lib.spec b/xine-lib.spec index 5185c70..7bd8afb 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -26,7 +26,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.20.1 -Release: 2%{?dist} +Release: 1%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -373,9 +373,6 @@ rm -rf $RPM_BUILD_ROOT %changelog -* Sun Jun 3 2012 Pavel Alexeev 1.1.20.1-2 -- Rebuild for ImageMagick update http://lists.fedoraproject.org/pipermail/devel/2012-May/167462.html - * Tue Jan 03 2012 Kevin Kofler 1.1.20.1-1 - update to 1.1.20.1 (bugfix release) - drop upstreamed link-libdvdread patch From 98180e81b4931c972c7db840e945feae2ee74ddc Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sat, 21 Jul 2012 15:46:43 +0200 Subject: [PATCH 53/61] - disable libbluray support on F16, libbluray too old * Sat Jul 21 2012 Kevin Kofler 1.1.21-2.1 - disable libbluray support on F16, libbluray too old --- xine-lib.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 2f2352c..2e3946a 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -23,10 +23,14 @@ %define _without_esound 1 %endif +%if 0%{?fedora} > 16 +%define bluray 1 +%endif + Summary: A multimedia engine Name: xine-lib Version: 1.1.21 -Release: 2%{?dist} +Release: 2%{?dist}.1 License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -93,7 +97,9 @@ BuildRequires: gtk2-devel BuildRequires: libsmbclient-devel BuildRequires: libdvdnav-devel BuildRequires: libdvdread-devel +%if 0%{?bluray} BuildRequires: libbluray-devel +%endif # Dropped in Fedora 9 Obsoletes: xine-lib-arts < %{version}-%{release} @@ -315,7 +321,9 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv_frames.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_dmx_yuv4mpeg2.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_flac.so +%if 0%{?bluray} %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_bluray.so +%endif %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_cdda.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvb.so %{_libdir}/xine/plugins/%{plugin_abi}/xineplug_inp_dvd.so @@ -379,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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) From 7e6058d0e78c7382466d9039c7df7c869c08d394 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 22 Jul 2012 00:35:12 -0500 Subject: [PATCH 54/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 2e3946a..e855808 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -30,7 +30,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.21 -Release: 2%{?dist}.1 +Release: 3%{?dist}.1 License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -387,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 1b31029cd5caaa92ef737fa198300ae4a68bf843 Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Mon, 17 Sep 2012 23:12:14 +0200 Subject: [PATCH 55/61] rebuild for new directfb * Mon Sep 17 2012 Kevin Kofler 1.1.21-4 - rebuild for new directfb --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index e855808..1e701eb 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -30,7 +30,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.21 -Release: 3%{?dist}.1 +Release: 4%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -387,6 +387,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 1b121475e097285d896c8554ce377487b11c393d Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Tue, 12 Feb 2013 15:55:25 +0100 Subject: [PATCH 56/61] find the Samba 4 libsmbclient.h using pkg-config, fixes FTBFS (#909825) * Tue Feb 12 2013 Kevin Kofler 1.1.21-5 - find the Samba 4 libsmbclient.h using pkg-config, fixes FTBFS (#909825) --- xine-lib-1.1.21-samba4.patch | 32 ++++++++++++++++++++++++++++++++ xine-lib.spec | 16 +++++++++++----- 2 files changed, 43 insertions(+), 5 deletions(-) create mode 100644 xine-lib-1.1.21-samba4.patch diff --git a/xine-lib-1.1.21-samba4.patch b/xine-lib-1.1.21-samba4.patch new file mode 100644 index 0000000..6c5f67d --- /dev/null +++ b/xine-lib-1.1.21-samba4.patch @@ -0,0 +1,32 @@ +diff -ur xine-lib-1.1.21/configure.ac xine-lib-1.1.21-samba4/configure.ac +--- xine-lib-1.1.21/configure.ac 2012-07-16 21:42:38.000000000 +0200 ++++ xine-lib-1.1.21-samba4/configure.ac 2013-02-12 15:44:33.000000000 +0100 +@@ -1698,12 +1698,10 @@ + [with_samba=$enableval], [with_samba=yes]) + + if test "x$with_samba" = "xyes"; then +- AC_CHECK_LIB(smbclient, smbc_init, +- [ AC_CHECK_HEADER(libsmbclient.h, +- [ have_libsmbclient=yes +- LIBSMBCLIENT_LIBS="-lsmbclient" ], +- AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***]))], +- AC_MSG_RESULT([*** All libsmbclient dependent parts will be disabled ***])) ++ PKG_CHECK_MODULES([LIBSMBCLIENT], [smbclient], ++ [have_libsmbclient=yes], ++ AC_MSG_RESULT(*** All libsmbclient dependent parts will be disabled ***)) ++ AC_SUBST(LIBSMBCLIENT_CFLAGS) + AC_SUBST(LIBSMBCLIENT_LIBS) + fi + AM_CONDITIONAL(HAVE_LIBSMBCLIENT, test "x$have_libsmbclient" = "xyes") +diff -ur xine-lib-1.1.21/src/input/Makefile.am xine-lib-1.1.21-samba4/src/input/Makefile.am +--- xine-lib-1.1.21/src/input/Makefile.am 2012-07-16 21:42:38.000000000 +0200 ++++ xine-lib-1.1.21-samba4/src/input/Makefile.am 2013-02-12 15:46:45.000000000 +0100 +@@ -150,7 +150,7 @@ + + xineplug_inp_smb_la_SOURCES = input_smb.c + xineplug_inp_smb_la_LIBADD = $(XINE_LIB) $(LIBSMBCLIENT_LIBS) $(LTLIBINTL) +-xineplug_inp_smb_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) ++xineplug_inp_smb_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) $(LIBSMBCLIENT_CFLAGS) + xineplug_inp_smb_la_LDFLAGS = $(xineplug_ldflags) + + xineplug_inp_pvr_la_SOURCES = input_pvr.c diff --git a/xine-lib.spec b/xine-lib.spec index 1e701eb..ebfe4e0 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -30,7 +30,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.21 -Release: 4%{?dist} +Release: 5%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -44,9 +44,11 @@ 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 -Patch8: xine-lib-1.1.17-avsync_hack.patch +Patch2: xine-lib-1.1.17-avsync_hack.patch # http://bugzilla.redhat.com/477226 -Patch9: xine-lib-1.1.16.2-multilib.patch +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}} @@ -151,8 +153,9 @@ This package contains extra plugins for %{name}: # 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 -%patch8 -p1 -b .avsync_hack -%patch9 -p1 -b .multilib +%patch2 -p1 -b .avsync_hack +%patch3 -p1 -b .multilib +%patch4 -p1 -b .samba4 ./autogen.sh noconfig @@ -387,6 +390,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 9f705b68844e4c3a9492eb9f6693f19ac7b5cd5c Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Sat, 30 Mar 2013 12:54:15 -0600 Subject: [PATCH 57/61] Rebuild for broken deps in rawhide --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index ebfe4e0..3d671e1 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -30,7 +30,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.21 -Release: 5%{?dist} +Release: 6%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -390,6 +390,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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) From 5d28f1e7d9ec9de3807febdc726ac6da4a1a9700 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Sun, 4 Aug 2013 03:18:45 -0500 Subject: [PATCH 58/61] - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 3d671e1..6c973ae 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -30,7 +30,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.21 -Release: 6%{?dist} +Release: 7%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -390,6 +390,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From e9cb3c563713dee3a0f8bf932604f8a0ac2e880a Mon Sep 17 00:00:00 2001 From: Jon Ciesla Date: Tue, 27 Aug 2013 08:02:03 -0500 Subject: [PATCH 59/61] libmng rebuild --- xine-lib.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 6c973ae..30bedb3 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -30,7 +30,7 @@ Summary: A multimedia engine Name: xine-lib Version: 1.1.21 -Release: 7%{?dist} +Release: 8%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -390,6 +390,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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 From 195a4e285b5b721d0ade45b083e848552db4de3a Mon Sep 17 00:00:00 2001 From: Till Maas Date: Sat, 31 Aug 2013 21:53:28 +0200 Subject: [PATCH 60/61] Disable directfb support for Fedora 20 and newer, because it was retired --- xine-lib.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/xine-lib.spec b/xine-lib.spec index 30bedb3..8365d82 100644 --- a/xine-lib.spec +++ b/xine-lib.spec @@ -27,10 +27,14 @@ %define bluray 1 %endif +%if 0%{?fedora} > 19 +%define _without_directfb 1 +%endif + Summary: A multimedia engine Name: xine-lib Version: 1.1.21 -Release: 8%{?dist} +Release: 9%{?dist} License: GPLv2+ Group: System Environment/Libraries URL: http://www.xine-project.org/ @@ -390,6 +394,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* 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. From da58f27df9a7e59cbe69636eba16211bced0f0b4 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 26 Aug 2014 14:49:56 -0500 Subject: [PATCH 61/61] 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