diff options
| -rw-r--r-- | contrib/libbluray/A01-filter-dup.patch | 80 | ||||
| -rw-r--r-- | contrib/libbluray/A02-m2ts-trace.patch | 15 | ||||
| -rw-r--r-- | contrib/libbluray/module.defs | 6 |
3 files changed, 4 insertions, 97 deletions
diff --git a/contrib/libbluray/A01-filter-dup.patch b/contrib/libbluray/A01-filter-dup.patch index 608f8dd1b..e69de29bb 100644 --- a/contrib/libbluray/A01-filter-dup.patch +++ b/contrib/libbluray/A01-filter-dup.patch @@ -1,80 +0,0 @@ -diff --git a/src/libbluray/bdnav/navigation.c b/src/libbluray/bdnav/navigation.c -index c8dc307..26d0000 100644 ---- a/src/libbluray/bdnav/navigation.c -+++ b/src/libbluray/bdnav/navigation.c -@@ -32,9 +32,25 @@ - #include <stdlib.h> - #include <string.h> - -+static int _stream_cmp(MPLS_STREAM *a, MPLS_STREAM *b) -+{ -+ if (a->stream_type == b->stream_type && -+ a->coding_type == b->coding_type && -+ a->pid == b->pid && -+ a->subpath_id == b->subpath_id && -+ a->subclip_id == b->subclip_id && -+ a->format == b->format && -+ a->rate == b->rate && -+ a->char_code == b->char_code && -+ memcmp(a->lang, b->lang, 4) == 0) { -+ return 1; -+ } -+ return 0; -+} -+ - static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl) - { -- unsigned ii, jj; -+ unsigned ii, jj, kk; - - for (ii = 0; ii < count; ii++) { - if (pl->list_count != pl_list[ii]->list_count) { -@@ -54,7 +70,48 @@ static int _filter_dup(MPLS_PL *pl_list[], unsigned count, MPLS_PL *pl) - pi1->out_time != pi2->out_time) { - break; - } -+ if (pi1->stn.num_video != pi2->stn.num_video || -+ pi1->stn.num_audio != pi2->stn.num_audio || -+ pi1->stn.num_pg != pi2->stn.num_pg || -+ pi1->stn.num_ig != pi2->stn.num_ig || -+ pi1->stn.num_secondary_audio != pi2->stn.num_secondary_audio || -+ pi1->stn.num_secondary_video != pi2->stn.num_secondary_video) { -+ break; -+ } -+ for (kk = 0; kk < pi1->stn.num_video; kk++) { -+ if (!_stream_cmp(&pi1->stn.video[kk], &pi2->stn.video[kk])) { -+ goto next; -+ } -+ } -+ for (kk = 0; kk < pi1->stn.num_audio; kk++) { -+ if (!_stream_cmp(&pi1->stn.audio[kk], &pi2->stn.audio[kk])) { -+ goto next; -+ } -+ } -+ for (kk = 0; kk < pi1->stn.num_pg; kk++) { -+ if (!_stream_cmp(&pi1->stn.pg[kk], &pi2->stn.pg[kk])) { -+ goto next; -+ } -+ } -+ for (kk = 0; kk < pi1->stn.num_ig; kk++) { -+ if (!_stream_cmp(&pi1->stn.ig[kk], &pi2->stn.ig[kk])) { -+ goto next; -+ } -+ } -+ for (kk = 0; kk < pi1->stn.num_secondary_audio; kk++) { -+ if (!_stream_cmp(&pi1->stn.secondary_audio[kk], -+ &pi2->stn.secondary_audio[kk])) { -+ goto next; -+ } -+ } -+ for (kk = 0; kk < pi1->stn.num_secondary_video; kk++) { -+ if (!_stream_cmp(&pi1->stn.secondary_video[kk], -+ &pi2->stn.secondary_video[kk])) { -+ goto next; -+ } -+ } - } -+next: - if (jj != pl->list_count) { - continue; - } diff --git a/contrib/libbluray/A02-m2ts-trace.patch b/contrib/libbluray/A02-m2ts-trace.patch index 8f98689b2..e69de29bb 100644 --- a/contrib/libbluray/A02-m2ts-trace.patch +++ b/contrib/libbluray/A02-m2ts-trace.patch @@ -1,15 +0,0 @@ -diff --git a/src/libbluray/decoders/m2ts_filter.c b/src/libbluray/decoders/m2ts_filter.c -index 38fa37c..200f9cd 100644 ---- a/src/libbluray/decoders/m2ts_filter.c -+++ b/src/libbluray/decoders/m2ts_filter.c -@@ -30,8 +30,8 @@ - #include <stdlib.h> - #include <string.h> - --#define M2TS_TRACE(...) BD_DEBUG(DBG_CRIT,__VA_ARGS__) --//#define M2TS_TRACE(...) do {} while(0) -+//#define M2TS_TRACE(...) BD_DEBUG(DBG_CRIT,__VA_ARGS__) -+#define M2TS_TRACE(...) do {} while(0) - - /* - * diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs index 868b25147..c4bd6201d 100644 --- a/contrib/libbluray/module.defs +++ b/contrib/libbluray/module.defs @@ -1,7 +1,9 @@ $(eval $(call import.MODULE.defs,LIBBLURAY,libbluray,PKGCONFIG LIBXML2 FREETYPE)) $(eval $(call import.CONTRIB.defs,LIBBLURAY)) -LIBBLURAY.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libbluray-0.5.0.tar.bz2 +LIBBLURAY.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libbluray-0.8.0-0-g2a815e6.tar.gz + +LIBBLURAY.CONFIGURE.bootstrap = ./bootstrap; ifneq (max,$(LIBBLURAY.GCC.g)) LIBBLURAY.CONFIGURE.extra += --disable-debug @@ -13,7 +15,7 @@ ifeq (none,$(LIBBLURAY.GCC.O)) LIBBLURAY.CONFIGURE.extra += --disable-optimizations endif -LIBBLURAY.CONFIGURE.extra += --disable-examples +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)" |