commit: 26c35af64216fec77882c6aa05de2a3856103dd3
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 05:18:06 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 05:27:55 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26c35af6
media-libs/libbluray: add 1.3.1
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/libbluray/Manifest | 1 +
...libbluray-9999.ebuild => libbluray-1.3.1.ebuild} | 21 ++++++++++++---------
media-libs/libbluray/libbluray-9999.ebuild | 21 ++++++++++++---------
3 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 1894f9864c1a..05e297142fd4 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,3 +1,4 @@
DIST libbluray-1.2.0.tar.bz2 747265 BLAKE2B
d9f0d1c321faa9008431b17aecba495e44d2795cea2973f9772b5be2c0193af53e3c947b9dd0b2d4d22c4085e163461252f895618e98491184d85eb7fbf5bd54
SHA512
d10413b6b86ff2d2e7c4b0103546f2142727cc5209ddb7b227aa74e27384f2e0b9abee37bf8ccc5b0cdfcaeebfb0669cf20903a247df278a8ad6dbd27469d324
DIST libbluray-1.2.1.tar.bz2 751063 BLAKE2B
af353e03a70b0202776c2190d927506225bbe1147fe5bfb19039839f5d82d0beb4fd7c2813a9ce10a2bc6f9d07e2a2080b54f1442e02e5f8e72564a5bcaf0a2a
SHA512
e9eeee433034266e88c05ae3469c0bd2bf700d7f16e17ad706f48426c143c823e83c16ab79a637f1e85e4eb858aa0577630671f87ba35d179db2a1d8bc8545c4
DIST libbluray-1.3.0.tar.bz2 754069 BLAKE2B
d4c699ce28d2e5b1d4dda461a1359d3a446afe72368e9d76066ca4d5c49d1f24b4bcec307608d96913d0c668168a86267416b9db37ad942628c2926b79ec47d9
SHA512
3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc
+DIST libbluray-1.3.1.tar.bz2 754867 BLAKE2B
471963bc5b77f9da31c2ad900e7bbb1528943d2341aa4f12471e5d9a0db6964e62e917c4f19e29115c8c129bb7f8730780b44dbb1c8939c94c686f39d8521fe8
SHA512
f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a
diff --git a/media-libs/libbluray/libbluray-9999.ebuild
b/media-libs/libbluray/libbluray-1.3.1.ebuild
similarity index 83%
copy from media-libs/libbluray/libbluray-9999.ebuild
copy to media-libs/libbluray/libbluray-1.3.1.ebuild
index 6781e565d5d8..f3cc6ff95a5f 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-1.3.1.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-if [[ "${PV#9999}" != "${PV}" ]] ; then
+if [[ ${PV#9999} != ${PV} ]] ; then
inherit git-r3
EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git";
else
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2";
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
-inherit autotools java-pkg-opt-2 flag-o-matic multilib-minimal
+inherit autotools java-pkg-opt-2 multilib-minimal
DESCRIPTION="Blu-ray playback libraries"
HOMEPAGE="https://www.videolan.org/developers/libbluray.html";
@@ -45,15 +45,17 @@ PATCHES=(
"${FILESDIR}"/${PN}-jars.patch
)
-DOCS=( ChangeLog README.txt )
+DOCS=( ChangeLog README.md )
src_prepare() {
default
+
eautoreconf
}
multilib_src_configure() {
- use java || unset JDK_HOME # Bug #621992.
+ # bug #621992
+ use java || unset JDK_HOME
ECONF_SOURCE="${S}" econf \
--disable-optimizations \
@@ -67,17 +69,18 @@ multilib_src_configure() {
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
+ use java && java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
}
multilib_src_install_all() {
einstalldocs
+
find "${ED}" -name '*.la' -delete || die
}
diff --git a/media-libs/libbluray/libbluray-9999.ebuild
b/media-libs/libbluray/libbluray-9999.ebuild
index 6781e565d5d8..f3cc6ff95a5f 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -1,17 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
-if [[ "${PV#9999}" != "${PV}" ]] ; then
+if [[ ${PV#9999} != ${PV} ]] ; then
inherit git-r3
EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git";
else
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2";
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
-inherit autotools java-pkg-opt-2 flag-o-matic multilib-minimal
+inherit autotools java-pkg-opt-2 multilib-minimal
DESCRIPTION="Blu-ray playback libraries"
HOMEPAGE="https://www.videolan.org/developers/libbluray.html";
@@ -45,15 +45,17 @@ PATCHES=(
"${FILESDIR}"/${PN}-jars.patch
)
-DOCS=( ChangeLog README.txt )
+DOCS=( ChangeLog README.md )
src_prepare() {
default
+
eautoreconf
}
multilib_src_configure() {
- use java || unset JDK_HOME # Bug #621992.
+ # bug #621992
+ use java || unset JDK_HOME
ECONF_SOURCE="${S}" econf \
--disable-optimizations \
@@ -67,17 +69,18 @@ multilib_src_configure() {
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
+ use java && java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
}
multilib_src_install_all() {
einstalldocs
+
find "${ED}" -name '*.la' -delete || die
}
