From: Alexis Ballier <aballier@gentoo.org>
Date: Thu, 19 Apr 2007 14:14:27 +0000 (+0000)
Subject: Use libdts or libdca for dts decoding
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=488578bd50725974230517feb991473e29e4b54d;p=gentoo.git

Use libdts or libdca for dts decoding
Package-Manager: portage-2.1.2.4
---

diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog
index edc6a6568524..a9db70f18280 100644
--- a/media-libs/xine-lib/ChangeLog
+++ b/media-libs/xine-lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/xine-lib
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.467 2007/04/18 10:16:36 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.468 2007/04/19 14:14:27 aballier Exp $
+
+  19 Apr 2007; Alexis Ballier <aballier@gentoo.org> xine-lib-1.1.6.ebuild:
+  Use libdts or libdca for dts decoding
 
 *xine-lib-1.1.6 (18 Apr 2007)
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index b89ef54ab334..725674f85ee3 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX xine-lib-1.1.4-CVE-2007-1246.patch 1304 RMD160 56394c48df401162c225f956a9b83fc8c3970668 SHA1 f4088a8e984d05535ea33d23a2010b2c7943de44 SHA256 6771d7b21d68882501f20d338f794d8400ec683dec5e90b7bce54bafd7b9dceb
 MD5 30a23851923288df6d34e7791b2dfc2f files/xine-lib-1.1.4-CVE-2007-1246.patch 1304
 RMD160 56394c48df401162c225f956a9b83fc8c3970668 files/xine-lib-1.1.4-CVE-2007-1246.patch 1304
@@ -21,14 +24,14 @@ EBUILD xine-lib-1.1.4-r2.ebuild 5611 RMD160 cfebde9e3e12e2ef368a58c61cd8bf94de5a
 MD5 1af6fc224472340e9fdb3e2a50394103 xine-lib-1.1.4-r2.ebuild 5611
 RMD160 cfebde9e3e12e2ef368a58c61cd8bf94de5a139c xine-lib-1.1.4-r2.ebuild 5611
 SHA256 18779801e1f7d448016773958801ea705a9f5664b799309026aaf1ab80962d27 xine-lib-1.1.4-r2.ebuild 5611
-EBUILD xine-lib-1.1.6.ebuild 5556 RMD160 44f16a04fc701cc15b4aa6d7ec243e0e41559ef7 SHA1 9a0cd921dc7fbb1a68c9644ee173eed1bef40d70 SHA256 06eac21bd0fbdee5f3c0835c8bb5787fa61a4089d8ffc4c1dc21fef5c240a8e9
-MD5 787368fc7e56e4e2475d482024c105d8 xine-lib-1.1.6.ebuild 5556
-RMD160 44f16a04fc701cc15b4aa6d7ec243e0e41559ef7 xine-lib-1.1.6.ebuild 5556
-SHA256 06eac21bd0fbdee5f3c0835c8bb5787fa61a4089d8ffc4c1dc21fef5c240a8e9 xine-lib-1.1.6.ebuild 5556
-MISC ChangeLog 51372 RMD160 34bfc95a12ca8d46bed78d15b02b3e9e1f09e5da SHA1 a9a6167f17d21eb831ac57496aa60fb5a7be4699 SHA256 35531e84b23691f744a5aebf8cbca3b9a1ef7d60915d68faa20b18642d8d0eda
-MD5 dfb548c02310ad476d0fe9ef421c9c21 ChangeLog 51372
-RMD160 34bfc95a12ca8d46bed78d15b02b3e9e1f09e5da ChangeLog 51372
-SHA256 35531e84b23691f744a5aebf8cbca3b9a1ef7d60915d68faa20b18642d8d0eda ChangeLog 51372
+EBUILD xine-lib-1.1.6.ebuild 5856 RMD160 973762ebe43fbf1ac8de9d19c08805070cc53300 SHA1 c689a764cdd6dfc82e403c3d6f67da70713de4f1 SHA256 605a8eda3165538b920e6fbe9230a6309cacf54f695d544d6c03aea63d46a893
+MD5 cddb8f79ab341dd749faa0dc41e404c8 xine-lib-1.1.6.ebuild 5856
+RMD160 973762ebe43fbf1ac8de9d19c08805070cc53300 xine-lib-1.1.6.ebuild 5856
+SHA256 605a8eda3165538b920e6fbe9230a6309cacf54f695d544d6c03aea63d46a893 xine-lib-1.1.6.ebuild 5856
+MISC ChangeLog 51489 RMD160 db4064132e29e465772c66c384566bc5f80e79ef SHA1 d3f938a5486ae29e3e2a6109622e478ebab559be SHA256 a6b16971df4214f865d253cf7334574b7adb0990a9f72bd8455090f28a8db1d2
+MD5 894693ded1b5a0aadbc161cc2622e3bf ChangeLog 51489
+RMD160 db4064132e29e465772c66c384566bc5f80e79ef ChangeLog 51489
+SHA256 a6b16971df4214f865d253cf7334574b7adb0990a9f72bd8455090f28a8db1d2 ChangeLog 51489
 MISC metadata.xml 306 RMD160 032164f452f69c128150b68ddf2c837a20fa11e7 SHA1 1b6a82c8dbb60a55051e663290b1fa4fbd0cdb2e SHA256 cc2402ccd44aff7c94a0865c12d43a8250e8277253395924cb145fe99a6fb560
 MD5 baed93b1b1c2bcbdce8ae48aa25df8fd metadata.xml 306
 RMD160 032164f452f69c128150b68ddf2c837a20fa11e7 metadata.xml 306
@@ -45,3 +48,10 @@ SHA256 360727ef64b680578258f7c715c18cd8084ab53bc5ceb3973f8ad63bd6083a4c files/di
 MD5 d62713c2df2be0b36d29a94c7f67388b files/digest-xine-lib-1.1.6 250
 RMD160 cc64e0b36804908d8eb66dbcc7d64503835e29a9 files/digest-xine-lib-1.1.6 250
 SHA256 816acc43865c717293aeeac4d9d2d458a0a9c2a34d1fb0bac0eadce7ff2aab18 files/digest-xine-lib-1.1.6 250
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGJ3lIvFcC4BYPU0oRAlkiAJwIKjpQ+IYNZUPZkAQ1JLTKP9exngCfe3HR
+T6wFQzJ8OQv/crNkOjLbqFA=
+=oYZI
+-----END PGP SIGNATURE-----
diff --git a/media-libs/xine-lib/xine-lib-1.1.6.ebuild b/media-libs/xine-lib/xine-lib-1.1.6.ebuild
index 8121e9b99c39..bc421a6cf3c4 100644
--- a/media-libs/xine-lib/xine-lib-1.1.6.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.1.6.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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.6.ebuild,v 1.1 2007/04/18 10:16:36 genstef Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.1.6.ebuild,v 1.2 2007/04/19 14:14:27 aballier Exp $
 
 inherit eutils flag-o-matic toolchain-funcs libtool autotools
 
@@ -55,7 +55,7 @@ RDEPEND="
 	a52? ( >=media-libs/a52dec-0.7.4-r5 )
 	mad? ( media-libs/libmad )
 	imagemagick? ( media-gfx/imagemagick )
-	dts? ( media-libs/libdts )
+	dts? ( || ( media-libs/libdts media-libs/libdca ) )
 	>=media-video/ffmpeg-0.4.9_p20070129
 	modplug? ( media-libs/libmodplug )
 	nls? ( virtual/libintl )
@@ -85,6 +85,16 @@ DEPEND="${RDEPEND}
 	sys-devel/libtool
 	nls? ( sys-devel/gettext )"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	# Include system headers for dts in order to be
+	# compatible with libdca and libdts
+	# Workaround from Flameeyes until using external
+	# libdts is done properly (in xine-lib-1.1.7)
+	echo '#include_next <dts.h>' > src/libdts/dts.h
+}
+
 src_compile() {
 	#prevent quicktime crashing
 	append-flags -frename-registers -ffunction-sections