update to libbluray-1.3.1, from Brad
This commit is contained in:
parent
b6e3b3527d
commit
1a66968ffc
|
@ -1,14 +1,12 @@
|
|||
COMMENT = library supporting Blu-ray playback
|
||||
|
||||
V = 1.3.0
|
||||
V = 1.3.1
|
||||
DISTNAME = libbluray-${V}
|
||||
REVISION = 2
|
||||
CATEGORIES = multimedia
|
||||
|
||||
HOMEPAGE = https://www.videolan.org/developers/libbluray.html
|
||||
|
||||
MASTER_SITES = https://download.videolan.org/pub/videolan/libbluray/${V}/ \
|
||||
ftp://ftp.videolan.org/pub/videolan/libbluray/${V}/
|
||||
MASTER_SITES = https://download.videolan.org/pub/videolan/libbluray/${V}/
|
||||
EXTRACT_SUFX = .tar.bz2
|
||||
|
||||
# LGPL v2.1
|
||||
|
|
|
@ -1,2 +1,2 @@
|
|||
SHA256 (libbluray-1.3.0.tar.bz2) = 4tuvmehOCpcl9Jhby4XUHlLCJhzGUdiISxt5C17wFvk=
|
||||
SIZE (libbluray-1.3.0.tar.bz2) = 754069
|
||||
SHA256 (libbluray-1.3.1.tar.bz2) = wksPQcW3N7u2XFRP5jSVY3p3HBClGd/IAudp8RK0O3U=
|
||||
SIZE (libbluray-1.3.1.tar.bz2) = 754867
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
Point to a real file
|
||||
Point to a real file.
|
||||
|
||||
Index: jni/jni.h
|
||||
--- jni/jni.h.orig
|
||||
|
|
|
@ -1,22 +0,0 @@
|
|||
Fix loading dlopen'd libraries on OpenBSD.
|
||||
7bc73fd5cbd567ba128eec1f061323bed7a9c5d7
|
||||
|
||||
Index: src/file/dl_posix.c
|
||||
--- src/file/dl_posix.c.orig
|
||||
+++ src/file/dl_posix.c
|
||||
@@ -85,11 +85,15 @@ void *dl_dlopen(const char *path, const char *version)
|
||||
#endif
|
||||
|
||||
for (i = 0 ; search_paths[i] ; ++i) {
|
||||
+#ifdef __OpenBSD__
|
||||
+ name = str_printf("%s%s%s", search_paths[i], path, ext);
|
||||
+#else
|
||||
if (version) {
|
||||
name = str_printf("%s%s%s.%s", search_paths[i], path, ext, version);
|
||||
} else {
|
||||
name = str_printf("%s%s%s", search_paths[i], path, ext);
|
||||
}
|
||||
+#endif
|
||||
|
||||
if (!name) {
|
||||
BD_DEBUG(DBG_FILE | DBG_CRIT, "out of memory\n");
|
|
@ -1,35 +0,0 @@
|
|||
- Fix dec_start() without menus
|
||||
8412dc1ee24b186a161902de1dd9f15f712041f5
|
||||
- Drop "WARNING: BluRay profile 6 BD-J menu support is experimental"
|
||||
000af4c152f532d2347cb17df628592244a5f764
|
||||
|
||||
Index: src/libbluray/bluray.c
|
||||
--- src/libbluray/bluray.c.orig
|
||||
+++ src/libbluray/bluray.c
|
||||
@@ -1132,12 +1132,13 @@ static void _fill_disc_info(BLURAY *bd, BD_ENC_INFO *e
|
||||
/* increase player profile and version when 3D or UHD disc is detected */
|
||||
|
||||
if (index->indx_version >= ('0' << 24 | '3' << 16 | '0' << 8 | '0')) {
|
||||
- BD_DEBUG(DBG_CRIT | DBG_BLURAY, "WARNING: BluRay profile 6 BD-J menu support is experimental\n");
|
||||
+ BD_DEBUG(DBG_BLURAY, "Detected 4K UltraHD (profile 6) disc\n");
|
||||
/* Switch to UHD profile */
|
||||
psr_init_UHD(bd->regs, 1);
|
||||
}
|
||||
if (((index->indx_version >> 16) & 0xff) == '2') {
|
||||
if (index->app_info.content_exist_flag) {
|
||||
+ BD_DEBUG(DBG_BLURAY, "Detected Blu-Ray 3D (profile 5) disc\n");
|
||||
/* Switch to 3D profile */
|
||||
psr_init_3D(bd->regs, index->app_info.initial_output_mode_preference, 0);
|
||||
}
|
||||
@@ -2419,6 +2420,11 @@ static int _add_known_playlist(BD_DISC *p, const char
|
||||
|
||||
static int _open_playlist(BLURAY *bd, const char *f_name, unsigned angle)
|
||||
{
|
||||
+ if (!bd->title_list && bd->title_type == title_undef) {
|
||||
+ BD_DEBUG(DBG_BLURAY | DBG_CRIT, "open_playlist(%s): bd_play() or bd_get_titles() not called\n", f_name);
|
||||
+ disc_event(bd->disc, DISC_EVENT_START, bd->disc_info.num_titles);
|
||||
+ }
|
||||
+
|
||||
_close_playlist(bd);
|
||||
|
||||
bd->title = nav_title_open(bd->disc, f_name, angle);
|
|
@ -1,17 +0,0 @@
|
|||
Fix dec_start() without menus
|
||||
8412dc1ee24b186a161902de1dd9f15f712041f5
|
||||
|
||||
Index: src/libbluray/disc/bdplus.c
|
||||
--- src/libbluray/disc/bdplus.c.orig
|
||||
+++ src/libbluray/disc/bdplus.c
|
||||
@@ -275,6 +275,10 @@ const uint8_t *libbdplus_get_data(BD_BDPLUS *p, int ty
|
||||
if (libbdplus_is_mmbd(p)) {
|
||||
return (const uint8_t *)"mmbd";
|
||||
}
|
||||
+ if ((int32_t)_bdplus_get(p, "bdplus_is_cached") > 0) {
|
||||
+ return (const uint8_t *)"mmbd;libbdplus";
|
||||
+ }
|
||||
+ break;
|
||||
}
|
||||
|
||||
return NULL;
|
|
@ -1,14 +0,0 @@
|
|||
Fix dec_start() without menus
|
||||
8412dc1ee24b186a161902de1dd9f15f712041f5
|
||||
|
||||
Index: src/libbluray/disc/dec.c
|
||||
--- src/libbluray/disc/dec.c.orig
|
||||
+++ src/libbluray/disc/dec.c
|
||||
@@ -369,6 +369,7 @@ void dec_start(BD_DEC *dec, uint32_t num_titles)
|
||||
}
|
||||
} else {
|
||||
if (dec->bdplus) {
|
||||
+ libbdplus_start(dec->bdplus);
|
||||
libbdplus_event(dec->bdplus, 0xffffffff, num_titles, 0);
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user