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 }
