Date: Thu, 23 Oct 2025 18:45:30 GMT From: Daniel Engberg <diizzy@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 21344cbafe22 - main - multimedia/libbluray: Update to 1.4.0 Message-ID: <202510231845.59NIjUCO078472@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=21344cbafe22aa19c037b966332793e476f6bdc5 commit 21344cbafe22aa19c037b966332793e476f6bdc5 Author: Daniel Engberg <diizzy@FreeBSD.org> AuthorDate: 2025-10-22 20:04:27 +0000 Commit: Daniel Engberg <diizzy@FreeBSD.org> CommitDate: 2025-10-23 18:44:46 +0000 multimedia/libbluray: Update to 1.4.0 * Switch to meson * Require at least Java 11 PR: 289893 Approved by: maintainer timeout, 2+ weeks --- multimedia/libbluray/Makefile | 30 ++++++++-------------- multimedia/libbluray/distinfo | 6 ++--- .../files/patch-src_libbluray_bdj_build.xml | 29 --------------------- multimedia/libbluray/pkg-plist | 8 +++--- 4 files changed, 17 insertions(+), 56 deletions(-) diff --git a/multimedia/libbluray/Makefile b/multimedia/libbluray/Makefile index d6aa5b348c4d..53e76000a463 100644 --- a/multimedia/libbluray/Makefile +++ b/multimedia/libbluray/Makefile @@ -1,6 +1,5 @@ PORTNAME= libbluray -DISTVERSION= 1.3.4 -PORTREVISION= 1 +DISTVERSION= 1.4.0 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= https://get.videolan.org/${PORTNAME}/${DISTVERSION}/ \ @@ -13,35 +12,26 @@ WWW= https://www.videolan.org/developers/libbluray.html LICENSE= LGPL21 LIB_DEPENDS= libfreetype.so:print/freetype2 \ - libfontconfig.so:x11-fonts/fontconfig + libfontconfig.so:x11-fonts/fontconfig \ + libudfread.so:multimedia/libudfread -USES= cpe gnome libtool pathfix pkgconfig tar:bzip2 +USES= cpe gnome meson pkgconfig tar:xz CPE_VENDOR= videolan USE_GNOME= libxml2 USE_LDCONFIG= yes -GNU_CONFIGURE= yes - -CONFIGURE_ARGS= --disable-doxygen-doc --disable-optimizations --disable-static -CONFIGURE_ENV= PACKAGES="" # Bug #226009 - -INSTALL_TARGET= install-strip +MESON_ARGS= -Ddefault_library=shared -Dembed_udfread=false OPTIONS_DEFINE= JAVA OPTIONS_SUB= yes JAVA_DESC= Enable Blu-Ray Java support -JAVA_CATEGORIES= java -JAVA_BUILD_DEPENDS= ant:devel/apache-ant +JAVA_MESON_ENABLED= bdj_jar +JAVA_MESON_TRUE= java9 + +JAVA_BUILD_DEPENDS= ant:devel/apache-ant JAVA_USES= java:build -JAVA_CONFIGURE_ENABLE= bdjava-jar -JAVA_CONFIGURE_WITH= java9 -JAVA_MAKE_ENV= JAVA_HOME=${JAVA_HOME} \ - PATH=${JAVA_HOME}/bin:${PATH} -JAVA_VARS= JAVA_VERSION=8 - -pre-build: - @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' ${WRKSRC}/src/libbluray/bdj/bdj.c +JAVA_VERSION= 11+ .include <bsd.port.mk> diff --git a/multimedia/libbluray/distinfo b/multimedia/libbluray/distinfo index 3f39a54d2869..0504d47cd4b1 100644 --- a/multimedia/libbluray/distinfo +++ b/multimedia/libbluray/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670573236 -SHA256 (libbluray-1.3.4.tar.bz2) = 478ffd68a0f5dde8ef6ca989b7f035b5a0a22c599142e5cd3ff7b03bbebe5f2b -SIZE (libbluray-1.3.4.tar.bz2) = 756323 +TIMESTAMP = 1759071639 +SHA256 (libbluray-1.4.0.tar.xz) = 77937baf07eadda4b2b311cf3af4c50269d2ea3165041f5843d96476c4c92777 +SIZE (libbluray-1.4.0.tar.xz) = 458580 diff --git a/multimedia/libbluray/files/patch-src_libbluray_bdj_build.xml b/multimedia/libbluray/files/patch-src_libbluray_bdj_build.xml deleted file mode 100644 index 093c16f2a34f..000000000000 --- a/multimedia/libbluray/files/patch-src_libbluray_bdj_build.xml +++ /dev/null @@ -1,29 +0,0 @@ ---- src/libbluray/bdj/build.xml.orig 2020-11-09 05:36:04 UTC -+++ src/libbluray/bdj/build.xml -@@ -8,10 +8,9 @@ - <property name="dist" location="../../.libs"/> - <property name="src_awt" value=""/> - <property name="src_asm" value="../../../contrib/asm/src/"/> -- <property name="bootclasspath" value=""/> - <property name="version" value=""/> -- <property name="java_version_asm" value="1.5"/> -- <property name="java_version_bdj" value="1.4"/> -+ <property name="java_version_asm" value="1.6"/> -+ <property name="java_version_bdj" value="1.6"/> - - <target name="init"> - <tstamp/> -@@ -22,13 +21,11 @@ - <target name="compile" depends="init" - description="compile the source " > - <javac srcdir="${src_asm}" destdir="${build}" debug="yes" -- bootclasspath="${bootclasspath}" - source="${java_version_asm}" target="${java_version_asm}"> - <compilerarg value="-XDignore.symbol.file"/> - <compilerarg value="-Xlint:-deprecation"/> - </javac> - <javac srcdir="${src}${src_awt}" destdir="${build}" debug="yes" -- bootclasspath="${bootclasspath}" - source="${java_version_bdj}" target="${java_version_bdj}"> - <compilerarg value="-XDignore.symbol.file"/> - <compilerarg value="-Xlint:-deprecation"/> diff --git a/multimedia/libbluray/pkg-plist b/multimedia/libbluray/pkg-plist index 10717ad3bc79..278c1448de7e 100644 --- a/multimedia/libbluray/pkg-plist +++ b/multimedia/libbluray/pkg-plist @@ -11,8 +11,8 @@ include/libbluray/meta_data.h include/libbluray/overlay.h include/libbluray/player_settings.h lib/libbluray.so -lib/libbluray.so.2 -lib/libbluray.so.2.4.3 +lib/libbluray.so.3 +lib/libbluray.so.3.0.0 libdata/pkgconfig/libbluray.pc -%%JAVA%%%%JAVASHAREDIR%%/libbluray-awt-j2se-1.3.4.jar -%%JAVA%%%%JAVASHAREDIR%%/libbluray-j2se-1.3.4.jar +%%JAVA%%%%JAVASHAREDIR%%/libbluray-awt-j2se-1.4.0.jar +%%JAVA%%%%JAVASHAREDIR%%/libbluray-j2se-1.4.0.jarhome | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202510231845.59NIjUCO078472>