summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-libs/xine-lib/ChangeLog8
-rw-r--r--media-libs/xine-lib/Manifest69
-rw-r--r--media-libs/xine-lib/files/digest-xine-lib-1_rc6-r21
-rw-r--r--media-libs/xine-lib/files/xine-lib-1_rc6-XSA-2004-8.patch40
-rw-r--r--media-libs/xine-lib/xine-lib-1_rc6-r2.ebuild190
5 files changed, 269 insertions, 39 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index a32cd0e26719..f6bc9e584e17 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for media-libs/xine-lib
# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.212 2005/04/25 14:45:20 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.213 2005/04/25 16:49:43 flameeyes Exp $
+
+*xine-lib-1_rc6-r2 (25 Apr 2005)
+
+ 25 Apr 2005; Diego Pettenò <flameeyes@gentoo.org>
+ +files/xine-lib-1_rc6-XSA-2004-8.patch, +xine-lib-1_rc6-r2.ebuild:
+ Backported XSA-2004-8 patch to 1_rc6 as 1.0 doesn't work on sparc.
25 Apr 2005; Martin Schlemmer <azarah@gentoo.org>
files/xine-lib-gcc4.patch:
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 95e025d99253..cc5cd731bbd4 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,62 +1,55 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 60f92c0bf2f960ee5fe72cfd8b60e60b xine-lib-1_rc8-r1.ebuild 5688
+MD5 5529b17488d439ea93b380bacdb0a7a7 metadata.xml 239
+MD5 c810c4550d4d5f0653d9b026d24e4b75 xine-lib-1.0-r1.ebuild 7469
MD5 fd257220f66a183e8896c0cd61cfe78c xine-lib-1.0.ebuild 8497
MD5 b6ad8f25595f1c8e8495579462e42764 xine-lib-1_rc6-r1.ebuild 5656
-MD5 65f3325ffbc4264d096f05c63f937dfe ChangeLog 4838
-MD5 c810c4550d4d5f0653d9b026d24e4b75 xine-lib-1.0-r1.ebuild 7469
-MD5 5529b17488d439ea93b380bacdb0a7a7 metadata.xml 239
+MD5 60f92c0bf2f960ee5fe72cfd8b60e60b xine-lib-1_rc8-r1.ebuild 5688
MD5 85910e7a6aab4d7728ccdd55c1f0664b xine-lib-1.0-r2.ebuild 7506
MD5 9415e56720946429be1cd7c6142f4351 xine-lib-1.0-r3.ebuild 7578
MD5 79cd4ff146e065a636eae4001b6d0b6a xine-lib-1.0-r4.ebuild 7845
-MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
+MD5 1406a002f16e83afedca5c76703f29e6 ChangeLog 5067
+MD5 d55745ddf67346fde75c395be629afe0 xine-lib-1_rc6-r2.ebuild 5698
MD5 bcd5f2b8999f92c2f7215009f5ae1490 files/configure-64bit-define.patch 221
-MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
-MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
-MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655
-MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
-MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
-MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
+MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
+MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r1 65
+MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6-r1 68
MD5 98bc17778384589bba027ff136956fec files/digest-xine-lib-1_rc8-r1 67
-MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594
+MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
MD5 5e99bec89f5cc4f0d00bcd61430d67cb files/protect-CFLAGS.patch-1_rc2 597
+MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
+MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
+MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc5-r1 316
+MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316
MD5 beea8b4dacbd153e4c6b06e57ee711d2 files/xine-lib-0.9.12-r2-directfb.patch 746
MD5 279ee4d06acc78adef09fe7ae4a64980 files/xine-lib-0.9.13-kxine.patch 9041
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc4 597
-MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391
-MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
-MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655
MD5 5d3bbb085af2a8dcaa429c1376a52c50 files/xine-lib-1-rc4-sparc_missing_include.patch 464
-MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0 65
-MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
-MD5 060bcd1d4a4ffa427139a7f188272e01 files/protect-CFLAGS.patch-1_rc3 597
-MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6-r1 68
+MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc5-configure-sparc.patch 587
MD5 ff56a363d07445735a05afe1dc7f6f56 files/xine-lib-1_rc5-vcd_overflow.patch 1754
-MD5 54088d42a9e9980285a96b7e2cce19cf files/djb_demux_aiff.patch 559
-MD5 e35c6e1b7a7cd3f4e268b1fb876cbeb5 files/protect-CFLAGS.patch-1_rc6 316
MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc6-2.6.patch 594
MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc6-configure-sparc.patch 587
MD5 a11a93cf97cecb7c1c2b24e11a5419ae files/xine-lib-1_rc6-ffmpeg.patch 1279
+MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc6-mmx.patch 391
+MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc6-pic.patch 2655
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-1_rc7-2.6.patch 594
MD5 c666fb35b00138d90890fef3d56548f2 files/xine-lib-1_rc7-configure-sparc.patch 587
+MD5 b3b75486422c6ccab706f2ff4cf7c4eb files/xine-lib-1_rc7-mmx.patch 391
+MD5 bf2bb27a1f0433ea77571175f2b59885 files/xine-lib-1_rc7-pic.patch 2655
MD5 3704271d4339b919569b4ea416a4c34e files/xine-lib-1_rc8-configure.ac.patch 2825
+MD5 5ddf5d90566965b047828407dcc0f5d1 files/xine-lib-1rc4-libtool1.5.6.shrext_cmds.patch 331
+MD5 a52bac7d568413597e0c7932b164e58c files/xine-lib-2.6.patch 594
+MD5 08c1c3433fe4230c788156a2e625962a files/xine-lib-configure-checks.patch 11823
+MD5 d0a2aa9bcd1263077cd8e3fe974b6910 files/xine-lib-configure-xvmc-header.patch 901
MD5 d8f3138ae2260f7c98bf46ae7159be11 files/xine-lib-configure.ac.patch 926
+MD5 0cf698a9ff87a3595140d92df7b900b6 files/xine-lib-configure.patch 342
+MD5 aa54582a91933533008c1211dcbcfb35 files/xine-lib-disable-directfb.patch 4169
+MD5 3cbdef8aa211184b96474addb4f7c5d6 files/xine-lib-gcc34.patch 423
MD5 ddf48f1eb00a6985b6fba5fff9386ad0 files/xine-lib-hardened-mmx.patch 2558
MD5 5d2c3c00bf3ae9a89dfcaa8b5c5b17a2 files/xine-lib-x11.patch 703
-MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r1 65
-MD5 08c1c3433fe4230c788156a2e625962a files/xine-lib-configure-checks.patch 11823
-MD5 d0a2aa9bcd1263077cd8e3fe974b6910 files/xine-lib-configure-xvmc-header.patch 901
-MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r2 65
+MD5 dcb0c79c0bb106397aad42f6d936627d files/xineconfig.patch-0.9.13 601
MD5 93e50bb9c91e39eb06a74e4d66477100 files/xine-lib-XSA-2004-8.patch 1532
-MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r3 65
+MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r2 65
MD5 db77ea2067d040ca948623d374d071d8 files/xine-lib-gcc4.patch 8402
+MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r3 65
MD5 1780c88522c9a26856effa70a0e27b50 files/digest-xine-lib-1.0-r4 65
MD5 665e9af72fa8604db8d82231f484c230 files/xine-lib-1.0-wma.patch 1741
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
-
-iD8DBQFCbQOO1ZcsMnZjRyIRAu60AJ4pbrwAnH8xTKATvHqauR9zHqee1ACePtkm
-8lQ16J/XnS5+Wf+U8KLn3dg=
-=Z87k
------END PGP SIGNATURE-----
+MD5 2af79240f045a98737726ddca302c374 files/xine-lib-1_rc6-XSA-2004-8.patch 1515
+MD5 082b3ed1c96543704d604199047b1dee files/digest-xine-lib-1_rc6-r2 68
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1_rc6-r2 b/media-libs/xine-lib/files/digest-xine-lib-1_rc6-r2
new file mode 100644
index 000000000000..3c24e7d6ef98
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1_rc6-r2
@@ -0,0 +1 @@
+MD5 32b231beb9b2194606a18ed7bcf2bcb3 xine-lib-1-rc6a.tar.gz 7003035
diff --git a/media-libs/xine-lib/files/xine-lib-1_rc6-XSA-2004-8.patch b/media-libs/xine-lib/files/xine-lib-1_rc6-XSA-2004-8.patch
new file mode 100644
index 000000000000..8d6f1e00227f
--- /dev/null
+++ b/media-libs/xine-lib/files/xine-lib-1_rc6-XSA-2004-8.patch
@@ -0,0 +1,40 @@
+diff -ur -x '*~' xine-lib-1-rc6a/src/input/librtsp/rtsp.c xine-lib-1-rc6a-XSA/src/input/librtsp/rtsp.c
+--- xine-lib-1-rc6a/src/input/librtsp/rtsp.c 2004-07-27 04:08:48.000000000 +0200
++++ xine-lib-1-rc6a-XSA/src/input/librtsp/rtsp.c 2005-04-25 17:59:21.392277328 +0200
+@@ -218,6 +218,7 @@
+ unsigned int answer_seq;
+ char **answer_ptr=s->answers;
+ int code;
++ int ans_count = 0;
+
+ answer=rtsp_get(s);
+ if (!answer)
+@@ -268,7 +269,7 @@
+ }
+ *answer_ptr=answer;
+ answer_ptr++;
+- } while (strlen(answer)!=0);
++ } while ((strlen(answer)!=0) && (++ans_count < MAX_FIELDS));
+
+ s->cseq++;
+
+diff -ur -x '*~' xine-lib-1-rc6a/src/input/mms.c xine-lib-1-rc6a-XSA/src/input/mms.c
+--- xine-lib-1-rc6a/src/input/mms.c 2004-07-27 04:08:47.000000000 +0200
++++ xine-lib-1-rc6a-XSA/src/input/mms.c 2005-04-25 18:01:59.677214360 +0200
+@@ -573,9 +573,13 @@
+ stream_id = LE_16(this->asf_header + i + 48);
+
+ lprintf ("stream object, stream id: %d\n", stream_id);
+- this->stream_types[stream_id] = type;
+- this->stream_ids[this->num_stream_ids] = stream_id;
+- this->num_stream_ids++;
++ if (this->num_stream_ids < ASF_MAX_NUM_STREAMS && stream_id < ASF_MAX_NUM_STREAMS) {
++ this->stream_types[stream_id] = type;
++ this->stream_ids[this->num_stream_ids] = stream_id;
++ this->num_stream_ids++;
++ } else {
++ lprintf ("too many streams, skipping\n");
++ }
+
+ }
+ break;
diff --git a/media-libs/xine-lib/xine-lib-1_rc6-r2.ebuild b/media-libs/xine-lib/xine-lib-1_rc6-r2.ebuild
new file mode 100644
index 000000000000..01f9cd69c8eb
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1_rc6-r2.ebuild
@@ -0,0 +1,190 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1_rc6-r2.ebuild,v 1.1 2005/04/25 16:49:43 flameeyes Exp $
+
+inherit eutils flag-o-matic gcc libtool
+
+# This should normally be empty string, unless a release has a suffix.
+MY_PKG_SUFFIX="a"
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${PN}-${PV/_/-}${MY_PKG_SUFFIX}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="arts esd avi nls dvd aalib X directfb oggvorbis alsa gnome sdl speex theora ipv6 altivec"
+RESTRICT="nostrip"
+
+RDEPEND="oggvorbis? ( media-libs/libvorbis )
+ !amd64? ( X? ( virtual/x11 ) )
+ amd64? ( X? ( || ( virtual/x11 ) ) )
+ avi? ( x86? ( >=media-libs/win32codecs-0.50 ) )
+ esd? ( media-sound/esound )
+ dvd? ( >=media-libs/libdvdcss-1.2.7 )
+ arts? ( kde-base/arts )
+ alsa? ( media-libs/alsa-lib )
+ aalib? ( media-libs/aalib )
+ directfb? ( >=dev-libs/DirectFB-0.9.9 dev-util/pkgconfig )
+ gnome? ( >=gnome-base/gnome-vfs-2.0
+ dev-util/pkgconfig )
+ >=media-libs/flac-1.0.4
+ sdl? ( >=media-libs/libsdl-1.1.5 )
+ >=media-libs/libfame-0.9.0
+ theora? ( media-libs/libtheora )
+ speex? ( media-libs/speex )"
+DEPEND="${RDEPEND}
+ >=sys-devel/automake-1.7
+ >=sys-devel/autoconf-2.59
+ nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${PN}-${PV/_/-}${MY_PKG_SUFFIX}
+
+pkg_setup() {
+ # Make sure that the older libraries are not installed (bug #15081).
+ if [ `has_version =media-libs/xine-lib-0.9.13*` ]
+ then
+ eerror "Please uninstall older xine libraries.";
+ eerror "The compilation cannot proceed.";
+ die
+ fi
+}
+
+src_unpack() {
+ unpack ${A}
+ cd ${S}
+
+ # preserve CFLAGS added by drobbins, -O3 isn't as good as -O2 most of the time
+ epatch ${FILESDIR}/protect-CFLAGS.patch-${PV}
+ # plasmaroo: Kernel 2.6 headers patch
+ epatch ${FILESDIR}/${P}-2.6.patch
+ # force 32 bit userland
+ [ ${ARCH} = "sparc" ] && epatch ${FILESDIR}/${P}-configure-sparc.patch
+
+ # Fix building on amd64, #49569
+ #use amd64 && epatch ${FILESDIR}/configure-64bit-define.patch
+
+ epatch ${FILESDIR}/${P}-pic.patch
+ epatch ${FILESDIR}/${P}-mmx.patch
+ epatch ${FILESDIR}/${P}-XSA-2004-8.patch
+
+ # Fix detection of hppa2.0 and hppa1.1 CHOST
+ use hppa && sed -e 's/hppa-/hppa*-linux-/' -i ${S}/configure.ac
+
+ # Fix security bug #74475
+ epatch ${FILESDIR}/djb_demux_aiff.patch
+
+ # Makefile.ams and configure.ac get patched, so we need to rerun
+ # autotools
+ export WANT_AUTOCONF=2.5
+ export WANT_AUTOMAKE=1.7
+ aclocal -I m4
+ libtoolize --copy --force
+ autoheader
+ automake -a -f -c
+ autoconf
+}
+
+src_compile() {
+ filter-flags -maltivec -mabi=altivec
+ filter-flags -fforce-addr
+ filter-flags -momit-leaf-frame-pointer #46339
+ filter-flags -funroll-all-loops #55420
+
+ if [ "`gcc-major-version`" -ge "3" -a "`gcc-minor-version`" -ge "4" ]; then
+ append-flags -fno-web #49509
+ filter-flags -fno-unit-at-a-time #55202
+ append-flags -funit-at-a-time #55202
+ fi
+
+ is-flag -O? || append-flags -O1 #31243
+
+ # fix build errors with sse2 #49482
+ if use x86 ; then
+ if [ `gcc-major-version` -eq 3 ] ; then
+ append-flags -mno-sse2 `test_flag -mno-sse3`
+ filter-mfpmath sse
+ fi
+ fi
+
+ # Use the built-in dvdnav plugin.
+ local myconf="--with-included-dvdnav"
+
+ # the win32 codec path should ignore $(get_libdir) and always use lib
+ use avi && use x86 \
+ && myconf="${myconf} --with-w32-path=/usr/$(get_libdir)/win32" \
+ || myconf="${myconf} --disable-asf"
+
+ use sparc \
+ && myconf="${myconf} --build=${CHOST}"
+
+ # enable/disable appropiate optimizations on sparc
+ [ "${PROFILE_ARCH}" == "sparc64" ] \
+ && myconf="${myconf} --enable-vis"
+ [ "${PROFILE_ARCH}" == "sparc" ] \
+ && myconf="${myconf} --disable-vis"
+
+ use amd64 \
+ && myconf="${myconf} --with-xv-path=/usr/X11R6/$(get_libdir)"
+
+ # Fix compilation-errors on PowerPC #45393 & #55460 & #68251
+ if use ppc || use ppc64 ; then
+ append-flags -U__ALTIVEC__
+ myconf="${myconf} `use_enable altivec`"
+ fi
+
+ # The default CFLAGS (-O) is the only thing working on hppa.
+ if use hppa && [ "`gcc-version`" != "3.4" ] ; then
+ unset CFLAGS
+ else
+ append-flags -ffunction-sections
+ fi
+
+ # if lib64 is a directory, sometimes the configure will set libdir itself
+ # and the installation fails. see bug #62339
+ myconf="${myconf} --libdir=/usr/$(get_libdir)"
+
+ econf \
+ `use_enable X x11` `use_with X x` `use_enable X shm` `use_enable X xft` \
+ `use_enable esd` \
+ `use_enable nls` \
+ `use_enable alsa` \
+ `use_enable arts` \
+ `use_enable aalib` \
+ `use_enable oggvorbis ogg` `use_enable oggvorbis vorbis` \
+ `use_enable sdl sdltest` \
+ `use_enable ipv6` \
+ `use_enable directfb` \
+ ${myconf} || die "Configure failed"
+
+ emake -j1 || die "Parallel make failed"
+}
+
+src_install() {
+ # portage 2.0.50's einstall is broken for handling libdir
+ make DESTDIR=${D} install || die "Install failed"
+
+ # Xine's makefiles install some file incorrectly. (Gentoo bug #8583, #16112).
+ dodir /usr/share/xine/libxine1/fonts
+ mv ${D}/usr/share/*.xinefont.gz ${D}/usr/share/xine/libxine1/fonts/
+
+ dodoc AUTHORS ChangeLog INSTALL README TODO
+ cd ${S}/doc
+ dodoc dataflow.dia README*
+}
+
+pkg_postinst() {
+ einfo
+ einfo "Please note, a new version of xine-lib has been installed."
+ einfo "For library consistency, you need to unmerge old versions"
+ einfo "of xine-lib before merging xine-ui."
+ einfo
+ einfo "This library version 1 is incompatible with the plugins"
+ einfo "designed for the prior library versions such as xine-d4d,"
+ einfo "xine-d5d, xine-dmd, and xine-dvdnav."
+ einfo
+ einfo "Also, make sure to remove your ~/.xine if upgrading from"
+ einfo "a previous version."
+ einfo
+}