[gentoo-commits] gentoo-x86 commit in media-libs/libbluray: metadata.xml ChangeLog libbluray-9999.ebuild

[Tim Harder (radhermit)]

radhermit    11/02/01 12:37:40

  Modified:             metadata.xml ChangeLog libbluray-9999.ebuild
  Log:
  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.
  
  (Portage version: 2.2.0_alpha19/cvs/Linux x86_64)

Revision  Changes    Path
1.3                  media-libs/libbluray/metadata.xml

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/metadata.xml?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/metadata.xml?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/metadata.xml?r1=1.2&r2=1.3

Index: metadata.xml
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libbluray/metadata.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- metadata.xml	29 Jan 2011 17:43:21 -0000	1.2
+++ metadata.xml	1 Feb 2011 12:37:40 -0000	1.3
@@ -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>



1.2                  media-libs/libbluray/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/ChangeLog?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/ChangeLog?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/ChangeLog?r1=1.1&r2=1.2

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libbluray/ChangeLog,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ChangeLog	17 Jul 2010 02:55:14 -0000	1.1
+++ ChangeLog	1 Feb 2011 12:37:40 -0000	1.2
@@ -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@g.o> 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)
 



1.2                  media-libs/libbluray/libbluray-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild?r1=1.1&r2=1.2

Index: libbluray-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/libbluray/libbluray-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libbluray-9999.ebuild	17 Jul 2010 02:55:14 -0000	1.1
+++ libbluray-9999.ebuild	1 Feb 2011 12:37:40 -0000	1.2
@@ -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
 }