Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[depends] bump libbluray to 1.1.2 #16665

Merged
merged 1 commit into from Oct 6, 2019
Merged

[depends] bump libbluray to 1.1.2 #16665

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions cmake/modules/FindBluray.cmake
View file
Open in desktop
Expand Up @@ -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)
Expand Down
1 change: 0 additions & 1 deletion cmake/scripts/android/Install.cmake
View file
Open in desktop
Expand Up @@ -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} "")

Expand Down
2 changes: 1 addition & 1 deletion tools/android/packaging/Makefile.in
View file
Open in desktop
Expand Up @@ -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 =
Expand Down
2 changes: 1 addition & 1 deletion tools/depends/target/Makefile
View file
Open in desktop
Expand Up @@ -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)
Expand Down
6 changes: 3 additions & 3 deletions tools/depends/target/libbluray/Makefile
View file
Open in desktop
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions tools/depends/target/libbluray/tvos.patch
View file
Open in desktop
@@ -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;
}

Expand All @@ -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);
}
Expand Down