diff options
| author | John Stebbins <[email protected]> | 2016-05-27 14:42:02 -0700 |
|---|---|---|
| committer | John Stebbins <[email protected]> | 2016-05-27 14:42:02 -0700 |
| commit | 93a52ea54d3979ceb720a74c3cb324fb68d4f792 (patch) | |
| tree | 23b4f62434fdc91ba24ae1ba8f3f08af3b25b8dd /contrib | |
| parent | 4daf8df6d93a4d1392903fd289a33ebbe26831ab (diff) | |
libbluray: bump to 0.9.3 (#202)
Fixes reading ISO images on windows
Fixes chapter lookup so we can drop our patch
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/libbluray/A01-fix-current-chapter-lookup.patch | 20 | ||||
| -rw-r--r-- | contrib/libbluray/module.defs | 10 |
2 files changed, 3 insertions, 27 deletions
diff --git a/contrib/libbluray/A01-fix-current-chapter-lookup.patch b/contrib/libbluray/A01-fix-current-chapter-lookup.patch deleted file mode 100644 index 313c1cd22..000000000 --- a/contrib/libbluray/A01-fix-current-chapter-lookup.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/src/libbluray/bdnav/navigation.c b/src/libbluray/bdnav/navigation.c -index 60eccbb..4752196 100644 ---- a/src/libbluray/bdnav/navigation.c -+++ b/src/libbluray/bdnav/navigation.c -@@ -754,6 +754,15 @@ uint32_t nav_chapter_get_current(NAV_CLIP *clip, uint32_t clip_pkt) - else - return 0; - } -+ if (mark->clip_ref < clip->ref) { -+ if ( ii == title->chap_list.count - 1 ) { -+ return ii; -+ } -+ mark = &title->chap_list.mark[ii+1]; -+ if (mark->clip_ref == clip->ref && mark->clip_pkt > clip_pkt) { -+ return ii; -+ } -+ } - if (mark->clip_ref == clip->ref && mark->clip_pkt <= clip_pkt) { - if ( ii == title->chap_list.count - 1 ) { - return ii; diff --git a/contrib/libbluray/module.defs b/contrib/libbluray/module.defs index 1293a7e0b..62c97b0bd 100644 --- a/contrib/libbluray/module.defs +++ b/contrib/libbluray/module.defs @@ -1,13 +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.8.1.tar.bz2 -LIBBLURAY.FETCH.url += http://download.videolan.org/pub/videolan/libbluray/0.8.1/libbluray-0.8.1.tar.bz2 -LIBBLURAY.FETCH.md5 = c7a89966ad091fa6075a58d31a698e70 - -# TODO: libbluray >= 0.9.0 -#LIBBLURAY.FETCH.url = http://download.videolan.org/pub/videolan/libbluray/0.9.0/libbluray-0.9.0.tar.bz2 -#LIBBLURAY.FETCH.md5 = a4e8077b9fd82349c767cef2ba9bd750 +LIBBLURAY.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libbluray-0.9.3.tar.bz2 +LIBBLURAY.FETCH.url += http://download.videolan.org/pub/videolan/libbluray/0.9.3/libbluray-0.9.3.tar.bz2 +LIBBLURAY.FETCH.md5 = c51fd34f933431559371be30b59cff51 ifneq (max,$(LIBBLURAY.GCC.g)) LIBBLURAY.CONFIGURE.extra += --disable-debug |