Merge pull request #6226 from HiassofT/le11-libbluray

libbluray: update to 1.3.0

packages/multimedia/libbluray/package.mk

@@ -3,12 +3,12 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libbluray"
-PKG_VERSION="1.1.2"
-PKG_SHA256="a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42"
+PKG_VERSION="1.3.0"
+PKG_SHA256="e2dbaf99e84e0a9725f4985bcb85d41e52c2261cc651d8884b1b790b5ef016f9"
 PKG_LICENSE="LGPL"
 PKG_SITE="https://www.videolan.org/developers/libbluray.html"
 PKG_URL="http://download.videolan.org/pub/videolan/libbluray/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
-PKG_DEPENDS_TARGET="toolchain fontconfig freetype libxml2"
+PKG_DEPENDS_TARGET="toolchain fontconfig freetype libxml2 libudfread"
 PKG_LONGDESC="libbluray is an open-source library designed for Blu-Ray Discs playback for media players."
 PKG_TOOLCHAIN="autotools"
 

packages/multimedia/libbluray/patches/libbluray-00-fix-build-with-autoconf-archive-2016-or-later.patch

@@ -14,8 +14,6 @@ Ref: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=837020
  Makefile.am | 3 ++-
  1 file changed, 2 insertions(+), 1 deletion(-)
 
-diff --git a/Makefile.am b/Makefile.am
-index 33813b0..f92e741 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -1,4 +1,5 @@
@@ -25,6 +23,3 @@ index 33813b0..f92e741 100644
  
  ACLOCAL_AMFLAGS = -I m4
  
--- 
-2.14.1
-

packages/multimedia/libbluray/patches/libbluray-02-install-extra-MVC-headers.patch

@@ -1,42 +0,0 @@
-From 316310d889d0bcffa299ef6a7fb5726847f2dd3a Mon Sep 17 00:00:00 2001
-From: MilhouseVH <milhouseVH.github@nmacleod.com>
-Date: Wed, 20 Jun 2018 15:01:32 +0100
-Subject: [PATCH] add missing 3D MVC headers
-
----
- Makefile.am | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/Makefile.am b/Makefile.am
-index 9c0b4c4a..103c6201 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -215,6 +215,14 @@ noinst_HEADERS = \
- 	jni/darwin/jni_md.h \
- 	jni/netbsd/jni_md.h
- 
-+bdnavdir=$(pkgincludedir)/bdnav
-+bdnav_HEADERS = \
-+        src/libbluray/bdnav/clpi_data.h
-+
-+utildir=$(pkgincludedir)/util
-+util_HEADERS = \
-+        src/util/attributes.h
-+
- pkginclude_HEADERS = \
- 	src/file/filesystem.h \
- 	src/libbluray/bluray.h \
-@@ -222,6 +230,10 @@ pkginclude_HEADERS = \
- 	src/libbluray/keys.h \
- 	src/libbluray/player_settings.h \
- 	src/libbluray/bdnav/clpi_data.h \
-+	src/libbluray/bdnav/clpi_parse.h \
-+	src/libbluray/bdnav/mpls_parse.h \
-+	src/libbluray/bdnav/mpls_data.h \
-+	src/libbluray/bdnav/uo_mask_table.h \
- 	src/libbluray/bdnav/meta_data.h \
- 	src/libbluray/decoders/overlay.h \
- 	src/util/log_control.h
--- 
-2.17.1
-

packages/multimedia/libbluray/patches/libbluray-03-set-headless-false.patch

@@ -10,11 +10,9 @@ https://github.com/PojavLauncherTeam/PojavLauncher/issues/713#issuecomment-76981
  src/libbluray/bdj/bdj.c | 2 ++
  1 file changed, 2 insertions(+)
 
-diff --git a/src/libbluray/bdj/bdj.c b/src/libbluray/bdj/bdj.c
-index 5666a468..a638e7c6 100644
 --- a/src/libbluray/bdj/bdj.c
 +++ b/src/libbluray/bdj/bdj.c
-@@ -869,6 +869,8 @@ static int _create_jvm(void *jvm_lib, const char *java_home, BDJ_CONFIG *cfg,
+@@ -903,6 +903,8 @@ static int _create_jvm(void *jvm_lib, co
      option[n++].optionString = str_dup   ("-Xms256M");
      option[n++].optionString = str_dup   ("-Xmx256M");
      option[n++].optionString = str_dup   ("-Xss2048k");
@@ -23,6 +21,3 @@ index 5666a468..a638e7c6 100644
  #ifdef HAVE_BDJ_J2ME
      option[n++].optionString = str_printf("-Djava.home=%s", java_home);
      option[n++].optionString = str_printf("-Xbootclasspath/a:%s/lib/xmlparser.jar", java_home);
--- 
-2.25.1
-

packages/multimedia/libudfread/package.mk

@@ -2,13 +2,14 @@
 # Copyright (C) 2020-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="libudfread"
-PKG_VERSION="1.1.1"
-PKG_SHA256="5d237ff81caa46856dc75b8ddd1f17c0e262eea08ef59a466cc850585f1680dc"
+PKG_VERSION="1.1.2"
+PKG_SHA256="2bf16726ac98d093156195bb049a663e07d3323e079c26912546f4e05c77bac5"
 PKG_LICENSE="LGPLv2.1"
 PKG_SITE="https://code.videolan.org/videolan/libudfread"
 PKG_URL="https://code.videolan.org/videolan/${PKG_NAME}/-/archive/${PKG_VERSION}/${PKG_NAME}-${PKG_VERSION}.tar.gz"
 PKG_DEPENDS_TARGET="toolchain"
 PKG_LONGDESC="UDF reader"
 PKG_TOOLCHAIN="autotools"
+PKG_BUILD_FLAGS="+pic"
 
 PKG_CONFIGURE_OPTS_TARGET="--enable-static --disable-shared"