gentoo auto-resync : 31:05:2023 - 09:23:01

4 files changed, 133 insertions, 10 deletions

diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 6da3f49fa2cc..6b469d525981 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,5 +1,8 @@
+AUX libbluray-1.3.4-fix-libudfread-option.patch 1000 BLAKE2B e4096c638bcb5f633338f9149bea37e3a9a27759858f987e42603f55162cce511c6aa7be0a93490a1ec07b81aab44600cfc3ab311b97a8eb317851ad427fa2d4 SHA512 e276d55066c8777e527715b8fb3c5500962c73f664934d034cdd04555a7f2f54e5683a4bbe9a0bcde5cd3ab07f14c8ccdbd4434e598379367ca6de8d3132fea9
 AUX libbluray-jars.patch 1371 BLAKE2B 1c32115ec03db19b849248bcdbe4b9868527717b279d9222ad94bf4c3875522db75ba585566b0609d1a27cbd4e25066832b19351acf05f5b00295ed5364c2984 SHA512 2b376149680edf6891f2129de2fc074dfc32a236d8eb19b3d899e1f7d3ac98eaf8cdf6e13c7b548ab59354c558e2c149f06d85c1c5be61c5e05cc5ec4382d86d
 DIST libbluray-1.3.3.tar.bz2 761335 BLAKE2B 3d17e686e363b0692b7d75596089ed12dbe46006738ea23f274b2992a541e6f1b0384ac2afc785359d94f652017284668c3a044db24ef6de5625575fca956bce SHA512 fc36b4eea43f430f5f774129bd5cf075ed0128433779ad0146d59cc87e9625f4b6c31098fed1f5754b84fd08d9c8044d8d43d78c5b9c07937878cf15f517ba6f
+DIST libbluray-1.3.4.tar.bz2 756323 BLAKE2B a53b10fca6f8c049b2771c137e8900c34127554e1ebdeeec825de470b751182163cb1ff79f6dae20d772ba15c9d6c70fe332080ab93f1a47cc5f863922d22723 SHA512 94dbf3b68d1c23fe4648c153cc2f0c251886fac0a6b6bbe3a77caabaa5322682f712afe4a7b6b16ca3f06744fbc0e1ca872209a32898dcf0ae182055d335aec1
 EBUILD libbluray-1.3.3.ebuild 1973 BLAKE2B 03bacb45203eb918a4248642aebe07b9a9f785d7ea684884a8293de7060e6797eda689773395bfbbb516d594286e4467e47fea0c9c34f24d45eea2567099b451 SHA512 a9393e635f52c68c71777b5dd91e682ac2c9a57f22f06d5469f4fa0667984a54781db6fa92d9d6385040aa70f9459e5e42052f47b691ae1aeb013939063a187f
-EBUILD libbluray-9999.ebuild 1967 BLAKE2B 6c0d9471ffb0d0e1ddbcab410042d136e5d23455a97e5ed024d027b232001c6e1cfd1aefdc7bc4039004d695ed69649e8695b59418a186a921696666929124f6 SHA512 1cd12292d1918822e668961c233a7b8ffaea9216e64618c903666dc0fcf34f3858bceb3dad3cd2ae7193134b6f303efec57a14fa05a4f0e12d1cacec7c76f4e1
+EBUILD libbluray-1.3.4.ebuild 2105 BLAKE2B aa288ed9b8672e8916d416827df63be1429485e8f5977b1bffe2ffc8198421006e11bc7976bb11327276aace2defe4cc542aa55b651953f343e1fcc56950bbe7 SHA512 43093efddcbc85e1b16a9c52cdc843f1ed9a44b93dfd8b3db53aaac112f0d78bc76d443a28d22ba13b8673a65f36c8b70335744f7f87c74b17282947e63ec7c7
+EBUILD libbluray-9999.ebuild 2105 BLAKE2B aa288ed9b8672e8916d416827df63be1429485e8f5977b1bffe2ffc8198421006e11bc7976bb11327276aace2defe4cc542aa55b651953f343e1fcc56950bbe7 SHA512 43093efddcbc85e1b16a9c52cdc843f1ed9a44b93dfd8b3db53aaac112f0d78bc76d443a28d22ba13b8673a65f36c8b70335744f7f87c74b17282947e63ec7c7
 MISC metadata.xml 541 BLAKE2B 5a2652471709a6c8784f756ad2d5c9bbfd1611637fede987c298e1b4588ddab74346ac0d607c36bc3fa662a1e80287d2dd9963019b52daad9cd3ac2f0ecff02f SHA512 70349aab49af818166f114ed16c0eaf4264e548e8f204d636da57086b68a17f42a6b119a2533a5fb9f6a60dc3c3a9948910536f4eaecb1a75e682d439b12d558
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-1.3.4.ebuild b/media-libs/libbluray/libbluray-1.3.4.ebuild
new file mode 100644
index 000000000000..6445acaac890
--- /dev/null
+++ b/media-libs/libbluray/libbluray-1.3.4.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV#9999} != ${PV} ]] ; then
+	inherit git-r3
+	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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit autotools java-pkg-opt-2 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 +truetype utils +xml"
+
+RDEPEND="
+	>=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
+	java? (
+		dev-java/ant-core
+		>=virtual/jdk-1.8:*
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-jars.patch
+	"${FILESDIR}"/${PN}-1.3.4-fix-libudfread-option.patch
+)
+
+DOCS=( ChangeLog README.md )
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	# bug #621992
+	use java || unset JDK_HOME
+
+	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() {
+	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 "${ED}" -name '*.la' -delete || die
+}
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() {