* [gentoo-commits] repo/gentoo:master commit in: media-libs/libbluray/files/, media-libs/libbluray/
@ 2023-05-31 7:00 Sam James
0 siblings, 0 replies; 2+ messages in thread
From: Sam James @ 2023-05-31 7:00 UTC (permalink / raw
To: gentoo-commits
commit: 42b7cbe7735ec16f2bdc96d9b32beb55295904a8
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed May 31 06:19:00 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed May 31 06:56:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42b7cbe7
media-libs/libbluray: add 1.3.4
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-libs/libbluray/Manifest | 1 +
.../libbluray-1.3.4-fix-libudfread-option.patch | 25 ++++++++++++++++++++++
...ibbluray-9999.ebuild => libbluray-1.3.4.ebuild} | 23 ++++++++++++--------
media-libs/libbluray/libbluray-9999.ebuild | 23 ++++++++++++--------
4 files changed, 54 insertions(+), 18 deletions(-)
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 2ac879907a62..95fa461b1eb6 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1 +1,2 @@
DIST libbluray-1.3.3.tar.bz2 761335 BLAKE2B 3d17e686e363b0692b7d75596089ed12dbe46006738ea23f274b2992a541e6f1b0384ac2afc785359d94f652017284668c3a044db24ef6de5625575fca956bce SHA512 fc36b4eea43f430f5f774129bd5cf075ed0128433779ad0146d59cc87e9625f4b6c31098fed1f5754b84fd08d9c8044d8d43d78c5b9c07937878cf15f517ba6f
+DIST libbluray-1.3.4.tar.bz2 756323 BLAKE2B a53b10fca6f8c049b2771c137e8900c34127554e1ebdeeec825de470b751182163cb1ff79f6dae20d772ba15c9d6c70fe332080ab93f1a47cc5f863922d22723 SHA512 94dbf3b68d1c23fe4648c153cc2f0c251886fac0a6b6bbe3a77caabaa5322682f712afe4a7b6b16ca3f06744fbc0e1ca872209a32898dcf0ae182055d335aec1
diff --git a/media-libs/libbluray/files/libbluray-1.3.4-fix-libudfread-option.patch b/media-libs/libbluray/files/libbluray-1.3.4-fix-libudfread-option.patch
new file mode 100644
index 000000000000..906e92a6ec50
--- /dev/null
+++ b/media-libs/libbluray/files/libbluray-1.3.4-fix-libudfread-option.patch
@@ -0,0 +1,25 @@
+https://code.videolan.org/videolan/libbluray/-/merge_requests/44
+
+From c1550e5cfd92229373f4cb729e2320827b9d22a8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Wed, 31 May 2023 07:15:59 +0100
+Subject: [PATCH] configure.ac: Fix explicit --with-external-libudfread
+ handling
+
+We need "!= xno" [0] if we want the default to be *enabled*, otherwise passing
+--with-external-libudfread actually ends up disabling it.
+
+[0] https://www.gnu.org/software/autoconf/manual/autoconf-2.71/html_node/External-Software.html
+--- a/configure.ac
++++ b/configure.ac
+@@ -316,7 +316,7 @@ AM_CONDITIONAL([BDJ_J2SE], [ test x"$BDJ_TYPE" != x"j2me" ])
+ dnl bootclasspath
+ AC_SUBST(BDJ_BOOTCLASSPATH)
+
+-AS_IF([test "x$with_external_libudfread" = "xyes"], [
++AS_IF([test "x$with_external_libudfread" != "xno"], [
+ PKG_CHECK_MODULES([LIBUDFREAD], [libudfread >= 1.1.0],
+ [with_libudfread=yes
+ AC_DEFINE([HAVE_LIBUDFREAD], [1], [Define to 1 if external libudfread is to be used])
+--
+GitLab
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-1.3.4.ebuild
similarity index 76%
copy from media-libs/libbluray/libbluray-9999.ebuild
copy to media-libs/libbluray/libbluray-1.3.4.ebuild
index 9d617a0039d2..6445acaac890 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-1.3.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,7 +8,7 @@ if [[ ${PV#9999} != ${PV} ]] ; then
EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
else
SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
inherit autotools java-pkg-opt-2 multilib-minimal
@@ -21,7 +21,7 @@ SLOT="0/2"
IUSE="aacs bdplus +fontconfig java +truetype utils +xml"
RDEPEND="
- dev-libs/libudfread[${MULTILIB_USEDEP}]
+ >=dev-libs/libudfread-1.1.0[${MULTILIB_USEDEP}]
aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
@@ -43,6 +43,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-jars.patch
+ "${FILESDIR}"/${PN}-1.3.4-fix-libudfread-option.patch
)
DOCS=( ChangeLog README.md )
@@ -57,13 +58,17 @@ multilib_src_configure() {
# bug #621992
use java || unset JDK_HOME
- 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) \
+ local myeconfargs=(
+ --disable-optimizations
+ --with-external-libudfread
+ $(multilib_native_use_enable utils examples)
+ $(multilib_native_use_enable java bdjava-jar)
+ $(use_with fontconfig)
+ $(use_with truetype freetype)
$(use_with xml libxml2)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
multilib_src_install() {
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index 9d617a0039d2..6445acaac890 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -8,7 +8,7 @@ if [[ ${PV#9999} != ${PV} ]] ; then
EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
else
SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+ KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
fi
inherit autotools java-pkg-opt-2 multilib-minimal
@@ -21,7 +21,7 @@ SLOT="0/2"
IUSE="aacs bdplus +fontconfig java +truetype utils +xml"
RDEPEND="
- dev-libs/libudfread[${MULTILIB_USEDEP}]
+ >=dev-libs/libudfread-1.1.0[${MULTILIB_USEDEP}]
aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
@@ -43,6 +43,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-jars.patch
+ "${FILESDIR}"/${PN}-1.3.4-fix-libudfread-option.patch
)
DOCS=( ChangeLog README.md )
@@ -57,13 +58,17 @@ multilib_src_configure() {
# bug #621992
use java || unset JDK_HOME
- 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) \
+ local myeconfargs=(
+ --disable-optimizations
+ --with-external-libudfread
+ $(multilib_native_use_enable utils examples)
+ $(multilib_native_use_enable java bdjava-jar)
+ $(use_with fontconfig)
+ $(use_with truetype freetype)
$(use_with xml libxml2)
+ )
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
}
multilib_src_install() {
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/libbluray/files/, media-libs/libbluray/
@ 2024-04-02 18:03 Conrad Kostecki
0 siblings, 0 replies; 2+ messages in thread
From: Conrad Kostecki @ 2024-04-02 18:03 UTC (permalink / raw
To: gentoo-commits
commit: 09bc67c771063873e2fd458572bd05f9bea9d512
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Wed Mar 27 10:31:04 2024 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Tue Apr 2 18:00:43 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09bc67c7
media-libs/libbluray: no longer depend on deprecated ant-core
Closes: https://bugs.gentoo.org/916863
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../libbluray/files/libbluray-1.3.4-min-java.patch | 18 +++++++++++++++
...uray-1.3.4.ebuild => libbluray-1.3.4-r1.ebuild} | 26 ++++++++++++++--------
2 files changed, 35 insertions(+), 9 deletions(-)
diff --git a/media-libs/libbluray/files/libbluray-1.3.4-min-java.patch b/media-libs/libbluray/files/libbluray-1.3.4-min-java.patch
new file mode 100644
index 000000000000..2005cb29ca89
--- /dev/null
+++ b/media-libs/libbluray/files/libbluray-1.3.4-min-java.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -242,12 +242,12 @@ pkginclude_HEADERS = \
+ if USING_BDJAVA_BUILD_JAR
+
+ if USING_JAVAC_12
+-java_versions = -Djava_version_asm=1.7 -Djava_version_bdj=1.7
++java_versions = -Djava_version_asm=1.8 -Djava_version_bdj=1.8
+ else
+ if USING_JAVAC_9
+-java_versions = -Djava_version_asm=1.6 -Djava_version_bdj=1.6
++java_versions = -Djava_version_asm=1.8 -Djava_version_bdj=1.8
+ else
+-java_versions = -Djava_version_asm=1.5 -Djava_version_bdj=1.4
++java_versions = -Djava_version_asm=1.8 -Djava_version_bdj=1.8
+ endif
+ endif
+
diff --git a/media-libs/libbluray/libbluray-1.3.4.ebuild b/media-libs/libbluray/libbluray-1.3.4-r1.ebuild
similarity index 88%
rename from media-libs/libbluray/libbluray-1.3.4.ebuild
rename to media-libs/libbluray/libbluray-1.3.4-r1.ebuild
index 72bb75b8a06a..f087cc50c5a3 100644
--- a/media-libs/libbluray/libbluray-1.3.4.ebuild
+++ b/media-libs/libbluray/libbluray-1.3.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -20,28 +20,31 @@ LICENSE="LGPL-2.1"
SLOT="0/2"
IUSE="aacs bdplus +fontconfig java +truetype utils +xml"
-RDEPEND="
+COMMON_DEPEND="
>=dev-libs/libudfread-1.1.0[${MULTILIB_USEDEP}]
aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- java? ( >=virtual/jre-1.8:* )
truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
"
DEPEND="
- ${RDEPEND}
- java? ( >=virtual/jdk-1.8:* )
-"
-BDEPEND="
- virtual/pkgconfig
+ ${COMMON_DEPEND}
java? (
- dev-java/ant-core
+ >=dev-java/ant-1.10.14-r3:0
>=virtual/jdk-1.8:*
)
"
+RDEPEND="
+ ${COMMON_DEPEND}
+ java? ( >=virtual/jre-1.8:* )
+"
+BDEPEND="
+ virtual/pkgconfig
+"
PATCHES=(
+ "${FILESDIR}/libbluray-1.3.4-min-java.patch"
"${FILESDIR}"/${PN}-jars.patch
"${FILESDIR}"/${PN}-1.3.4-fix-libudfread-option.patch
)
@@ -51,6 +54,11 @@ DOCS=( ChangeLog README.md )
src_prepare() {
default
+ cat > src/libbluray/bdj/build.properties <<-EOF
+ java_version_asm=1.8
+ java_version_bdj=1.8
+ EOF
+
eautoreconf
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-04-02 18:03 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-31 7:00 [gentoo-commits] repo/gentoo:master commit in: media-libs/libbluray/files/, media-libs/libbluray/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-04-02 18:03 Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox