Revision bump to pull in libaacs when aacs supported is enabled.

Package-Manager: portage-2.2.0_alpha80/cvs/Linux x86_64

3 files changed, 106 insertions, 9 deletions

diff --git a/media-libs/libbluray/ChangeLog b/media-libs/libbluray/ChangeLog
index 9e8bdf626412..f571e574e4a1 100644
--- a/media-libs/libbluray/ChangeLog
+++ b/media-libs/libbluray/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-libs/libbluray
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.17 2011/12/12 21:11:54 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.18 2011/12/12 22:27:34 radhermit Exp $
+
+*libbluray-0.2.1-r1 (12 Dec 2011)
+
+  12 Dec 2011; Tim Harder <radhermit@gentoo.org> +libbluray-0.2.1-r1.ebuild:
+  Revision bump to pull in libaacs when aacs supported is enabled.
 
   12 Dec 2011; Tim Harder <radhermit@gentoo.org>
   libbluray-0.0.1_pre20110210-r1.ebuild, libbluray-0.0.1_pre20110819.ebuild,
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index cf85529dc21c..0c426e919030 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -8,18 +8,19 @@ DIST libbluray-0.2.1-bdj.patch.gz 88688 RMD160 fceb3b50bb81e4c7c773a0e6b4d792c97
 DIST libbluray-0.2.1.tar.bz2 396405 RMD160 afc07c3ca92d77d82e9db9dd12b94446fe84b6bd SHA1 a14a940966a1be8e27106de641fafcd56f26215b SHA256 20eb1d352e9d26e8b5b639f82c218a0c350b78cdbcb741f89d237e2202bd113a
 EBUILD libbluray-0.0.1_pre20110210-r1.ebuild 1811 RMD160 cd56a63617511431c856a4d92a574e8135211942 SHA1 9adbbf1a7d119b5796215910138496621c5983e6 SHA256 e9e9250bdaa85b2944c255a357757d124dc8a6076f1b0b8528a1ef041adf0aca
 EBUILD libbluray-0.0.1_pre20110819.ebuild 1781 RMD160 afb057c9be25dbe49273705167f78b686a215965 SHA1 820617b9c049d670dbac88952d776ae686ee6b49 SHA256 57a39769d4d1733d62d13d6627a2ec07580cef0fffdb9e9bcc5806afd7e39222
+EBUILD libbluray-0.2.1-r1.ebuild 1983 RMD160 260513f8a604d7add37690b7a2e49b69db85a6e8 SHA1 24b51f976e4fac0a2c4486c8d9deb1ae455aa84a SHA256 4cfc3eeb444a6cacde60855cd72263649b0ff8cfda04ea715cc53b9251272e7b
 EBUILD libbluray-0.2.1.ebuild 1956 RMD160 b45b85ad625194d1f8ede84345645ee4dd7682f2 SHA1 cf80550383789252f9073c5c6be880ac703c014e SHA256 5eb1eb415b768176075f6010a96837b30c72e79d43863a4b4f3bfdcd5e9da715
 EBUILD libbluray-9999.ebuild 1777 RMD160 ae86096286a160961b925d9376ffbcd360c3f9b6 SHA1 d39ad24b6d4eedb303ea51fa72f637ced0a2f8cc SHA256 f51297e700a5dbc6ced22a0cfc9aa699e5fcaecce24f515378ed015a5e7699da
-MISC ChangeLog 3112 RMD160 d7886ee11d9af691b93e33d8cf38d9c1af8000d2 SHA1 d2ae5bd5b3372f37394ddc8a0b7832f9d10ffef7 SHA256 296fc4dd4cdcb58e165e204a42fdd89952e55cadbda539f213224888c90c1425
+MISC ChangeLog 3292 RMD160 9f386262f4f698734a88b44005f8fe5316c11049 SHA1 1f31c5331c5ccfb9e10d01a0add565b7aeb18648 SHA256 14b8b2f9b41721d8203c3e4a3c3f30529eea54d74cb75215c3dc9340ef3cfbf1
 MISC metadata.xml 527 RMD160 a44ea7636da6beaf53d2a66f25d094936f4fcd58 SHA1 53a8c209f1994ff91403b4069e3c7fa454e69274 SHA256 23c85cb76c6f4e027d6a6d32d33d5f26d02bfefa80f1a1c1b5fdc3739f25dcd4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO5m4kAAoJEEqz6FtPBkyjh9sH/ij6ZVPMtoGq/a7KdLvOgodf
-vbDxvaWAbLZ9fMbWiXNRjN3scVSYGjMEhn8Yg9cYebOYjbEqnsB5g4AIesGuy/KD
-Jn2p2WsmofhyIFkKtAfS/jV/v7hy7GXB+ezUgrVUA9xlWnGVI81BDZNXmEIqyB9d
-pxHxlNyohwsrwyLvCW0Ekoj4oTyladrmJsB/oBDBYzAgJn0Vi/OnLBb8r9oddrkk
-VqMQbJ1Wc0jWjoM97nWKHdkcMzMBJPvMhgFF2bi7Gd3aW/l8Bex693tgOZXetgyM
-Xy6dcAgwNkngwGZ2nRJxbQ4jmJv71Fff1EESPsy6PEdvhrrIYpPMBZKIBk0iPS8=
-=Aw2F
+iQEcBAEBCgAGBQJO5n/bAAoJEEqz6FtPBkyjQz0H/0LazRJv8fAwWwhXGjbdN4j4
+l2QbZPphuokYsNMuIPS0PJk3DgKnvBk/CbnRhpPMEsLv2wYnh5MG3iGn0ilwCAkC
+dIje7TtzL8+zLmh54ZOTnGviwIUig5YDoknuvbfMrgSU5++AKpNsMk7RcSV7UUbt
+i9Yjlo6iHnxMX+0Pf/EwetiV/9kbKIXVWsH+6PBAF1sRpAAvHAUAZMb3Y7KG9jes
+qbvxODuRic6nox0xGY8rq5fD6OU9F3f+imrguaM94a9qvROXWUHF6qpf9N1BKxui
+gFgBVGXPdH0NrjIVl8VzCEYQ7L66ErqdnrkxsHqk9DpwqZHvBFCtXGyMO3axE6Q=
+=LrVa
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libbluray/libbluray-0.2.1-r1.ebuild b/media-libs/libbluray/libbluray-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..c779278ed716
--- /dev/null
+++ b/media-libs/libbluray/libbluray-0.2.1-r1.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-0.2.1-r1.ebuild,v 1.1 2011/12/12 22:27:34 radhermit Exp $
+
+EAPI=4
+
+inherit eutils autotools java-pkg-opt-2 flag-o-matic
+
+DESCRIPTION="Blu-ray playback libraries"
+HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
+SRC_URI="ftp://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2
+	http://dev.gentoo.org/~radhermit/distfiles/${P}-bdj.patch.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+IUSE="aacs java static-libs utils xine +xml"
+
+COMMON_DEPEND="
+	xml? ( dev-libs/libxml2 )
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	aacs? (
+		media-libs/libaacs
+		media-video/aacskeys
+	)
+	java? ( >=virtual/jre-1.6 )
+"
+DEPEND="
+	${COMMON_DEPEND}
+	java? (
+		>=virtual/jdk-1.6
+		dev-java/ant-core
+	)
+	dev-util/pkgconfig
+"
+PDEPEND="
+	xine? ( ~media-libs/libbluray-xine-${PV} )
+"
+REQUIRED_USE="utils? ( static-libs )"
+
+DOCS=( README.txt )
+
+src_prepare() {
+	epatch "${WORKDIR}"/${P}-bdj.patch
+	use java && export JDK_HOME="$(java-config -g JAVA_HOME)"
+	eautoreconf
+
+	java-pkg-opt-2_src_prepare
+}
+
+src_configure() {
+	local myconf=""
+	if use java; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		append-cflags "$(java-pkg_get-jni-cflags)"
+		myconf="--with-jdk=${JDK_HOME}"
+	fi
+
+	use xml && myconf+=" --enable-libxml2"
+
+	econf \
+		--disable-debug \
+		--disable-optimizations \
+		$(use_enable java bdjava) \
+		$(use_enable static-libs static) \
+		$(use_enable utils examples) \
+		${myconf}
+}
+
+src_install() {
+	default
+
+	if use utils; then
+		cd src/examples/
+		dobin clpi_dump index_dump mobj_dump mpls_dump sound_dump
+		cd .libs/
+		dobin bd_info bdsplice hdmv_test libbluray_test list_titles
+		if use java; then
+			dobin bdj_test
+		fi
+	fi
+
+	if use java; then
+		java-pkg_dojar "${S}/src/.libs/${PN}.jar"
+		doenvd "${FILESDIR}"/90${PN}
+	fi
+
+	use static-libs || find "${ED}" -name '*.la' -exec rm -f '{}' +
+}