Skip to content

Commit

Permalink
contrib: update harfbuzz libass libbluray libdav1d libdvdnav libdvdread.
Browse files Browse the repository at this point in the history
  • Loading branch information
galad87 committed May 10, 2021
1 parent 11ddbbb commit f90102b
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 149 deletions.
6 changes: 3 additions & 3 deletions contrib/harfbuzz/module.defs
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ __deps__ := FREETYPE
$(eval $(call import.MODULE.defs,HARFBUZZ,harfbuzz,$(__deps__)))
$(eval $(call import.CONTRIB.defs,HARFBUZZ))

HARFBUZZ.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/harfbuzz-2.7.2.tar.xz
HARFBUZZ.FETCH.url += https://github.com/harfbuzz/harfbuzz/releases/download/2.7.2/harfbuzz-2.7.2.tar.xz
HARFBUZZ.FETCH.sha256 = b8c048d7c2964a12f2c80deb6634dfc836b603dd12bf0d0a3df1627698e220ce
HARFBUZZ.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/harfbuzz-2.8.1.tar.xz
HARFBUZZ.FETCH.url += https://github.com/harfbuzz/harfbuzz/releases/download/2.8.1/harfbuzz-2.8.1.tar.xz
HARFBUZZ.FETCH.sha256 = 4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300

HARFBUZZ.build_dir = build
HARFBUZZ.CONFIGURE.exe = cmake
Expand Down
6 changes: 3 additions & 3 deletions contrib/libass/module.defs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ endif
$(eval $(call import.MODULE.defs,LIBASS,libass,$(__deps__)))
$(eval $(call import.CONTRIB.defs,LIBASS))

LIBASS.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libass-0.15.0.tar.gz
LIBASS.FETCH.url += https://github.com/libass/libass/releases/download/0.15.0/libass-0.15.0.tar.gz
LIBASS.FETCH.sha256 = 9cbddee5e8c87e43a5fe627a19cd2aa4c36552156eb4edcf6c5a30bd4934fe58
LIBASS.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libass-0.15.1.tar.gz
LIBASS.FETCH.url += https://github.com/libass/libass/releases/download/0.15.1/libass-0.15.1.tar.gz
LIBASS.FETCH.sha256 = 101e2be1bf52e8fc265e7ca2225af8bd678839ba13720b969883eb9da43048a6

# Tell configure where to find our versions of these libs
LIBASS.CONFIGURE.extra = \
Expand Down
114 changes: 0 additions & 114 deletions contrib/libbluray/A00-pthread-mutex.patch

This file was deleted.

13 changes: 0 additions & 13 deletions contrib/libbluray/P03-darwin-mount.patch

This file was deleted.

6 changes: 3 additions & 3 deletions contrib/libbluray/module.defs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
$(eval $(call import.MODULE.defs,LIBBLURAY,libbluray,LIBXML2 FREETYPE))
$(eval $(call import.CONTRIB.defs,LIBBLURAY))

LIBBLURAY.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libbluray-1.1.2.tar.bz2
LIBBLURAY.FETCH.url += https://download.videolan.org/pub/videolan/libbluray/1.1.2/libbluray-1.1.2.tar.bz2
LIBBLURAY.FETCH.sha256 = a3dd452239b100dc9da0d01b30e1692693e2a332a7d29917bf84bb10ea7c0b42
LIBBLURAY.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libbluray-1.3.0.tar.bz2
LIBBLURAY.FETCH.url += https://download.videolan.org/pub/videolan/libbluray/1.3.0/libbluray-1.3.0.tar.bz2
LIBBLURAY.FETCH.sha256 = e2dbaf99e84e0a9725f4985bcb85d41e52c2261cc651d8884b1b790b5ef016f9

ifeq (none,$(LIBBLURAY.GCC.O))
LIBBLURAY.CONFIGURE.extra += --disable-optimizations
Expand Down
6 changes: 3 additions & 3 deletions contrib/libdav1d/module.defs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
$(eval $(call import.MODULE.defs,LIBDAV1D,libdav1d,PTHREADW32))
$(eval $(call import.CONTRIB.defs,LIBDAV1D))

LIBDAV1D.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-0.8.0.tar.bz2
LIBDAV1D.FETCH.url += https://code.videolan.org/videolan/dav1d/-/archive/0.8.0/dav1d-0.8.0.tar.bz2
LIBDAV1D.FETCH.sha256 = b62eb846fd8af15b402c8f6615a74405fe4448cf16663efd0358d4124db0829f
LIBDAV1D.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/dav1d-0.8.2.tar.bz2
LIBDAV1D.FETCH.url += https://code.videolan.org/videolan/dav1d/-/archive/0.8.2/dav1d-0.8.2.tar.bz2
LIBDAV1D.FETCH.sha256 = 78ec7a1714d98a8f4ecbc4255e83e6c4c944cdd881871ea234ce40153fd3df04

LIBDAV1D.build_dir = build/

Expand Down
6 changes: 3 additions & 3 deletions contrib/libdvdnav/module.defs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
$(eval $(call import.MODULE.defs,LIBDVDNAV,libdvdnav,LIBDVDREAD))
$(eval $(call import.CONTRIB.defs,LIBDVDNAV))

LIBDVDNAV.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdnav-6.0.1.tar.bz2
LIBDVDNAV.FETCH.url += https://download.videolan.org/pub/videolan/libdvdnav/6.0.1/libdvdnav-6.0.1.tar.bz2
LIBDVDNAV.FETCH.sha256 = e566a396f1950017088bfd760395b0565db44234195ada5413366c9d23926733
LIBDVDNAV.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdnav-6.1.1.tar.bz2
LIBDVDNAV.FETCH.url += https://download.videolan.org/pub/videolan/libdvdnav/6.1.1/libdvdnav-6.1.1.tar.bz2
LIBDVDNAV.FETCH.sha256 = c191a7475947d323ff7680cf92c0fb1be8237701885f37656c64d04e98d18d48

ifneq (max,$(LIBDVDNAV.GCC.g))
LIBDVDNAV.GCC.D += NDEBUG
Expand Down
8 changes: 4 additions & 4 deletions contrib/libdvdread/A01-macOS-hardened-runtime-dlopen.patch
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
diff --git a/src/dvd_input.c b/src/dvd_input.c
index d28efe7..4de0ce7 100644
index 0c44387..476c9c8 100644
--- a/src/dvd_input.c
+++ b/src/dvd_input.c
@@ -277,6 +277,7 @@ int dvdinput_setup(void)
@@ -319,6 +319,7 @@ int dvdinput_setup(void *priv, dvd_logger_cb *logcb)

#ifdef __APPLE__
#define CSS_LIB "libdvdcss.2.dylib"
+ #define CSS_USR_LOCAL_LIB "/usr/local/lib/libdvdcss.2.dylib"
#elif defined(WIN32)
#elif defined(_WIN32)
#define CSS_LIB "libdvdcss-2.dll"
#elif defined(__OS2__)
@@ -286,6 +287,13 @@ int dvdinput_setup(void)
@@ -328,6 +329,13 @@ int dvdinput_setup(void *priv, dvd_logger_cb *logcb)
#endif
dvdcss_library = dlopen(CSS_LIB, RTLD_LAZY);

Expand Down
6 changes: 3 additions & 3 deletions contrib/libdvdread/module.defs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
$(eval $(call import.MODULE.defs,LIBDVDREAD,libdvdread))
$(eval $(call import.CONTRIB.defs,LIBDVDREAD))

LIBDVDREAD.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdread-6.0.2.tar.bz2
LIBDVDREAD.FETCH.url += https://download.videolan.org/pub/videolan/libdvdread/6.0.2/libdvdread-6.0.2.tar.bz2
LIBDVDREAD.FETCH.sha256 = f91401af213b219cdde24b46c50a57f29301feb7f965678f1d7ed4632cc6feb0
LIBDVDREAD.FETCH.url = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/libdvdread-6.1.1.tar.bz2
LIBDVDREAD.FETCH.url += https://download.videolan.org/pub/videolan/libdvdread/6.1.1/libdvdread-6.1.1.tar.bz2
LIBDVDREAD.FETCH.sha256 = 3e357309a17c5be3731385b9eabda6b7e3fa010f46022a06f104553bf8e21796

ifeq (1-mingw,$(HOST.cross)-$(HOST.system))
LIBDVDREAD.CONFIGURE.extra = --enable-dlfcn
Expand Down

0 comments on commit f90102b

Please sign in to comment.