From c52351852fd1aa8c1bd11c1208283c170523663f Mon Sep 17 00:00:00 2001 From: bcallah Date: Sun, 24 Nov 2019 17:59:04 +0000 Subject: [PATCH] Update to libbluray-1.1.2 ok kmos@ --- multimedia/libbluray/Makefile | 7 ++-- multimedia/libbluray/distinfo | 4 +- .../libbluray/patches/patch-Makefile_in | 41 +++++++++---------- multimedia/libbluray/patches/patch-jni_jni_h | 16 ++++++++ multimedia/libbluray/pkg/PLIST | 4 +- 5 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 multimedia/libbluray/patches/patch-jni_jni_h diff --git a/multimedia/libbluray/Makefile b/multimedia/libbluray/Makefile index cbda634c88f..1797f99d477 100644 --- a/multimedia/libbluray/Makefile +++ b/multimedia/libbluray/Makefile @@ -1,11 +1,10 @@ -# $OpenBSD: Makefile,v 1.14 2019/07/12 20:47:56 sthen Exp $ +# $OpenBSD: Makefile,v 1.15 2019/11/24 17:59:04 bcallah Exp $ 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 diff --git a/multimedia/libbluray/distinfo b/multimedia/libbluray/distinfo index 43c36598207..556b7db4e89 100644 --- a/multimedia/libbluray/distinfo +++ b/multimedia/libbluray/distinfo @@ -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 diff --git a/multimedia/libbluray/patches/patch-Makefile_in b/multimedia/libbluray/patches/patch-Makefile_in index ca49f768ce9..cc35d96d359 100644 --- a/multimedia/libbluray/patches/patch-Makefile_in +++ b/multimedia/libbluray/patches/patch-Makefile_in @@ -1,4 +1,4 @@ -$OpenBSD: patch-Makefile_in,v 1.3 2017/08/29 13:16:23 ajacoutot Exp $ +$OpenBSD: patch-Makefile_in,v 1.4 2019/11/24 17:59:04 bcallah Exp $ - Allow libbluray to be able to find mount points using the getfsstat() API. - Remove setting _POSIX_C_SOURCE as that breaks building some of the BSD headers @@ -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 \ diff --git a/multimedia/libbluray/patches/patch-jni_jni_h b/multimedia/libbluray/patches/patch-jni_jni_h new file mode 100644 index 00000000000..d2cdb6a739f --- /dev/null +++ b/multimedia/libbluray/patches/patch-jni_jni_h @@ -0,0 +1,16 @@ +$OpenBSD: patch-jni_jni_h,v 1.1 2019/11/24 17:59:04 bcallah Exp $ + +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" { diff --git a/multimedia/libbluray/pkg/PLIST b/multimedia/libbluray/pkg/PLIST index 49e799fc2ba..f10b08ce68c 100644 --- a/multimedia/libbluray/pkg/PLIST +++ b/multimedia/libbluray/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.3 2015/05/22 12:38:28 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.4 2019/11/24 17:59:04 bcallah Exp $ @bin bin/bd_info include/libbluray/ include/libbluray/bluray-version.h @@ -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