* [gentoo-commits] repo/gentoo:master commit in: media-libs/libbluray/, media-libs/libbluray/files/
@ 2017-03-04 13:37 Alexis Ballier
0 siblings, 0 replies; 3+ messages in thread
From: Alexis Ballier @ 2017-03-04 13:37 UTC (permalink / raw
To: gentoo-commits
commit: 9bbea13b6bc8a86f2d3422af3cc73e69b42f393a
Author: Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 4 13:17:28 2017 +0000
Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Mar 4 13:36:49 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bbea13b
media-libs/libbluray: remove old
Package-Manager: Portage-2.3.4, Repoman-2.3.2
media-libs/libbluray/Manifest | 5 --
media-libs/libbluray/files/90libbluray | 1 -
media-libs/libbluray/libbluray-0.6.2.ebuild | 91 ----------------------------
media-libs/libbluray/libbluray-0.8.1.ebuild | 93 -----------------------------
media-libs/libbluray/libbluray-0.9.0.ebuild | 93 -----------------------------
media-libs/libbluray/libbluray-0.9.1.ebuild | 92 ----------------------------
media-libs/libbluray/libbluray-0.9.2.ebuild | 92 ----------------------------
7 files changed, 467 deletions(-)
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index ada834af0bb..318f1602552 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,6 +1 @@
-DIST libbluray-0.6.2.tar.bz2 582227 SHA256 8ca410c8a4a1e2e8344014a67e2c908182cff3e04ece4e3b9ef196cf6bca5cd0 SHA512 20fbc5f34d7d025efaac1b6398c18b94b603a52bfb6dd0f021059d3bd4c3cf785e715698cd09e5d1c97a7ed11bbd146b29aa363650620eef1efca08053fc033a WHIRLPOOL 5e69fe4042d709677635fdc6569a2b14a34ff93ef672b3138bffde3a492ca5b38d960ed3bec814444b5dc4b4491f108ed50d64c2c8d956164dfedd0a43b8f506
-DIST libbluray-0.8.1.tar.bz2 623402 SHA256 cdbec680c5bbc2251de6ccd109cf5f798ea51db6fcb938df39283be1799efb8f SHA512 6618e01a567f0dc5d21302fc771d4155589c81703028b76f6090a2d12ef1c7e9d08d9c79312a7c8b2ca0d6c63ce980195f0866509a4f8f05f64ed6650c7f78dc WHIRLPOOL 899ffe320997d245ed76987993d7d7e1697fcea61474ad7fb664c0c519d2c6578344986e22a9fe7d23d7c458525f6effff68718619334916fbe42cccb6c5c801
-DIST libbluray-0.9.0.tar.bz2 624614 SHA256 84b61da9202fa724a76ac885af69df16a5583eb11d43e940dc201833bbfd694d SHA512 12db8b9ace0629158c1ce0e5447fc154609e9f78c55ff7d830c7ee38ccafa9824bfcdbe622d7e13e8c6d74205ae648ccf2e7c7b756692acc27e48fe9e2cc95ec WHIRLPOOL 7b8191bf0adcd1c612662a9bf66d2f94ba43bda1bd5a23425aee85b486aced4c0edf0f720a17361640f7982e5794bd531bfc9efa45e883495be4acd9ae42b8cc
-DIST libbluray-0.9.1.tar.bz2 703068 SHA256 d9647fa55802907b33d85e9ffcc6d97e3133490f3721afd649d9b361c42f3940 SHA512 78a768d26454067f904e0c15717e81bbce624f8e13d1e8a8e84611a4fc29191860640b86633ad9611cc461d9ee84472d3388fc2429d302d87908e3900898c5a1 WHIRLPOOL 788f5714689cf08798149860a450a17b0b6abb717bfb6e0fce805c90592e01ffbb15da621c6ee2317dde88379619bb678a930ebb1c2234ac139b08fc7be0ab73
-DIST libbluray-0.9.2.tar.bz2 704357 SHA256 efc994f42d2bce6af2ce69d05ba89dbbd88bcec7aca065de094fb3a7880ce7ea SHA512 f7fda2ef4c0ec70eb9a38aed0e76d21d8784410cb13713e7ee66ecd23a1cc58325977b046d40c526554a4a4e4cf96706a233e15451bf34892aff201b47e25aef WHIRLPOOL 96716027cd8d62c55cdde4f05d8a3c2023c30231ae86ca3231abc52db66e8a4b7338ea3ca871cfc971b83104875429c6d4058d132c488aed09d6d50eb9b4afb1
DIST libbluray-0.9.3.tar.bz2 722686 SHA256 a6366614ec45484b51fe94fcd1975b3b8716f90f038a33b24d59978de3863ce0 SHA512 1e308b85c51d43b23b186fdd2631f963d4c25de8aff29f335e131b32a175434ee21460a7aa470c508ad13662cf9052649bb4eb974dbd709eb9e6797fb84e0823 WHIRLPOOL b121e75b68738c057ea3e5240523ca2c427c60436e3f12b5ed0817a673ec26573ea45d5d788e464f234eaa254fadcd583b81c2d30970131e2b5eb46b4c279632
diff --git a/media-libs/libbluray/files/90libbluray b/media-libs/libbluray/files/90libbluray
deleted file mode 100644
index c2a0d7c80a5..00000000000
--- a/media-libs/libbluray/files/90libbluray
+++ /dev/null
@@ -1 +0,0 @@
-LIBBLURAY_CP="/usr/share/libbluray/lib/libbluray.jar"
diff --git a/media-libs/libbluray/libbluray-0.6.2.ebuild b/media-libs/libbluray/libbluray-0.6.2.ebuild
deleted file mode 100644
index 294608eebdd..00000000000
--- a/media-libs/libbluray/libbluray-0.6.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal
-
-DESCRIPTION="Blu-ray playback libraries"
-HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="aacs java static-libs +truetype utils +xml"
-
-COMMON_DEPEND="
- xml? ( >=dev-libs/libxml2-2.9.1-r4[${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}] )
- java? ( >=virtual/jre-1.6 )
-"
-DEPEND="
- ${COMMON_DEPEND}
- java? (
- >=virtual/jdk-1.6
- dev-java/ant-core
- )
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog README.txt )
-
-src_prepare() {
- if use java ; then
- export JDK_HOME="$(java-config -g JAVA_HOME)"
-
- # don't install a duplicate jar file
- sed -i '/^jar_DATA/d' src/Makefile.am || die
-
- java-pkg-opt-2_src_prepare
- fi
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myconf
- if multilib_is_native_abi && use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- append-cflags "$(java-pkg_get-jni-cflags)"
- myconf="--enable-bdjava"
- else
- myconf="--disable-bdjava"
- fi
-
- ECONF_SOURCE="${S}" econf \
- --disable-optimizations \
- $(multilib_native_use_enable utils examples) \
- $(use_with truetype freetype) \
- $(use_enable static-libs static) \
- $(use_with xml libxml2) \
- ${myconf}
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use utils; then
- cd src
- dobin index_dump mobj_dump mpls_dump
- cd .libs/
- dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
- if use java; then
- dobin bdj_test
- fi
- fi
-
- if multilib_is_native_abi && use java; then
- java-pkg_dojar "${BUILD_DIR}"/src/.libs/${PN}-j2se-${PV}.jar
- doenvd "${FILESDIR}"/90${PN}
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/media-libs/libbluray/libbluray-0.8.1.ebuild b/media-libs/libbluray/libbluray-0.8.1.ebuild
deleted file mode 100644
index 1ade27ac4b7..00000000000
--- a/media-libs/libbluray/libbluray-0.8.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal
-
-DESCRIPTION="Blu-ray playback libraries"
-HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-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
- dev-java/ant-core
- )
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog README.txt )
-
-src_prepare() {
- 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() {
- local myconf
- if multilib_is_native_abi && use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- append-cflags "$(java-pkg_get-jni-cflags)"
- myconf="--enable-bdjava"
- else
- myconf="--disable-bdjava"
- fi
-
- ECONF_SOURCE="${S}" econf \
- --disable-optimizations \
- $(multilib_native_use_enable utils examples) \
- $(use_with fontconfig) \
- $(use_with truetype freetype) \
- $(use_enable static-libs static) \
- $(use_with xml libxml2) \
- ${myconf}
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use utils; then
- dobin index_dump mobj_dump mpls_dump
- cd .libs/
- dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
- if use java; then
- dobin bdj_test
- fi
- fi
-
- if multilib_is_native_abi && use java; then
- java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}-j2se-${PV}.jar
- doenvd "${FILESDIR}"/90${PN}
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/media-libs/libbluray/libbluray-0.9.0.ebuild b/media-libs/libbluray/libbluray-0.9.0.ebuild
deleted file mode 100644
index 1ade27ac4b7..00000000000
--- a/media-libs/libbluray/libbluray-0.9.0.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools java-pkg-opt-2 flag-o-matic eutils multilib-minimal
-
-DESCRIPTION="Blu-ray playback libraries"
-HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-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
- dev-java/ant-core
- )
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog README.txt )
-
-src_prepare() {
- 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() {
- local myconf
- if multilib_is_native_abi && use java; then
- export JAVACFLAGS="$(java-pkg_javac-args)"
- append-cflags "$(java-pkg_get-jni-cflags)"
- myconf="--enable-bdjava"
- else
- myconf="--disable-bdjava"
- fi
-
- ECONF_SOURCE="${S}" econf \
- --disable-optimizations \
- $(multilib_native_use_enable utils examples) \
- $(use_with fontconfig) \
- $(use_with truetype freetype) \
- $(use_enable static-libs static) \
- $(use_with xml libxml2) \
- ${myconf}
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use utils; then
- dobin index_dump mobj_dump mpls_dump
- cd .libs/
- dobin bd_info bdsplice clpi_dump hdmv_test libbluray_test list_titles sound_dump
- if use java; then
- dobin bdj_test
- fi
- fi
-
- if multilib_is_native_abi && use java; then
- java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}-j2se-${PV}.jar
- doenvd "${FILESDIR}"/90${PN}
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/media-libs/libbluray/libbluray-0.9.1.ebuild b/media-libs/libbluray/libbluray-0.9.1.ebuild
deleted file mode 100644
index 7de0b93f143..00000000000
--- a/media-libs/libbluray/libbluray-0.9.1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- VCSECLASS="git-r3"
- KEYWORDS=""
- EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
- SRC_URI=""
-else
- VCSECLASS=""
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
- SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
-fi
-
-inherit autotools ${VCSECLASS} java-pkg-opt-2 flag-o-matic eutils multilib-minimal
-
-DESCRIPTION="Blu-ray playback libraries"
-HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aacs bdplus +fontconfig java static-libs +truetype udf 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
- dev-java/ant-core
- )
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog README.txt )
-
-src_prepare() {
- 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() {
- ECONF_SOURCE="${S}" econf \
- --disable-optimizations \
- $(multilib_native_use_enable utils examples) \
- $(multilib_native_use_enable java bdjava) \
- $(use_with fontconfig) \
- $(use_with truetype freetype) \
- $(use_enable static-libs static) \
- $(use_enable udf) \
- $(use_with xml libxml2)
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use utils; then
- cd .libs/
- 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
-
- if multilib_is_native_abi && use java; then
- java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}-j2se-*.jar
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
diff --git a/media-libs/libbluray/libbluray-0.9.2.ebuild b/media-libs/libbluray/libbluray-0.9.2.ebuild
deleted file mode 100644
index 7de0b93f143..00000000000
--- a/media-libs/libbluray/libbluray-0.9.2.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-if [ "${PV#9999}" != "${PV}" ] ; then
- VCSECLASS="git-r3"
- KEYWORDS=""
- EGIT_REPO_URI="git://git.videolan.org/libbluray.git"
- SRC_URI=""
-else
- VCSECLASS=""
- KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
- SRC_URI="http://ftp.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
-fi
-
-inherit autotools ${VCSECLASS} java-pkg-opt-2 flag-o-matic eutils multilib-minimal
-
-DESCRIPTION="Blu-ray playback libraries"
-HOMEPAGE="http://www.videolan.org/developers/libbluray.html"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-IUSE="aacs bdplus +fontconfig java static-libs +truetype udf 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
- dev-java/ant-core
- )
- virtual/pkgconfig
-"
-
-DOCS=( ChangeLog README.txt )
-
-src_prepare() {
- 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() {
- ECONF_SOURCE="${S}" econf \
- --disable-optimizations \
- $(multilib_native_use_enable utils examples) \
- $(multilib_native_use_enable java bdjava) \
- $(use_with fontconfig) \
- $(use_with truetype freetype) \
- $(use_enable static-libs static) \
- $(use_enable udf) \
- $(use_with xml libxml2)
-}
-
-multilib_src_install() {
- emake DESTDIR="${D}" install
-
- if multilib_is_native_abi && use utils; then
- cd .libs/
- 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
-
- if multilib_is_native_abi && use java; then
- java-pkg_dojar "${BUILD_DIR}"/.libs/${PN}-j2se-*.jar
- fi
-}
-
-multilib_src_install_all() {
- einstalldocs
- prune_libtool_files
-}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libbluray/, media-libs/libbluray/files/
@ 2019-04-14 20:02 James Le Cuirot
0 siblings, 0 replies; 3+ messages in thread
From: James Le Cuirot @ 2019-04-14 20:02 UTC (permalink / raw
To: gentoo-commits
commit: 50591ef0ce170b46770592d44dfab01766bd2992
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 14 19:59:53 2019 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Sun Apr 14 19:59:53 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=50591ef0
media-libs/libbluray: Bump to 1.1.1, EAPI 7, fix versioned jars issue
Closes: https://bugs.gentoo.org/639284
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org>
media-libs/libbluray/Manifest | 1 +
media-libs/libbluray/files/libbluray-jars.patch | 46 ++++++++++++++++++++++
...ibbluray-9999.ebuild => libbluray-1.1.1.ebuild} | 44 ++++++++++-----------
media-libs/libbluray/libbluray-9999.ebuild | 44 ++++++++++-----------
4 files changed, 89 insertions(+), 46 deletions(-)
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index a6b4ab1d997..f0f4a53f1b2 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1 +1,2 @@
DIST libbluray-1.0.2.tar.bz2 733058 BLAKE2B 6428b3cb8a2339e2c2d7f86663d6917d8484b858fb03aaf3bda6824181d072050625d37280cf011574c07316ef83103b334f654de1a6219e3a33343532cfe986 SHA512 e1360ad08aa6cc67a80efa81a09004faebbe31105f1961494f82f655e3e7378b198ee3bc534b0d0c2bfec726939b11b545cc8bbfa30794fc647432dadf71089b
+DIST libbluray-1.1.1.tar.bz2 746034 BLAKE2B 031d9c4f5ed85cb9128ec6f9b0c4232e889578ca03e131024ce2bc7049ff7990ef1936aa5a525266f8d5402e58d9c2a92b14338259c37dfaebb50c6b9745ca1e SHA512 0a3bcef06d2a58c51c3d46934c32941ec0606dc9b71fe36f72a6e34ab8113cf72cfb6e2fdd51f23e0a44ccd404323f5ac5c666aa1d839ae16cc775267cbce839
diff --git a/media-libs/libbluray/files/libbluray-jars.patch b/media-libs/libbluray/files/libbluray-jars.patch
new file mode 100644
index 00000000000..f313bf22a21
--- /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-9999.ebuild b/media-libs/libbluray/libbluray-1.1.1.ebuild
similarity index 72%
copy from media-libs/libbluray/libbluray-9999.ebuild
copy to media-libs/libbluray/libbluray-1.1.1.ebuild
index 81159745968..4a5301a677d 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-1.1.1.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() {
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index 81159745968..4a5301a677d 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() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libbluray/, media-libs/libbluray/files/
@ 2022-06-20 2:53 Sam James
0 siblings, 0 replies; 3+ messages in thread
From: Sam James @ 2022-06-20 2:53 UTC (permalink / raw
To: gentoo-commits
commit: 9e52ba220d0376794fd4d33a5a8e19dd766b539c
Author: Florian Schmaus <flow <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 10:14:41 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 20 02:51:26 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e52ba22
media-libs/libbluray: Fix build after Oracle Java Critical Patch Update (CPU) 2022
Closes: https://bugs.gentoo.org/844187
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>
Closes: https://github.com/gentoo/gentoo/pull/25973
Signed-off-by: Sam James <sam <AT> gentoo.org>
...lure-after-Oracle-Java-CPU-for-April-2022.patch | 25 ++++++++++++++++++++++
media-libs/libbluray/libbluray-1.3.1.ebuild | 1 +
2 files changed, 26 insertions(+)
diff --git a/media-libs/libbluray/files/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch b/media-libs/libbluray/files/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch
new file mode 100644
index 000000000000..158468e7839d
--- /dev/null
+++ b/media-libs/libbluray/files/libbluray-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch
@@ -0,0 +1,25 @@
+From 8f26777b1ce124ff761f80ef52d6be10bcea323e Mon Sep 17 00:00:00 2001
+From: Fridrich Strba <fstrba@suse.com>
+Date: Mon, 25 Apr 2022 14:28:58 +0300
+Subject: [PATCH] Fix build failure after Oracle Java CPU for April 2022
+
+--- a/src/libbluray/bdj/java/java/io/BDFileSystem.java
++++ b/src/libbluray/bdj/java/java/io/BDFileSystem.java
+@@ -227,6 +227,17 @@ public abstract class BDFileSystem extends FileSystem {
+ return fs.isAbsolute(f);
+ }
+
++ public boolean isInvalid(File f) {
++ try {
++ Method m = fs.getClass().getDeclaredMethod("isInvalid", new Class[] { File.class });
++ Object[] args = new Object[] {(Object)f};
++ Boolean result = (Boolean)m.invoke(fs, args);
++ return result.booleanValue();
++ } finally {
++ return false;
++ }
++ }
++
+ public String resolve(File f) {
+ if (!booted)
+ return fs.resolve(f);
diff --git a/media-libs/libbluray/libbluray-1.3.1.ebuild b/media-libs/libbluray/libbluray-1.3.1.ebuild
index 9d617a0039d2..165a31b2189e 100644
--- a/media-libs/libbluray/libbluray-1.3.1.ebuild
+++ b/media-libs/libbluray/libbluray-1.3.1.ebuild
@@ -43,6 +43,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-jars.patch
+ "${FILESDIR}"/${PN}-1.3.1-Fix-build-failure-after-Oracle-Java-CPU-for-April-2022.patch
)
DOCS=( ChangeLog README.md )
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-06-20 2:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-03-04 13:37 [gentoo-commits] repo/gentoo:master commit in: media-libs/libbluray/, media-libs/libbluray/files/ Alexis Ballier
-- strict thread matches above, loose matches on Subject: below --
2019-04-14 20:02 James Le Cuirot
2022-06-20 2:53 Sam James
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox