diff options
| author | Bradley Sepos <[email protected]> | 2017-07-11 15:44:00 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2017-07-11 15:44:00 -0400 |
| commit | 1de8f69d9db51d5d0a2cb1dcda139e472679ed7e (patch) | |
| tree | 26b8b9a9734a607187af70198bb12aaddb3e6d95 | |
| parent | 5b043e2292e2d97d13708115e1a9632c111361b0 (diff) | |
Revert "contrib: Update to libbluray 1.0.1."
This reverts commit 5b043e2292e2d97d13708115e1a9632c111361b0.
Hoses hb.dll on mingw-w64. Need to do more testing.
| -rw-r--r-- | contrib/libbluray/A02-expose-clip_id.patch | 37 | ||||
| -rw-r--r-- | contrib/libbluray/module.defs | 14 |
2 files changed, 47 insertions, 4 deletions
diff --git a/contrib/libbluray/A02-expose-clip_id.patch b/contrib/libbluray/A02-expose-clip_id.patch new file mode 100644 index 000000000..9fe3dfedb --- /dev/null +++ b/contrib/libbluray/A02-expose-clip_id.patch @@ -0,0 +1,37 @@ +From 1a113167733091fe325152a5ece4d57ee1b89dc0 Mon Sep 17 00:00:00 2001 +From: John Stebbins <[email protected]> +Date: Wed, 18 May 2016 15:40:17 -0600 +Subject: [PATCH] expose clip_id in BLURAY_CLIP_INFO + +--- + src/libbluray/bluray.c | 1 + + src/libbluray/bluray.h | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/libbluray/bluray.c b/src/libbluray/bluray.c +index b7598b9..3478ade 100644 +--- a/src/libbluray/bluray.c ++++ b/src/libbluray/bluray.c +@@ -2602,6 +2602,7 @@ static BLURAY_TITLE_INFO* _fill_title_info(NAV_TITLE* title, uint32_t title_idx, + BLURAY_CLIP_INFO *ci = &title_info->clips[ii]; + NAV_CLIP *nc = &title->clip_list.clip[ii]; + ++ memcpy(ci->clip_id, pi->clip->clip_id, sizeof(ci->clip_id)); + ci->pkt_count = nc->end_pkt - nc->start_pkt; + ci->start_time = (uint64_t)nc->title_time * 2; + ci->in_time = (uint64_t)pi->in_time * 2; +diff --git a/src/libbluray/bluray.h b/src/libbluray/bluray.h +index 3cd7118..177b3d4 100644 +--- a/src/libbluray/bluray.h ++++ b/src/libbluray/bluray.h +@@ -225,6 +225,7 @@ typedef struct bd_stream_info { + } BLURAY_STREAM_INFO; + + typedef struct bd_clip { ++ char clip_id[6]; + uint32_t pkt_count; + uint8_t still_mode; + uint16_t still_time; /* seconds */ +-- +2.5.5 + diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs index 061811415..e182c8467 100644 --- a/contrib/libbluray/module.defs +++ b/contrib/libbluray/module.defs @@ -1,15 +1,21 @@ $(eval $(call import.MODULE.defs,LIBBLURAY,libbluray,PKGCONFIG LIBXML2 FREETYPE)) $(eval $(call import.CONTRIB.defs,LIBBLURAY)) -LIBBLURAY.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libbluray-1.0.1.tar.bz2 -LIBBLURAY.FETCH.url += https://download.videolan.org/pub/videolan/libbluray/1.0.1/libbluray-1.0.1.tar.bz2 -LIBBLURAY.FETCH.sha256 = 0f9f9a1db2f48cafc70ed2596ff3594b597e2027408f5f2be6191c245d67853a +LIBBLURAY.FETCH.url = https://download.handbrake.fr/handbrake/contrib/libbluray-0.9.3.tar.bz2 +LIBBLURAY.FETCH.url += https://download.videolan.org/pub/videolan/libbluray/0.9.3/libbluray-0.9.3.tar.bz2 +LIBBLURAY.FETCH.sha256 = a6366614ec45484b51fe94fcd1975b3b8716f90f038a33b24d59978de3863ce0 + +ifneq (max,$(LIBBLURAY.GCC.g)) + LIBBLURAY.CONFIGURE.extra += --disable-debug +else + LIBBLURAY.CONFIGURE.extra += --enable-debug +endif ifeq (none,$(LIBBLURAY.GCC.O)) LIBBLURAY.CONFIGURE.extra += --disable-optimizations endif -LIBBLURAY.CONFIGURE.extra += --disable-doxygen-doc --disable-examples --disable-bdjava-jar --without-freetype --without-fontconfig +LIBBLURAY.CONFIGURE.extra += --disable-examples --disable-bdjava --enable-udf --without-freetype --without-fontconfig ifeq (1,$(FEATURE.local_pkgconfig)) LIBBLURAY.CONFIGURE.env += PATH="$(call fn.ABSOLUTE,$(CONTRIB.build/)bin):$(PATH)" |