diff --git a/multimedia/libbluray/Makefile b/multimedia/libbluray/Makefile index c2909af5b71b..898016b40ad3 100644 --- a/multimedia/libbluray/Makefile +++ b/multimedia/libbluray/Makefile @@ -1,54 +1,54 @@ PORTNAME= libbluray -DISTVERSION= 1.3.1 +DISTVERSION= 1.3.3 PORTEPOCH= 1 CATEGORIES= multimedia MASTER_SITES= https://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION}/ MAINTAINER= ports@FreeBSD.org COMMENT= Blu-Ray discs playback library for media players WWW= https://www.videolan.org/developers/libbluray.html LICENSE= LGPL21 LIB_DEPENDS= libfreetype.so:print/freetype2 \ libfontconfig.so:x11-fonts/fontconfig USES= cpe gnome libtool pathfix pkgconfig tar:bzip2 USE_GNOME= libxml2 USE_LDCONFIG= yes CPE_VENDOR= videolan GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-doxygen-doc --disable-optimizations --disable-static CONFIGURE_ENV= PACKAGES="" # Bug #226009 INSTALL_TARGET= install-strip OPTIONS_DEFINE= JAVA OPTIONS_SUB= yes JAVA_DESC= Enable Blu-Ray Java support JAVA_CATEGORIES= java JAVA_BUILD_DEPENDS= ant:devel/apache-ant JAVA_CONFIGURE_ENABLE= bdjava-jar JAVA_CONFIGURE_WITH= java9 .include .if ${PORT_OPTIONS:MJAVA} USE_JAVA= yes JAVA_VERSION= 8 JAVA_BUILD= yes MAKE_ENV= JAVA_HOME=${JAVA_HOME} \ PATH=${JAVA_HOME}/bin:${PATH} .endif post-patch: @${RLN} ${WRKSRC}/jni/linux ${WRKSRC}/jni/freebsd @${REINPLACE_CMD} -e 's|/usr/share|${LOCALBASE}/share|' ${WRKSRC}/src/libbluray/bdj/bdj.c .include diff --git a/multimedia/libbluray/distinfo b/multimedia/libbluray/distinfo index 00500b73de3b..755a1a6022ce 100644 --- a/multimedia/libbluray/distinfo +++ b/multimedia/libbluray/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1653163455 -SHA256 (libbluray-1.3.1.tar.bz2) = c24b0f41c5b737bbb65c544fe63495637a771c10a519dfc802e769f112b43b75 -SIZE (libbluray-1.3.1.tar.bz2) = 754867 +TIMESTAMP = 1663691929 +SHA256 (libbluray-1.3.3.tar.bz2) = 58ff52cdcee64c55dcc3c777a1c39fb41abd951b927978e4d2b6811b9193a488 +SIZE (libbluray-1.3.3.tar.bz2) = 761335 diff --git a/multimedia/libbluray/files/patch-src_file_mount__getfsstat.c b/multimedia/libbluray/files/patch-src_file_mount__getfsstat.c new file mode 100644 index 000000000000..1269a9f7cd38 --- /dev/null +++ b/multimedia/libbluray/files/patch-src_file_mount__getfsstat.c @@ -0,0 +1,10 @@ +--- src/file/mount_getfsstat.c.orig 2022-09-19 14:16:13 UTC ++++ src/file/mount_getfsstat.c +@@ -28,6 +28,7 @@ + #include + #include + ++#define __BSD_VISIBLE 1 + #include + #include + #ifdef HAVE_GETFSSTAT diff --git a/multimedia/libbluray/files/patch-src_libbluray_bdj_java_java_io_BDFileSystem.java b/multimedia/libbluray/files/patch-src_libbluray_bdj_java_java_io_BDFileSystem.java deleted file mode 100644 index 114dbf7fdfe5..000000000000 --- a/multimedia/libbluray/files/patch-src_libbluray_bdj_java_java_io_BDFileSystem.java +++ /dev/null @@ -1,20 +0,0 @@ ---- src/libbluray/bdj/java/java/io/BDFileSystem.java.orig 2022-03-03 17:05:27 UTC -+++ src/libbluray/bdj/java/java/io/BDFileSystem.java -@@ -227,6 +227,17 @@ public abstract class BDFileSystem extends FileSystem - return fs.isAbsolute(f); - } - -+ public boolean isInvalid(File f) { -+ try { -+ Method m = fs.getClass().getDeclaredMethod("isInvalid", new Class[] { File.class }); -+ Object[] args = new Object[] {(Object)f}; -+ Boolean result = (Boolean)m.invoke(fs, args); -+ return result.booleanValue(); -+ } finally { -+ return false; -+ } -+ } -+ - public String resolve(File f) { - if (!booted) - return fs.resolve(f); diff --git a/multimedia/libbluray/pkg-plist b/multimedia/libbluray/pkg-plist index be2429ea31cf..6beea8e6a19b 100644 --- a/multimedia/libbluray/pkg-plist +++ b/multimedia/libbluray/pkg-plist @@ -1,18 +1,18 @@ bin/bd_info bin/bd_list_titles bin/bd_splice include/libbluray/bluray-version.h include/libbluray/bluray.h include/libbluray/clpi_data.h include/libbluray/filesystem.h include/libbluray/keys.h include/libbluray/log_control.h 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.1 +lib/libbluray.so.2.4.2 libdata/pkgconfig/libbluray.pc -%%JAVA%%%%JAVASHAREDIR%%/libbluray-j2se-1.3.1.jar -%%JAVA%%%%JAVASHAREDIR%%/libbluray-awt-j2se-1.3.1.jar +%%JAVA%%%%JAVASHAREDIR%%/libbluray-awt-j2se-1.3.3.jar +%%JAVA%%%%JAVASHAREDIR%%/libbluray-j2se-1.3.3.jar