On 2019-11-10 4:49 PM, Brian Callahan wrote:
Hi ports --
Attached is an update for libbluray. Needed for an update to HandBrake.
Passes the build test on amd64.
OK?
~Brian
Ping. Diff reattached due to infrastructure changes.
Again, all consumers are happy with this; needed for an update to handbrake.
~Brian
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/libbluray/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile 12 Jul 2019 20:47:56 -0000 1.14
+++ Makefile 23 Nov 2019 14:18:13 -0000
@@ -2,10 +2,9 @@
COMMENT = library supporting Blu-ray playback
-V = 1.0.0
+V = 1.1.2
DISTNAME = libbluray-${V}
CATEGORIES = multimedia
-REVISION = 0
HOMEPAGE = http://www.videolan.org/developers/libbluray.html
@@ -28,7 +27,7 @@ BUILD_DEPENDS = devel/bison
SEPARATE_BUILD = Yes
CONFIGURE_STYLE = gnu
YACC = ${LOCALBASE}/bin/bison -y
-CONFIGURE_ARGS += --disable-bdjava \
+CONFIGURE_ARGS += --disable-bdjava-jar \
--disable-doxygen-doc \
--disable-optimizations
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/libbluray/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 29 Aug 2017 13:16:23 -0000 1.6
+++ distinfo 23 Nov 2019 14:18:13 -0000
@@ -1,2 +1,2 @@
-SHA256 (libbluray-1.0.0.tar.bz2) = 9+Ot0zXHu+9Fgk/NIkmpvyk4aFmME/hHk1LETslTdMw=
-SIZE (libbluray-1.0.0.tar.bz2) = 713973
+SHA256 (libbluray-1.1.2.tar.bz2) = o91FIjmxANydoNAbMOFpJpPiozKn0pkXv4S7EOp8C0I=
+SIZE (libbluray-1.1.2.tar.bz2) = 745779
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/multimedia/libbluray/patches/patch-Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile_in
--- patches/patch-Makefile_in 29 Aug 2017 13:16:23 -0000 1.3
+++ patches/patch-Makefile_in 23 Nov 2019 14:18:13 -0000
@@ -14,23 +14,22 @@ Index: Makefile.in
-@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/mount.c
+@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/mount_darwin.c
- @ENABLE_UDF_TRUE@am__append_4 = \
- @ENABLE_UDF_TRUE@ src/libbluray/disc/udf_fs.h \
-@@ -359,7 +359,7 @@ am__dirstamp = $(am__leading_dot)dirstamp
- @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/dirs_xdg.lo \
- @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/dl_posix.lo \
- @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/file_posix.lo \
--@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/mount.lo
-+@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/mount_darwin.lo
- @ENABLE_UDF_TRUE@am__objects_4 = src/libbluray/disc/udf_fs.lo \
- @ENABLE_UDF_TRUE@ contrib/libudfread/src/default_blockinput.lo \
- @ENABLE_UDF_TRUE@ contrib/libudfread/src/ecma167.lo \
-@@ -772,7 +772,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-bdjava --enable-u
- MOSTLYCLEANFILES = $(DX_CLEANFILES)
- @ENABLE_UDF_FALSE@POSIX_C_SOURCE = 200112L
- @ENABLE_UDF_TRUE@POSIX_C_SOURCE = 200809L
--SET_FEATURES = -D_ISOC99_SOURCE -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE) -D_REENTRANT
-+SET_FEATURES = -D_ISOC99_SOURCE -D_REENTRANT
- SET_INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/src/libbluray -I$(top_builddir)/src/libbluray $(BDJAVA_CFLAGS)
- AM_CFLAGS = -std=c99 $(SET_FEATURES) $(SET_INCLUDES) $(LIBXML2_CFLAGS) \
- $(FT2_CFLAGS) $(FONTCONFIG_CFLAGS) $(UDF_CFLAGS) \
+ @USING_EXAMPLES_TRUE@noinst_PROGRAMS = bdj_test$(EXEEXT) \
+ @USING_EXAMPLES_TRUE@ bdjo_dump$(EXEEXT) bdsplice$(EXEEXT) \
+@@ -327,7 +327,7 @@ am__dirstamp = $(am__leading_dot)dirstamp
+ @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/libbluray_la-dirs_xdg.lo \
+ @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/libbluray_la-dl_posix.lo \
+ @HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/libbluray_la-file_posix.lo \
+-@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/libbluray_la-mount.lo
++@HAVE_DARWIN_FALSE@@HAVE_WIN32_FALSE@ src/file/libbluray_la-mount_darwin.lo
+ am_libbluray_la_OBJECTS = src/file/libbluray_la-file.lo \
+ src/file/libbluray_la-filesystem.lo \
+ src/libbluray/libbluray_la-bluray.lo \
+@@ -845,7 +845,6 @@ AM_CFLAGS = \
+
+ AM_CPPFLAGS = \
+ -D_ISOC99_SOURCE \
+- -D_POSIX_C_SOURCE=$(POSIX_C_SOURCE) \
+ -D_REENTRANT \
+ \
+ -I$(top_srcdir)/src \
Index: patches/patch-jni_jni_h
===================================================================
RCS file: patches/patch-jni_jni_h
diff -N patches/patch-jni_jni_h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-jni_jni_h 23 Nov 2019 14:18:13 -0000
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Point to a real file
+
+Index: jni/jni.h
+--- jni/jni.h.orig
++++ jni/jni.h
+@@ -43,7 +43,7 @@
+ /* jni_md.h contains the machine-dependent typedefs for jbyte, jint
+ and jlong */
+
+-#include "jni_md.h"
++#include "netbsd/jni_md.h"
+
+ #ifdef __cplusplus
+ extern "C" {
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/libbluray/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 22 May 2015 12:38:28 -0000 1.3
+++ pkg/PLIST 23 Nov 2019 14:18:13 -0000
@@ -10,7 +10,7 @@ include/libbluray/log_control.h
include/libbluray/meta_data.h
include/libbluray/overlay.h
include/libbluray/player_settings.h
-lib/libbluray.a
+@static-lib lib/libbluray.a
lib/libbluray.la
@lib lib/libbluray.so.${LIBbluray_VERSION}
lib/pkgconfig/libbluray.pc
