From b7ebc951da8800f711142f69d9d958bde67a112d Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 28 Apr 2019 09:54:45 +0100 Subject: gentoo resync : 28.04.2019 --- media-libs/libbluray/Manifest | 5 +- media-libs/libbluray/files/libbluray-jars.patch | 46 +++++++++++++ media-libs/libbluray/libbluray-1.1.1.ebuild | 88 +++++++++++++++++++++++++ media-libs/libbluray/libbluray-9999.ebuild | 44 ++++++------- 4 files changed, 159 insertions(+), 24 deletions(-) create mode 100644 media-libs/libbluray/files/libbluray-jars.patch create mode 100644 media-libs/libbluray/libbluray-1.1.1.ebuild (limited to 'media-libs/libbluray') diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest index 4018574ec2f7..2d5245ae2096 100644 --- a/media-libs/libbluray/Manifest +++ b/media-libs/libbluray/Manifest @@ -1,4 +1,7 @@ +AUX libbluray-jars.patch 1371 BLAKE2B 1c32115ec03db19b849248bcdbe4b9868527717b279d9222ad94bf4c3875522db75ba585566b0609d1a27cbd4e25066832b19351acf05f5b00295ed5364c2984 SHA512 2b376149680edf6891f2129de2fc074dfc32a236d8eb19b3d899e1f7d3ac98eaf8cdf6e13c7b548ab59354c558e2c149f06d85c1c5be61c5e05cc5ec4382d86d DIST libbluray-1.0.2.tar.bz2 733058 BLAKE2B 6428b3cb8a2339e2c2d7f86663d6917d8484b858fb03aaf3bda6824181d072050625d37280cf011574c07316ef83103b334f654de1a6219e3a33343532cfe986 SHA512 e1360ad08aa6cc67a80efa81a09004faebbe31105f1961494f82f655e3e7378b198ee3bc534b0d0c2bfec726939b11b545cc8bbfa30794fc647432dadf71089b +DIST libbluray-1.1.1.tar.bz2 746034 BLAKE2B 031d9c4f5ed85cb9128ec6f9b0c4232e889578ca03e131024ce2bc7049ff7990ef1936aa5a525266f8d5402e58d9c2a92b14338259c37dfaebb50c6b9745ca1e SHA512 0a3bcef06d2a58c51c3d46934c32941ec0606dc9b71fe36f72a6e34ab8113cf72cfb6e2fdd51f23e0a44ccd404323f5ac5c666aa1d839ae16cc775267cbce839 EBUILD libbluray-1.0.2.ebuild 2216 BLAKE2B 0ccf81a396903645ca601a72cfb09e1adc8c970a30d8a3498441b5c0535c13d9c8a11edc43479e3409b3235bd46534f0a87cab0dc45062683ef38a394605aa18 SHA512 193b8ef72dfe4e958b1144c77bfcba0a221a1abe1bbb0ea5dd2978295e91b8966d801dfcc9ebcbde5ff1004c139bb15fcc58b55d58bb238513fe75f1c89dd9e9 -EBUILD libbluray-9999.ebuild 2229 BLAKE2B 33cae05a133f9a311c2e8cee63f9fdb304b6594f129df78a9d4f65ca29875a7689cbd40aa4cdb40165318589fbee2c04b5d0b62c3cee8adbf03268acd9f36d4f SHA512 76da49990af9602e089b916b3ef2255aceb0967e898627383e935395f665c0ea90ed8d2ee5e10cd5285cc9fab524162a68f1afa779ea84f778a1b0d0451dbdac +EBUILD libbluray-1.1.1.ebuild 2038 BLAKE2B afd04eb0f2fd05133ecde5b8d83bcb4e32fa05c31f00d43b17d1bb2c14b25bb35ac3ec63709485187caa8d2671dbad29edac54c5e2e86e4934eab0a9aa6ddc8c SHA512 8b35ef9724cc546f90345eb34eec9d1746c341b72780bf4edaf4bf3120af2fd004c40dc6d0ab9d6fa911dec30e124718a70f6e93af4dfd1b601aa6d0c518b112 +EBUILD libbluray-9999.ebuild 2038 BLAKE2B afd04eb0f2fd05133ecde5b8d83bcb4e32fa05c31f00d43b17d1bb2c14b25bb35ac3ec63709485187caa8d2671dbad29edac54c5e2e86e4934eab0a9aa6ddc8c SHA512 8b35ef9724cc546f90345eb34eec9d1746c341b72780bf4edaf4bf3120af2fd004c40dc6d0ab9d6fa911dec30e124718a70f6e93af4dfd1b601aa6d0c518b112 MISC metadata.xml 540 BLAKE2B 1385b09e4a4a1a2ffe572ca02cc50ae5808a2d283841128258a906742ab8fd67d48b1a677d601990d84a587cc18e9ae68409bf6e9af40e084c05da6f73988aef SHA512 181c79234a6c7a88d6df5b8e2de071fd7746505b153a1f2d92c4d6bffb95cbfaa3f276656b95786e02bc7c097d1fdce65afcc953c569bd82639707c843b1e575 diff --git a/media-libs/libbluray/files/libbluray-jars.patch b/media-libs/libbluray/files/libbluray-jars.patch new file mode 100644 index 000000000000..f313bf22a210 --- /dev/null +++ b/media-libs/libbluray/files/libbluray-jars.patch @@ -0,0 +1,46 @@ +diff -Naur a/Makefile.am b/Makefile.am +--- a/Makefile.am 2019-04-05 09:34:16.000000000 +0100 ++++ b/Makefile.am 2019-04-14 20:30:19.570385252 +0100 +@@ -239,10 +239,10 @@ + awt_src = java-$(BDJ_TYPE) + endif + +-jardir=$(datadir)/java/ ++jardir=$(datadir)/libbluray/lib/ + jar_DATA = \ +- $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-$(VERSION).jar \ +- $(top_builddir)/.libs/libbluray-awt-$(BDJ_TYPE)-$(VERSION).jar ++ $(top_builddir)/.libs/libbluray-$(BDJ_TYPE)-gentoo.jar \ ++ $(top_builddir)/.libs/libbluray-awt-$(BDJ_TYPE)-gentoo.jar + + $(jar_DATA): all-local + +@@ -253,13 +253,13 @@ + -Dsrc_awt=:$(awt_src) \ + $(java_versions) \ + -Dbootclasspath="$(BDJ_BOOTCLASSPATH)" \ +- -Dversion='$(BDJ_TYPE)-$(VERSION)' ++ -Dversion='$(BDJ_TYPE)-gentoo' + + clean-local: + ant -f $(top_srcdir)/src/libbluray/bdj/build.xml \ + -Dbuild='$(abs_builddir)/src/libbluray/bdj/build' \ + -Ddist='$(abs_builddir)/.libs' \ +- -Dversion='$(BDJ_TYPE)-$(VERSION)' \ ++ -Dversion='$(BDJ_TYPE)-gentoo' \ + clean + endif + +diff -Naur a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c +--- a/src/libbluray/bdj/bdj.c 2019-04-05 09:34:16.000000000 +0100 ++++ b/src/libbluray/bdj/bdj.c 2019-04-14 20:21:01.927193454 +0100 +@@ -22,6 +22,9 @@ + #include "config.h" + #endif + ++#undef VERSION ++#define VERSION "gentoo" ++ + #include "bdj.h" + + #include "native/register_native.h" diff --git a/media-libs/libbluray/libbluray-1.1.1.ebuild b/media-libs/libbluray/libbluray-1.1.1.ebuild new file mode 100644 index 000000000000..4a5301a677de --- /dev/null +++ b/media-libs/libbluray/libbluray-1.1.1.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +if [[ "${PV#9999}" != "${PV}" ]] ; then + inherit git-r3 + EGIT_REPO_URI="https://git.videolan.org/git/libbluray.git" +else + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" + SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2" +fi + +inherit autotools java-pkg-opt-2 flag-o-matic multilib-minimal + +DESCRIPTION="Blu-ray playback libraries" +HOMEPAGE="https://www.videolan.org/developers/libbluray.html" + +LICENSE="LGPL-2.1" +SLOT="0/2" +IUSE="aacs bdplus +fontconfig java static-libs +truetype utils +xml" + +COMMON_DEPEND=" + xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] ) + fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) +" +RDEPEND=" + ${COMMON_DEPEND} + aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] ) + bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] ) + java? ( >=virtual/jre-1.6 ) +" +DEPEND=" + ${COMMON_DEPEND} + java? ( >=virtual/jdk-1.6 ) +" +BDEPEND=" + java? ( + >=virtual/jdk-1.6 + dev-java/ant-core + ) + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-jars.patch +) + +DOCS=( + ChangeLog + README.txt +) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + use java || unset JDK_HOME # Bug #621992. + + ECONF_SOURCE="${S}" econf \ + --disable-optimizations \ + $(multilib_native_use_enable utils examples) \ + $(multilib_native_use_enable java bdjava-jar) \ + $(use_with fontconfig) \ + $(use_with truetype freetype) \ + $(use_enable static-libs static) \ + $(use_with xml libxml2) +} + +multilib_src_install() { + emake DESTDIR="${D}" install + multilib_is_native_abi || return + + use utils && + find .libs/ -type f -executable ! -name "${PN}.*" \ + $(use java || echo '! -name bdj_test') -exec dobin {} + + + use java && + java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar +} + +multilib_src_install_all() { + einstalldocs + find "${D}" -name '*.la' -delete || die +} diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild index 811597459685..4a5301a677de 100644 --- a/media-libs/libbluray/libbluray-9999.ebuild +++ b/media-libs/libbluray/libbluray-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 if [[ "${PV#9999}" != "${PV}" ]] ; then inherit git-r3 @@ -33,6 +33,9 @@ RDEPEND=" " DEPEND=" ${COMMON_DEPEND} + java? ( >=virtual/jdk-1.6 ) +" +BDEPEND=" java? ( >=virtual/jdk-1.6 dev-java/ant-core @@ -40,24 +43,23 @@ DEPEND=" virtual/pkgconfig " -DOCS=( ChangeLog README.txt ) +PATCHES=( + "${FILESDIR}"/${PN}-jars.patch +) + +DOCS=( + ChangeLog + README.txt +) src_prepare() { default - unset JDK_HOME #621992 - if use java ; then - export JDK_HOME="$(java-config -g JAVA_HOME)" - - # don't install a duplicate jar file - sed -i '/^jar_DATA/d' Makefile.am || die - - java-pkg-opt-2_src_prepare - fi - eautoreconf } multilib_src_configure() { + use java || unset JDK_HOME # Bug #621992. + ECONF_SOURCE="${S}" econf \ --disable-optimizations \ $(multilib_native_use_enable utils examples) \ @@ -70,18 +72,14 @@ multilib_src_configure() { multilib_src_install() { emake DESTDIR="${D}" install + multilib_is_native_abi || return - if multilib_is_native_abi && use utils; then - cd .libs/ || die - dobin index_dump mobj_dump mpls_dump bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump - if use java; then - dobin bdj_test - fi - fi + use utils && + find .libs/ -type f -executable ! -name "${PN}.*" \ + $(use java || echo '! -name bdj_test') -exec dobin {} + - if multilib_is_native_abi && use java; then - java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}{,-awt}-j2se-*.jar - fi + use java && + java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar } multilib_src_install_all() { -- cgit v1.2.3