Commit a0c8979e authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files

Contribs: update libbluray to 1.1.1

parent 456b3d93
From 35f1bcc4885f84b3c4836ba1ffea8db6ec4f2682 Mon Sep 17 00:00:00 2001
From: Francois Cartegnie <fcvlcdev@free.fr>
Date: Tue, 13 Nov 2018 23:10:30 +0100
Subject: [PATCH] keep on with menuless user selected streams between clips
---
src/libbluray/bluray.c | 20 ++------------------
1 file changed, 2 insertions(+), 18 deletions(-)
diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c
index 1728801..aa3135e 100644
--- a/src/libbluray/bluray.c
+++ b/src/libbluray/bluray.c
@@ -323,24 +323,8 @@ static void _update_clip_psrs(BLURAY *bd, NAV_CLIP *clip)
/* Update selected audio and subtitle stream PSRs when not using menus.
* Selection is based on language setting PSRs and clip STN.
*/
- if (bd->title_type == title_undef) {
-
- if (stn->num_audio) {
- _update_stream_psr_by_lang(bd->regs,
- PSR_AUDIO_LANG, PSR_PRIMARY_AUDIO_ID, 0,
- stn->audio, stn->num_audio,
- &audio_lang, 0);
- }
-
- if (stn->num_pg) {
- _update_stream_psr_by_lang(bd->regs,
- PSR_PG_AND_SUB_LANG, PSR_PG_STREAM, 0x80000000,
- stn->pg, stn->num_pg,
- NULL, audio_lang);
- }
-
/* Validate selected audio, subtitle and IG stream PSRs when using menus */
- } else {
+ {
uint32_t psr_val;
if (stn->num_audio) {
@@ -367,7 +351,7 @@ static void _update_clip_psrs(BLURAY *bd, NAV_CLIP *clip)
}
bd_psr_unlock(bd->regs);
}
- if (stn->num_ig) {
+ if (stn->num_ig && bd->title_type != title_undef) {
bd_psr_lock(bd->regs);
psr_val = bd_psr_read(bd->regs, PSR_IG_STREAM_ID);
if ((psr_val == 0) || (psr_val > stn->num_ig)) {
--
2.17.2
From bbf867237c7fa326b5467afaad08f18a56a79935 Mon Sep 17 00:00:00 2001
From: David Fuhrmann <dfuhrmann@videolan.org>
Date: Mon, 7 Jan 2019 19:30:56 +0100
Subject: [PATCH] library paths: Explicitly add /usr/local/lib
Hardened runtime prevents the program to load any libraries outside
of the application bundle by default. Specifically, it also ignores
DYLD_FALLBACK_PATH which would contain /usr/local/lib.
To allow usage of a library outside of the application bundle, add
/usr/local/lib explicitly.
---
src/file/dl_posix.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/file/dl_posix.c b/src/file/dl_posix.c
index b97f12fe..49813856 100644
--- a/src/file/dl_posix.c
+++ b/src/file/dl_posix.c
@@ -69,10 +69,11 @@ void *dl_dlopen(const char *path, const char *version)
@loader_path - location of current library/binary (ex. libbluray.dylib)
@executable_path - location of running binary (ex. /Applications/Some.app/Contents/MacOS)
@rpath - search rpaths of running binary (man install_name_path)
+ /usr/local/lib/ - explicitly added path, as runtime hardened programs ignore DYLD_FALLBACK_PATH now
*/
static const char *search_paths[] = {"", "@loader_path/lib/", "@loader_path/", "@executable_path/",
"@executable_path/lib/", "@executable_path/../lib/",
- "@executable_path/../Resources/", "@rpath/", NULL};
+ "@executable_path/../Resources/", "@rpath/", "/usr/local/lib/", NULL};
version = NULL;
#else
static const char ext[] = ".so";
--
2.17.2 (Apple Git-113)
9e1c8408ded0548584cf9d01fdf8153bb713cae5bfc8ff4cb6ace92cddcb2f8546d08db960507e4be8a79741c6196176726da7befac4244f887ab72b35136e9d libbluray-1.1.0.tar.bz2
0a3bcef06d2a58c51c3d46934c32941ec0606dc9b71fe36f72a6e34ab8113cf72cfb6e2fdd51f23e0a44ccd404323f5ac5c666aa1d839ae16cc775267cbce839 libbluray-1.1.1.tar.bz2
# LIBBLURAY
BLURAY_VERSION := 1.1.0
BLURAY_VERSION := 1.1.1
BLURAY_URL := $(VIDEOLAN)/libbluray/$(BLURAY_VERSION)/libbluray-$(BLURAY_VERSION).tar.bz2
ifdef BUILD_DISCS
......@@ -50,9 +50,7 @@ $(TARBALLS)/libbluray-$(BLURAY_VERSION).tar.bz2:
bluray: libbluray-$(BLURAY_VERSION).tar.bz2 .sum-bluray
$(UNPACK)
$(APPLY) $(SRC)/bluray/0001-keep-on-with-menuless-user-selected-streams-between-.patch
$(APPLY) $(SRC)/bluray/0001-install-bdjo_data-header.patch
$(APPLY) $(SRC)/bluray/0001-library-paths-Explicitly-add-usr-local-lib.patch
$(call pkg_static,"src/libbluray.pc.in")
$(MOVE)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment