Merge commit 'bb5bc108ec695889855f06df338958004ff289ef'

Author: Sibras

.gitignore

@@ -25,11 +25,11 @@ libtool
 .deps
 .libs
 src/libbluray/bluray-version.h
-bdsplice
+bd_splice
 clpi_dump
 index_dump
 libbluray_test
-list_titles
+bd_list_titles
 mobj_dump
 mpls_dump
 sound_dump

.gitlab-ci.yml

@@ -31,7 +31,7 @@ build-macos:
         - curl -sS -O https://artifacts.videolan.org/vlc/macos-x86_64/$CONTRIB_TARBALL
         - tar xf "$CONTRIB_TARBALL"
         - cd x86_64-apple-darwin19
-        - curl -sS -o ./change_prefix.sh 'https://git.videolan.org/?p=vlc.git;a=blob_plain;f=contrib/src/change_prefix.sh;hb=HEAD'
+        - curl -sS -o ./change_prefix.sh 'https://code.videolan.org/videolan/vlc/-/raw/master/contrib/src/change_prefix.sh'
         - chmod +x ./change_prefix.sh
         - ./change_prefix.sh
         - export PKG_CONFIG_PATH="$PKG_CONFIG_PATH:`pwd -P`/lib/pkgconfig/"
@@ -56,7 +56,7 @@ build-win64:
         - wget -nv https://artifacts.videolan.org/vlc/win64/$CONTRIB_TARBALL
         - tar xf "$CONTRIB_TARBALL"
         - cd x86_64-w64-mingw32
-        - wget -nv -O ./change_prefix.sh 'https://git.videolan.org/?p=vlc.git;a=blob_plain;f=contrib/src/change_prefix.sh;hb=HEAD'
+        - wget -nv -O ./change_prefix.sh 'https://code.videolan.org/videolan/vlc/-/raw/master/contrib/src/change_prefix.sh'
         - chmod +x ./change_prefix.sh
         - ./change_prefix.sh
         - cd ..
@@ -80,7 +80,7 @@ build-win32:
         - wget -nv https://artifacts.videolan.org/vlc/win32/$CONTRIB_TARBALL
         - tar xf "$CONTRIB_TARBALL"
         - cd i686-w64-mingw32
-        - wget -nv -O ./change_prefix.sh 'https://git.videolan.org/?p=vlc.git;a=blob_plain;f=contrib/src/change_prefix.sh;hb=HEAD'
+        - wget -nv -O ./change_prefix.sh 'https://code.videolan.org/videolan/vlc/-/raw/master/contrib/src/change_prefix.sh'
         - chmod +x ./change_prefix.sh
         - ./change_prefix.sh
         - cd ..

ChangeLog

@@ -1,3 +1,10 @@
+2022-11-25: Version 1.3.4
+- Improve API documentation.
+- Improve JVM probing.
+- Improve support for FreeBSD and Solaris.
+- Improve .jar file search.
+- Add configure option to build without external libudfread.
+
 2022-09-19: Version 1.3.3
 - Initial support for Java 18.
 - Add support for OpenBSD operating system.

Makefile.am

@@ -11,7 +11,6 @@ EXTRA_DIST = \
 	ChangeLog \
 	COPYING \
 	doc \
-	player_wrappers \
 	README.md \
 	src/libbluray/bdj/build.xml \
 	src/libbluray/bdj/java \

configure.ac

@@ -1,7 +1,7 @@
 dnl library version number
 m4_define([bluray_major], 1)
 m4_define([bluray_minor], 3)
-m4_define([bluray_micro], 3)
+m4_define([bluray_micro], 4)
 m4_define([bluray_version],[bluray_major.bluray_minor.bluray_micro])
 
 dnl shared library version (.so version)
@@ -13,11 +13,11 @@ dnl
 dnl Library file name will be libbluray.so.(current-age).age.revision
 dnl
 m4_define([lt_current],  6)
-m4_define([lt_revision], 2)
+m4_define([lt_revision], 3)
 m4_define([lt_age],      4)
 
 dnl initilization
-AC_INIT([libbluray], bluray_version, [http://www.videolan.org/developers/libbluray.html])
+AC_INIT([libbluray],[bluray_version],[http://www.videolan.org/developers/libbluray.html])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_HOST
@@ -58,7 +58,11 @@ case "${host_os}" in
     ;;
   freebsd*)
     SYS=freebsd
-    CFLAGS="${CFLAGS} -D_XOPEN_SOURCE=700"
+    CFLAGS="${CFLAGS} -D__BSD_VISIBLE=1 -D__XSI_VISIBLE=1"
+    ;;
+  solaris*)
+    SYS=solaris
+    CFLAGS="${CFLAGS} -D__EXTENSIONS__"
     ;;
   *)
     SYS="${host_os}"
@@ -128,18 +132,21 @@ AC_ARG_WITH([bdj-bootclasspath],
 AC_ARG_WITH([java9],
   [AS_HELP_STRING([--with-java9], [build with Java 9+ (drop support for Java <1.6) @<:@default=without@:>@])])
 
+AC_ARG_WITH([external-libudfread],
+  [AS_HELP_STRING([--without-external-libudfread],
+  [build without external libudfread @<:@default=with@:>@])],
+  [with_external_libudfread=$withwal],
+  [with_external_libudfread=yes])
+
 dnl required programs
 AC_PROG_CC
 AM_PROG_CC_C_O
 m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
-AC_PROG_LIBTOOL
-
-dnl required types
-AC_TYPE_SIGNAL
+LT_INIT
 
 dnl required headers
 AC_CHECK_HEADERS([stdarg.h sys/types.h dirent.h errno.h libgen.h malloc.h])
-AC_CHECK_HEADERS([stdlib.h mntent.h linux/cdrom.h inttypes.h strings.h])
+AC_CHECK_HEADERS([stdlib.h mntent.h inttypes.h strings.h])
 AC_CHECK_HEADERS([sys/time.h time.h mntent.h])
 
 dnl required structures
@@ -309,11 +316,14 @@ AM_CONDITIONAL([BDJ_J2SE], [ test x"$BDJ_TYPE" != x"j2me" ])
 dnl bootclasspath
 AC_SUBST(BDJ_BOOTCLASSPATH)
 
-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])
-     PACKAGES="$PACKAGES libudfread >= 1.1.0"
-    ],[
+AS_IF([test "x$with_external_libudfread" = "xyes"], [
+    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])
+         PACKAGES="$PACKAGES libudfread >= 1.1.0"
+        ],[break;])
+])
+AS_IF([test "x$with_libudfread" != "xyes"], [
      dnl udf support (using git submodule)
      with_libudfread=no
      AS_IF([test ! -f "${srcdir}/contrib/libudfread/src/udfread.h"], [AC_MSG_ERROR("libudfread source tree not found")])

contrib/asm/src/org/objectweb/asm/Opcodes.java

@@ -146,13 +146,13 @@ public interface Opcodes {
      */
     int F_SAME1 = 4;
 
-    Integer TOP = new Integer(0);
-    Integer INTEGER = new Integer(1);
-    Integer FLOAT = new Integer(2);
-    Integer DOUBLE = new Integer(3);
-    Integer LONG = new Integer(4);
-    Integer NULL = new Integer(5);
-    Integer UNINITIALIZED_THIS = new Integer(6);
+    Integer TOP = Integer.valueOf(0);
+    Integer INTEGER = Integer.valueOf(1);
+    Integer FLOAT = Integer.valueOf(2);
+    Integer DOUBLE = Integer.valueOf(3);
+    Integer LONG = Integer.valueOf(4);
+    Integer NULL = Integer.valueOf(5);
+    Integer UNINITIALIZED_THIS = Integer.valueOf(6);
 
     // opcodes // visit method (- = idem)
 

doc/doxygen-config

@@ -140,7 +140,7 @@ INLINE_INHERITED_MEMB  = NO
 # shortest path that makes the file name unique will be used
 # The default value is: YES.
 
-FULL_PATH_NAMES        = YES
+FULL_PATH_NAMES        = NO
 
 # The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
 # Stripping is only done if one of the specified strings matches the left-hand
@@ -177,7 +177,7 @@ SHORT_NAMES            = NO
 # description.)
 # The default value is: NO.
 
-JAVADOC_AUTOBRIEF      = NO
+JAVADOC_AUTOBRIEF      = YES
 
 # If the QT_AUTOBRIEF tag is set to YES then doxygen will interpret the first
 # line (until the first dot) of a Qt-style comment as the brief description. If
@@ -242,7 +242,7 @@ TCL_SUBST              =
 # members will be omitted, etc.
 # The default value is: NO.
 
-OPTIMIZE_OUTPUT_FOR_C  = NO
+OPTIMIZE_OUTPUT_FOR_C  = YES
 
 # Set the OPTIMIZE_OUTPUT_JAVA tag to YES if your project consists of Java or
 # Python sources only. Doxygen will then generate output that is more tailored
@@ -398,7 +398,7 @@ INLINE_SIMPLE_STRUCTS  = NO
 # types are typedef'ed and only the typedef is referenced, never the tag name.
 # The default value is: NO.
 
-TYPEDEF_HIDES_STRUCT   = NO
+TYPEDEF_HIDES_STRUCT   = YES
 
 # The size of the symbol lookup cache can be set using LOOKUP_CACHE_SIZE. This
 # cache is used to resolve symbols given their name and scope. Since this can be
@@ -780,7 +780,15 @@ WARN_LOGFILE           =
 # spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
 # Note: If this tag is empty the current directory is searched.
 
-INPUT                  = src/libbluray/bluray.h
+INPUT                  = \
+    src/libbluray/bluray.h \
+    src/libbluray/bluray-version.h \
+    src/file/filesystem.h \
+    src/libbluray/keys.h \
+    src/util/log_control.h \
+    src/libbluray/bdnav/meta_data.h \
+    src/libbluray/decoders/overlay.h \
+    src/libbluray/player_settings.h
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -1435,7 +1443,7 @@ GENERATE_TREEVIEW      = NO
 # Minimum value: 0, maximum value: 20, default value: 4.
 # This tag requires that the tag GENERATE_HTML is set to YES.
 
-ENUM_VALUES_PER_LINE   = 4
+ENUM_VALUES_PER_LINE   = 1
 
 # If the treeview is enabled (see GENERATE_TREEVIEW) then this tag can be used
 # to set the initial width (in pixels) of the frame in which the tree is shown.