Update live ebuild for bug #352033 thanks to Nikoli. Update dependencies and add static-libs, utils, and xine USE flags. Allow for building and installing BD-J support.

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

4 files changed, 86 insertions, 19 deletions

diff --git a/media-libs/libbluray/ChangeLog b/media-libs/libbluray/ChangeLog
index 780100d5b178..23dfeefff46c 100644
--- a/media-libs/libbluray/ChangeLog
+++ b/media-libs/libbluray/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/libbluray
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.1 2010/07/17 02:55:14 beandog Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v 1.2 2011/02/01 12:37:40 radhermit Exp $
+
+  01 Feb 2011; Tim Harder <radhermit@gentoo.org> libbluray-9999.ebuild,
+  metadata.xml:
+  Update live ebuild for bug #352033 thanks to Nikoli. Update dependencies and
+  add static-libs, utils, and xine USE flags. Allow for building and installing
+  BD-J support.
 
 *libbluray-9999 (17 Jul 2010)
 
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 6cb8e35bb89e..ddeae6d16e11 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,3 +1,17 @@
-EBUILD libbluray-9999.ebuild 1008 RMD160 3851a3dab642002ae2105f85796f5421d9d402dd SHA1 ac52a261baeb2319fcdd9128c9b51693da225385 SHA256 8eab5c7a8ae05caf56b2d82f5bfea9ad0fd4bb3a190f78005c3fd6b31126c1d2
-MISC ChangeLog 399 RMD160 6eead88e4f824bbb7bb2c511eaa83ddd641d7b7c SHA1 db40720d59d5e36754555f4f863fa9c2bca25620 SHA256 60177664119b139f6561b4f08050bb6e3dba702c4ff571ae9ca198a26c851cef
-MISC metadata.xml 338 RMD160 6d37769ddffdcfb89096c84b9ba1d29f18726590 SHA1 eafb9962315ce9fe148c1ced30e08d283da92632 SHA256 d4f6c68df54a985d34b66b8b52add3cf46f90ae019383e60bac9399401182f71
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+EBUILD libbluray-9999.ebuild 1851 RMD160 3126b12c15f2b9e4cffb311b0171c8db4b0b6b98 SHA1 1607bfe69c714bd4adf9978620f3cd09adf9c383 SHA256 fcb1fd44c03d704037a5c53ec552b26e0eb7f3233af9e8404120dee29c96e0ad
+MISC ChangeLog 665 RMD160 13b5489b5b66f1834ad238efdc49e55c826bce94 SHA1 aee58d8432022ec1a3bec74cc05a6a7b7e14a7be SHA256 b27732ddcb71fbd570d61cce2bf435144b3174ccbf07d89f6056639f233695af
+MISC metadata.xml 527 RMD160 a44ea7636da6beaf53d2a66f25d094936f4fcd58 SHA1 53a8c209f1994ff91403b4069e3c7fa454e69274 SHA256 23c85cb76c6f4e027d6a6d32d33d5f26d02bfefa80f1a1c1b5fdc3739f25dcd4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iQEcBAEBAgAGBQJNR/6dAAoJEEqz6FtPBkyje3AH/3WmcjjNpn72d3SdQxYjp1RP
+06t8yCrRKUvZh0uT8e7GUSjRA2B1aBwZ0VQ0jjuaZa+BgZvzKh4xbNUSe9d4zpCP
+Jv5oAJGgNFH2WwJ/EJ0JzygAV7ZbnCpEm6U85Tc39MoYE0ER+s7eJnuexujeeHPX
+p3/ZEKGM5Rys5RHvqwjBZwBKIgA0dnzmQEqRFnXR4KHnY/Dtu6uasV9pfAKt8XtE
+hq0iWfZTceo8/aSOzEWRqzYSoKKaWxC3Dmqj67HJy9NYBo6GQFxyJlt3vESVsZps
+pKW8PE1KThXkuaVFt8osLkk1p8EqVAVdd2bfyIX8ylE/hEcPIwM8XF3/rZxxeEw=
+=HyGg
+-----END PGP SIGNATURE-----
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index f793020d8513..77541319491d 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -1,40 +1,84 @@
-# Copyright 1999-2010 Gentoo Foundation
+# 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-9999.ebuild,v 1.1 2010/07/17 02:55:14 beandog Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild,v 1.2 2011/02/01 12:37:40 radhermit Exp $
 
 EAPI=2
 
-inherit autotools git
+inherit autotools java-pkg-opt-2 git flag-o-matic
 
 EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
 
 DESCRIPTION="Blu-ray playback libraries"
-HOMEPAGE="http://www.videolan.org/ http://git.videolan.org/?p=libbluray.git;a=summary"
+HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="aacs java"
+IUSE="aacs java static-libs utils xine"
 
-RDEPEND="aacs? ( media-video/aacskeys )"
-DEPEND="java? ( virtual/jdk )"
+COMMON_DEPEND="dev-libs/libxml2
+	xine? ( media-libs/xine-lib )"
+RDEPEND="${COMMON_DEPEND}
+	aacs? ( media-video/aacskeys )
+	java? ( >=virtual/jre-1.6 )"
+DEPEND="${COMMON_DEPEND}
+	java? ( >=virtual/jdk-1.6 )
+	dev-util/pkgconfig"
 
 src_prepare() {
 	use java && export JDK_HOME="$(java-config -g JAVA_HOME)"
 	eautoreconf
+
+	java-pkg-opt-2_src_prepare
 }
 
 src_configure() {
 	local myconf=""
-	use java && myconf="--with-jdk=${JDK_HOME}"
-	econf $myconf
+	if use java; then
+		export JAVACFLAGS="$(java-pkg_javac-args)"
+		append-cflags "$(java-pkg_get-jni-cflags)"
+		myconf="--with-jdk=${JDK_HOME}"
+	fi
+
+	econf \
+		$(use_enable java bdjava) \
+		$(use_enable static-libs static) \
+		$(use_enable utils static) \
+		$(use_enable utils examples) \
+		$myconf
+}
+
+src_compile() {
+	emake || die
+
+	if use xine; then
+		cd player_wrappers/xine || die
+		emake || die
+	fi
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die
-	dodoc doc/README README.txt TODO.txt
-	cd "${S}"/src/examples/
-	dobin clpi_dump index_dump mobj_dump mpls_dump sound_dump
-	cd "${S}"/src/examples/.libs/
-	dobin bdsplice libbluray_test list_titles
+
+	dodoc doc/README README.txt TODO.txt || die
+
+	if use utils; then
+		cd src/examples/
+		dobin clpi_dump index_dump mobj_dump mpls_dump sound_dump || die
+		cd .libs/
+		dobin bd_info bdsplice hdmv_test libbluray_test list_titles || die
+		if use java; then
+			dobin bdj_test || die
+		fi
+	fi
+
+	if use java; then
+		java-pkg_dojar "${S}/src/.libs/${PN}.jar"
+	fi
+
+	if use xine; then
+		cd "${S}"/player_wrappers/xine || die
+		emake DESTDIR="${D}" install || die
+		newdoc HOWTO README.xine
+	fi
 }
diff --git a/media-libs/libbluray/metadata.xml b/media-libs/libbluray/metadata.xml
index 9608a1da6ca8..95d6be376805 100644
--- a/media-libs/libbluray/metadata.xml
+++ b/media-libs/libbluray/metadata.xml
@@ -8,5 +8,8 @@
   </maintainer>
   <use>
     <flag name="aacs">Add support for decryption of AACS</flag>
+    <flag name="java">Add support for BD-J</flag>
+    <flag name="utils">Install command-line utilities and examples</flag>
+    <flag name="xine">Build Blu-ray input plugin for Xine</flag>
   </use>
 </pkgmetadata>