Merge pull request #16665 from Rechi/depends/libbluray

[depends] bump libbluray to 1.1.2
xbmc · Oct 6, 2019 · d5daebb · d5daebb
2 parents f924d35 + 619e559
commit d5daebb
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 8 deletions.
diff --git a/cmake/modules/FindBluray.cmake b/cmake/modules/FindBluray.cmake
@@ -48,6 +48,10 @@ if(BLURAY_FOUND)
     list(APPEND BLURAY_DEFINITIONS -DHAVE_LIBBLURAY_BDJ=1)
   endif()
 
+  if(${BLURAY_LIBRARY} MATCHES ".+\.a$" AND PC_BLURAY_STATIC_LIBRARIES)
+    list(APPEND BLURAY_LIBRARIES ${PC_BLURAY_STATIC_LIBRARIES})
+  endif()
+
   if(NOT TARGET Bluray::Bluray)
     add_library(Bluray::Bluray UNKNOWN IMPORTED)
     if(BLURAY_LIBRARY)

diff --git a/cmake/scripts/android/Install.cmake b/cmake/scripts/android/Install.cmake
@@ -153,7 +153,6 @@ foreach(lib IN LISTS required_dyload dyload_optional ITEMS Shairplay)
   endif()
 endforeach()
 add_bundle_file(${ASS_LIBRARY} ${libdir} "")
-add_bundle_file(${BLURAY_LIBRARY} ${libdir} "")
 add_bundle_file(${SHAIRPLAY_LIBRARY} ${libdir} "")
 add_bundle_file(${SMBCLIENT_LIBRARY} ${libdir} "")
 

diff --git a/tools/android/packaging/Makefile.in b/tools/android/packaging/Makefile.in
@@ -5,7 +5,7 @@ BUILD_TYPE_LC:=$(shell echo $(BUILD_TYPE) | tr A-Z a-z)
 
 OBJS = libshairplay.so \
   libass.so \
-  libbluray.so libsmbclient.so
+  libsmbclient.so
 
 PLATFORM_OBJS =
 EXCLUDED_ADDONS =

diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
@@ -95,7 +95,7 @@ python27: expat gettext libxml2 sqlite3 openssl libffi
 libcdio: $(ICONV)
 libcdio-gplv3: $(ICONV)
 libplist: $(ZLIB)
-libbluray: $(ICONV) libxml2
+libbluray: fontconfig freetype2 $(ICONV) libxml2
 mariadb: openssl $(ICONV) $(ZLIB)
 libzip: $(ZLIB)
 libpng: $(ZLIB)

diff --git a/tools/depends/target/libbluray/Makefile b/tools/depends/target/libbluray/Makefile
@@ -3,14 +3,14 @@ DEPS= ../../Makefile.include Makefile tvos.patch
 
 # lib name, version
 LIBNAME=libbluray
-VERSION=1.0.2
+VERSION=1.1.2
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.bz2
 
 # configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) --exec-prefix=$(PREFIX) \
+CONFIGURE=./configure --prefix=$(PREFIX) --disable-shared --exec-prefix=$(PREFIX) \
   --disable-examples --disable-doxygen-doc \
-  --disable-bdjava-jar --without-libxml2 --without-freetype
+  --disable-bdjava-jar
 
 LIBDYLIB=$(PLATFORM)/.libs/libbluray.la
 

diff --git a/tools/depends/target/libbluray/tvos.patch b/tools/depends/target/libbluray/tvos.patch
@@ -1,6 +1,6 @@
 --- a/src/libbluray/bdj/bdj.c
 +++ b/src/libbluray/bdj/bdj.c
-@@ -245,7 +245,7 @@
+@@ -252,7 +252,7 @@
          return NULL;
      }
 
@@ -9,7 +9,7 @@
      {
          case -1:
              BD_DEBUG(DBG_BDJ | DBG_CRIT, "vfork failed\n");
-@@ -277,7 +277,7 @@
+@@ -284,7 +284,7 @@
 
              waitpid(java_home_pid, &exitcode, 0);
      }