aboutsummaryrefslogtreecommitdiff
path: root/tools/depends/target/libbluray
diff options
context:
space:
mode:
authorfuzzard <fuzzard@kodi.tv>2022-05-04 07:54:36 +1000
committerfuzzard <fuzzard@kodi.tv>2022-05-06 18:33:46 +1000
commit94f1843ee974a7fd26dbf2c55b8db3426358f36a (patch)
tree78703ee1edc0d8dd9a83c746b173e64446ee4dba /tools/depends/target/libbluray
parentbcae8561f6aefb168a17644fc50e938831665a6c (diff)
[tools/depends][target] libbluray 1.3.1
Diffstat (limited to 'tools/depends/target/libbluray')
-rw-r--r--tools/depends/target/libbluray/LIBBLURAY-VERSION5
-rw-r--r--tools/depends/target/libbluray/Makefile30
-rw-r--r--tools/depends/target/libbluray/tvos.patch4
3 files changed, 20 insertions, 19 deletions
diff --git a/tools/depends/target/libbluray/LIBBLURAY-VERSION b/tools/depends/target/libbluray/LIBBLURAY-VERSION
new file mode 100644
index 0000000000..43b9943a8d
--- /dev/null
+++ b/tools/depends/target/libbluray/LIBBLURAY-VERSION
@@ -0,0 +1,5 @@
+LIBNAME=libbluray
+VERSION=1.3.1
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.bz2
+SHA512=f39fc8a11771e8fdd5eeebf0ab23535ffab44721f64b350e5d153eee44555b31c618b6d765da114254dc83ff0ff89e84c6b185f61cdbcfedd2d47a5f6e26b75a
+BYPRODUCT=libbluray.a
diff --git a/tools/depends/target/libbluray/Makefile b/tools/depends/target/libbluray/Makefile
index c67e226848..db157b0f93 100644
--- a/tools/depends/target/libbluray/Makefile
+++ b/tools/depends/target/libbluray/Makefile
@@ -1,35 +1,31 @@
-include ../../Makefile.include
-DEPS = ../../Makefile.include Makefile 001-darwinembed_DiskArbitration-revert.patch tvos.patch ../../download-files.include
-
-# lib name, version
-LIBNAME=libbluray
-VERSION=1.3.0
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.bz2
-SHA512=3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc
-include ../../download-files.include
+include ../../Makefile.include LIBBLURAY-VERSION ../../download-files.include
+DEPS = ../../Makefile.include LIBBLURAY-VERSION Makefile ../../download-files.include \
+ 001-darwinembed_DiskArbitration-revert.patch \
+ tvos.patch
# configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) --disable-shared --exec-prefix=$(PREFIX) \
- --disable-examples --disable-doxygen-doc \
- --disable-bdjava-jar
+CONFIGURE=./configure --prefix=$(PREFIX) \
+ --disable-shared \
+ --exec-prefix=$(PREFIX) \
+ --disable-examples \
+ --disable-doxygen-doc \
+ --disable-bdjava-jar
-LIBDYLIB=$(PLATFORM)/.libs/libbluray.la
+LIBDYLIB=$(PLATFORM)/.libs/$(BYPRODUCT)
all: .installed-$(PLATFORM)
-
$(PLATFORM): $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE) $(DEPS)
rm -rf $(PLATFORM); mkdir -p $(PLATFORM)
cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
- cd $(PLATFORM); ./bootstrap
- cd $(PLATFORM); $(CONFIGURE)
ifeq ($(OS),darwin_embedded)
cd $(PLATFORM); patch -p1 -i ../001-darwinembed_DiskArbitration-revert.patch
endif
ifeq ($(TARGET_PLATFORM),appletvos)
cd $(PLATFORM); patch -p1 -i ../tvos.patch
endif
+ cd $(PLATFORM); ./bootstrap
+ cd $(PLATFORM); $(CONFIGURE)
$(LIBDYLIB): $(PLATFORM)
$(MAKE) -C $(PLATFORM)
diff --git a/tools/depends/target/libbluray/tvos.patch b/tools/depends/target/libbluray/tvos.patch
index d9fb4a5d00..35252b0eb7 100644
--- 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
-@@ -252,7 +252,7 @@
+@@ -256,7 +256,7 @@
return NULL;
}
@@ -9,7 +9,7 @@
{
case -1:
BD_DEBUG(DBG_BDJ | DBG_CRIT, "vfork failed\n");
-@@ -284,7 +284,7 @@
+@@ -288,7 +288,7 @@
waitpid(java_home_pid, &exitcode, 0);
}