Added new revision with ffmpeg useflag to enable external ffmpeg as it was done for 1.0.1. Dropped ~hppa and ~arm keywords as they don't have the latest ffmpeg version that is needed.

Package-Manager: portage-2.0.51.22

4 files changed, 234 insertions, 13 deletions

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index c3f7f3bdc4b2..9dba8ef99321 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,14 @@
 # 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.255 2005/09/05 19:08:01 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.256 2005/09/08 15:44:19 flameeyes Exp $
+
+*xine-lib-1.1.0-r4 (08 Sep 2005)
+
+  08 Sep 2005; Diego Pettenò <flameeyes@gentoo.org>
+  +xine-lib-1.1.0-r4.ebuild:
+  Added new revision with ffmpeg useflag to enable external ffmpeg as it was
+  done for 1.0.1. Dropped ~hppa and ~arm keywords as they don't have the
+  latest ffmpeg version that is needed.
 
   05 Sep 2005; Olivier Crête <tester@gentoo.org> xine-lib-1.1.0-r3.ebuild:
   Added strip-flags -momit-leaf-frame-pointer, see bug #104189
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index 32132dd265e2..cc570bad8e44 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,24 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 05ac5f3e87594fa2a81a1a810983c9cf xine-lib-1_rc8-r1.ebuild 5240
-MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
-MD5 d98a67dd98d7e63b112b7ad29b8ea716 ChangeLog 14342
-MD5 227f6ec6bc5dec0593311ee265f163f5 xine-lib-1.0-r2.ebuild 7114
-MD5 d233707fdd9c12fe54988ec58c30f547 xine-lib-1.0.2.ebuild 7466
 MD5 80cc7a4df380df3961ece094edde03ed xine-lib-1.1.0.ebuild 7278
+MD5 fe29b6a05ac311bed114a6725e3921f1 ChangeLog 14652
+MD5 d233707fdd9c12fe54988ec58c30f547 xine-lib-1.0.2.ebuild 7466
 MD5 892fad0dbf0442263928158e021e1671 xine-lib-1.1.0-r3.ebuild 6121
+MD5 227f6ec6bc5dec0593311ee265f163f5 xine-lib-1.0-r2.ebuild 7114
+MD5 fa757ac7f16827fed32297dccd3e9132 xine-lib-1.1.0-r4.ebuild 6209
 MD5 a3d1ed283b01d46dbf9a012454fbe821 xine-lib-1.0.1-r3.ebuild 7464
+MD5 05ac5f3e87594fa2a81a1a810983c9cf xine-lib-1_rc8-r1.ebuild 5240
+MD5 40462be9f1caff6326630fc3b93e7105 metadata.xml 330
 MD5 b5cff6ac57a1f66ac90f95608a138717 files/digest-xine-lib-1.0.2 137
-MD5 9678227c043f04d5e8561cb6ba80d3e6 files/digest-xine-lib-1.0.1-r3 137
-MD5 33da8deb9637be23cd464aba9c5c4ac4 files/digest-xine-lib-1.1.0 137
-MD5 4d1a85868bfe068b61f70daaf95427ce files/digest-xine-lib-1.1.0-r3 138
 MD5 44995c2f2dc4faa99ed2795e5e401719 files/digest-xine-lib-1.0-r2 134
 MD5 51e97df2f6ae538ab33a802eafb10457 files/digest-xine-lib-1_rc8-r1 138
+MD5 4d1a85868bfe068b61f70daaf95427ce files/digest-xine-lib-1.1.0-r4 138
+MD5 9678227c043f04d5e8561cb6ba80d3e6 files/digest-xine-lib-1.0.1-r3 137
+MD5 4d1a85868bfe068b61f70daaf95427ce files/digest-xine-lib-1.1.0-r3 138
+MD5 33da8deb9637be23cd464aba9c5c4ac4 files/digest-xine-lib-1.1.0 137
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFDHJe+mOfEJZHYOKcRArCiAKC1NtfA5YtRg25BeMSW8J5RquAOUwCg0+Ml
-iw/wxz4NarCTcOgHx/ZY4o8=
-=iFSW
+iD8DBQFDIFx8j5H05b2HAEkRAiZPAKCWILd7yWo3SF39rBRTcWDvBWA0qACfRWpW
+lXiHc0/uI6G7GUyvZuPeuvE=
+=WDC3
 -----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r4 b/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r4
new file mode 100644
index 000000000000..c425ae2c50b9
--- /dev/null
+++ b/media-libs/xine-lib/files/digest-xine-lib-1.1.0-r4
@@ -0,0 +1,2 @@
+MD5 3537cfd58d253b4be20a4975e7086e38 xine-lib-1.1.0.tar.gz 8036882
+MD5 6c884c588f33f695b888b3c0df7e577a xine-lib-patches-14.tar.bz2 13907
diff --git a/media-libs/xine-lib/xine-lib-1.1.0-r4.ebuild b/media-libs/xine-lib/xine-lib-1.1.0-r4.ebuild
new file mode 100644
index 000000000000..deb21292a09f
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.1.0-r4.ebuild
@@ -0,0 +1,209 @@
+# 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.1.0-r4.ebuild,v 1.1 2005/09/08 15:44:19 flameeyes Exp $
+
+inherit eutils flag-o-matic toolchain-funcs libtool autotools
+
+# This should normally be empty string, unless a release has a suffix.
+MY_PKG_SUFFIX=""
+MY_P=${PN}-${PV/_/-}${MY_PKG_SUFFIX}
+
+PATCHLEVEL="14"
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${MY_P}.tar.gz
+	http://digilander.libero.it/dgp85/gentoo/${PN}-patches-${PATCHLEVEL}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="aalib libcaca arts cle266 esd win32codecs nls dvd X directfb vorbis alsa
+gnome sdl speex theora ipv6 altivec opengl aac fbcon xv xvmc nvidia i8x0
+samba dxr3 vidix mng flac oss v4l xinerama vcd a52 mad imagemagick dts ffmpeg"
+RESTRICT="nostrip"
+
+RDEPEND="vorbis? ( media-libs/libvorbis )
+	X? ( virtual/x11 )
+	win32codecs? ( >=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 )
+	gnome? ( >=gnome-base/gnome-vfs-2.0 )
+	flac? ( >=media-libs/flac-1.0.4 )
+	sdl? ( >=media-libs/libsdl-1.1.5 )
+	dxr3? ( >=media-libs/libfame-0.9.0 )
+	theora? ( media-libs/libtheora )
+	speex? ( media-libs/speex )
+	libcaca? ( media-libs/libcaca )
+	samba? ( net-fs/samba )
+	mng? ( media-libs/libmng )
+	vcd? ( media-video/vcdimager )
+	a52? ( >=media-libs/a52dec-0.7.4-r5 )
+	mad? ( media-libs/libmad )
+	imagemagick? ( media-gfx/imagemagick )
+	dts? ( media-libs/libdts )
+	ffmpeg? ( >=media-video/ffmpeg-0.4.9_p20050906 )
+	!=media-libs/xine-lib-0.9.13*"
+
+DEPEND="${RDEPEND}
+	v4l? ( sys-kernel/linux-headers )
+	dev-util/pkgconfig
+	>=sys-devel/automake-1.7
+	>=sys-devel/autoconf-2.59
+	nls? ( sys-devel/gettext )"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/patches/
+
+	AT_M4DIR="m4" eautoreconf
+	elibtoolize
+}
+
+# check for the X11 path for a given library
+get_x11_dir() {
+	if [[ -f "${ROOT}/usr/$(get_libdir)/$1" ]]; then
+		echo "${ROOT}/usr/$(get_libdir)"
+	elif [[ -f "${ROOT}/usr/X11R6/$(get_libdir)/$1" ]]; then
+		echo "${ROOT}/usr/X11R6/$(get_libdir)"
+	fi
+}
+
+src_compile() {
+	#prevent quicktime crashing
+	append-flags -frename-registers -ffunction-sections
+
+	# Specific workarounds for too-few-registers arch...
+	if [[ $(tc-arch) == "x86" ]]; then
+		has_pic && append-flags -UHAVE_MMX
+		filter-flags -fforce-addr  # breaks ffmpeg module
+		filter-flags -momit-leaf-frame-pointer # break on gcc 3.4/4.x
+		append-flags -mno-sse -fomit-frame-pointer
+		is-flag -O? || append-flags -O2
+
+		ewarn ""
+		ewarn "Debug information will be almost useless as the frame pointer is omitted."
+		ewarn "This makes debugging harder, so crashes that has no fixed behavior are"
+		ewarn "difficult to fix. Please have that in mind."
+		ewarn ""
+	fi
+
+	local myconf
+
+	# the win32 codec path should ignore $(get_libdir) and always use lib
+	use win32codecs \
+		&& myconf="${myconf} --with-w32-path=/usr/$(get_libdir)/win32" \
+		|| myconf="${myconf} --disable-asf"
+
+	# enable/disable appropiate optimizations on sparc
+	[[ "${PROFILE_ARCH}" == "sparc64" ]] && myconf="${myconf} --enable-vis"
+	[[ "${PROFILE_ARCH}" == "sparc" ]] && myconf="${myconf} --disable-vis"
+
+	# The default CFLAGS (-O) is the only thing working on hppa.
+	use hppa && unset CFLAGS
+
+	if use xvmc; then
+		count="0"
+		use nvidia && count="`expr ${count} + 1`"
+		use i8x0 && count="`expr ${count} + 1`"
+		use cle266 && count="`expr ${count} + 1`"
+		if [[ "${count}" -gt "1" ]]; then
+			eerror "Invalid combination of USE flags"
+			eerror "When building support for xvmc, you may only include support for one video card:"
+			eerror "   nvidia, i8x0, cle266"
+			eerror ""
+			die "emerge again with different USE flags"
+		fi
+
+		use nvidia && xvmclib="XvMCNVIDIA"
+		use i8x0 && xvmclib="I810XvmC"
+		use cle266 && xvmclib="viaXvMC"
+
+		if [[ -n "${xvmclib}" ]]; then
+			xvmcconf="--with-xvmc-lib=${xvmclib} --with-xxmc-lib=${xvmclib}"
+			xvmcdir=$(get_x11_dir libXvMC.so)
+
+			[[ -z ${xvmcdir} ]] && die "Unable to find libXvMC.so."
+
+			myconf="${myconf} ${xvmcconf} --with-xvmc-path=${xvmcdir} --with-xxmc-path=${xvmcdir}"
+		fi
+	fi
+
+	if use xv; then
+		xvdir=$(get_x11_dir libXv.so)
+
+		[[ -z ${xvdir} ]] && die "Unable to find libXv.so. Did you set USE=\"xv\" when you emerged xorg-x11?"
+
+		myconf="${myconf} --with-xv-path=${xvdir}"
+	fi
+
+	econf \
+		$(use_enable gnome) \
+		$(use_enable nls) \
+		$(use_enable ipv6) \
+		$(use_enable samba) \
+		$(use_enable altivec) \
+		\
+		$(use_enable mng) \
+		$(use_enable imagemagick) \
+		\
+		$(use_enable aac faad) \
+		$(use_enable flac) \
+		$(use_with vorbis ogg) $(use_with vorbis) \
+		$(use_enable speex) \
+		$(use_enable a52) --with-external-a52dec \
+		$(use_enable mad) --with-external-libmad \
+		$(use_enable dts) --with-external-libdts \
+		\
+		$(use_with X x) \
+		$(use_enable xinerama) \
+		$(use_enable vidix) \
+		$(use_enable dxr3) \
+		$(use_enable directfb) \
+		$(use_enable fbcon fb) \
+		$(use_enable opengl) \
+		$(use_enable aalib) \
+		$(use_enable libcaca caca) \
+		$(use_enable sdl) \
+		\
+		$(use_enable oss) \
+		$(use_enable alsa) \
+		$(use_enable arts) \
+		$(use_enable esd) \
+		$(use_enable vcd) --without-internal-vcdlibs \
+		--disable-polypaudio \
+		--disable-optimizations \
+		$(use_with ffmpeg external-ffmpeg) \
+		${myconf} \
+		--disable-dependency-tracking || die "econf failed"
+
+		#$(use_with dvdnav external-dvdnav) \
+		#$(use_enable macos macosx-video) $(use_enable macos coreaudio) \
+		# This will be added when polypaudio will be added to portage.
+		# $(use_enable polypaudio)
+
+	emake -j1 || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "Install failed"
+
+	dodoc AUTHORS ChangeLog README TODO doc/README* doc/faq/faq.txt
+	dohtml doc/faq/faq.html doc/hackersguide/*.html doc/hackersguide/*.png
+
+	rm -rf ${D}/usr/share/doc/xine
+}
+
+pkg_postinst() {
+	einfo
+	einfo "Make sure to remove your ~/.xine if upgrading from a pre-1.0 version."
+	einfo
+}