contrib: update freetype fribidi harfbuzz and libass.

8 files changed, 25 insertions, 68 deletions

diff --git a/contrib/freetype/P00-mingw-lib.patch b/contrib/freetype/P00-mingw-lib.patch
deleted file mode 100644
index e7e09e2cc..000000000
--- a/contrib/freetype/P00-mingw-lib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur freetype-2.10.1.orig/builds/unix/ftconfig.in freetype-2.10.1/builds/unix/ftconfig.in
---- freetype-2.10.1.orig/builds/unix/ftconfig.in	2019-02-23 04:06:06.000000000 -0500
-+++ freetype-2.10.1/builds/unix/ftconfig.in	2019-10-13 16:10:52.000000000 -0400
-@@ -488,7 +488,7 @@
- #ifdef FT2_BUILD_LIBRARY
- 
- #if defined( _WIN32 ) && defined( DLL_EXPORT )
--#define FT_EXPORT( x )  __declspec( dllexport )  x
-+#define FT_EXPORT( x )  x
- #elif defined( __GNUC__ ) && __GNUC__ >= 4
- #define FT_EXPORT( x )  __attribute__(( visibility( "default" ) ))  x
- #elif defined( __SUNPRO_C ) && __SUNPRO_C >= 0x550
-diff -ur freetype-2.10.1.orig/include/freetype/config/ftconfig.h freetype-2.10.1/include/freetype/config/ftconfig.h
---- freetype-2.10.1.orig/include/freetype/config/ftconfig.h	2019-02-23 04:06:06.000000000 -0500
-+++ freetype-2.10.1/include/freetype/config/ftconfig.h	2019-10-13 16:12:48.000000000 -0400
-@@ -460,7 +460,7 @@
- #ifdef FT2_BUILD_LIBRARY
- 
- #if defined( _WIN32 ) && defined( DLL_EXPORT )
--#define FT_EXPORT( x )  __declspec( dllexport )  x
-+#define FT_EXPORT( x )  x
- #elif defined( __GNUC__ ) && __GNUC__ >= 4
- #define FT_EXPORT( x )  __attribute__(( visibility( "default" ) ))  x
- #elif defined( __SUNPRO_C ) && __SUNPRO_C >= 0x550
diff --git a/contrib/freetype/module.defs b/contrib/freetype/module.defs
index a0d61dd49..3c9af3087 100644
--- a/contrib/freetype/module.defs
+++ b/contrib/freetype/module.defs
@@ -2,9 +2,9 @@ __deps__ := BZIP2 ZLIB
 $(eval $(call import.MODULE.defs,FREETYPE,freetype,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FREETYPE))
 
-FREETYPE.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/freetype-2.10.1.tar.gz
-FREETYPE.FETCH.url    += https://download.savannah.gnu.org/releases/freetype/freetype-2.10.1.tar.gz
-FREETYPE.FETCH.sha256  = 3a60d391fd579440561bf0e7f31af2222bc610ad6ce4d9d7bd2165bca8669110
+FREETYPE.FETCH.url     = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/freetype-2.10.4.tar.gz
+FREETYPE.FETCH.url    += https://download.savannah.gnu.org/releases/freetype/freetype-2.10.4.tar.gz
+FREETYPE.FETCH.sha256  = 5eab795ebb23ac77001cfb68b7d4d50b5d6c7469247b0b01b2c953269f658dac
 
 FREETYPE.CONFIGURE.deps  =
-FREETYPE.CONFIGURE.extra = --with-harfbuzz=no --with-png=no
+FREETYPE.CONFIGURE.extra = --with-harfbuzz=no --with-png=no --with-brotli=no
diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
index 63316a689..30c701944 100644
--- a/contrib/fribidi/module.defs
+++ b/contrib/fribidi/module.defs
@@ -1,10 +1,10 @@
 $(eval $(call import.MODULE.defs,FRIBIDI,fribidi))
 $(eval $(call import.CONTRIB.defs,FRIBIDI))
 
-FRIBIDI.FETCH.url      = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/fribidi-1.0.7.tar.gz
-FRIBIDI.FETCH.url     += https://github.com/fribidi/fribidi/archive/v1.0.7.tar.gz
-FRIBIDI.FETCH.sha256   = 4352e95aa26bc0c4a45a224d606df0aba5f17f8cadcbcde36dd976e585a320e8
-FRIBIDI.FETCH.basename = fribidi-1.0.7.tar.gz
+FRIBIDI.FETCH.url      = https://github.com/HandBrake/HandBrake-contribs/releases/download/contribs/fribidi-1.0.10.tar.gz
+FRIBIDI.FETCH.url     += https://github.com/fribidi/fribidi/archive/v1.0.10.tar.gz
+FRIBIDI.FETCH.sha256   = 3ebb19c4184ed6dc324d2e291d7465bc6108a20be019f053f33228e07e879c4f
+FRIBIDI.FETCH.basename = fribidi-1.0.10.tar.gz
 
 FRIBIDI.CONFIGURE.bootstrap = rm -fr aclocal.m4 autom4te.cache configure; autoreconf -I m4 -fiv;
 
diff --git a/contrib/harfbuzz/P00-darwin-applesi-cross.patch b/contrib/harfbuzz/P00-darwin-applesi-cross.patch
deleted file mode 100644
index 2656bab05..000000000
--- a/contrib/harfbuzz/P00-darwin-applesi-cross.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/config.sub b/config.sub
-index 20f7cf2..9c52d5b 100755
---- a/config.sub
-+++ b/config.sub
-@@ -264,7 +264,7 @@ case $basic_machine in
- 	# Some are omitted here because they have special meanings below.
- 	1750a | 580 \
- 	| a29k \
--	| aarch64 | aarch64_be \
-+	| aarch64 | aarch64_be | arm64 \
- 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
- 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
- 	| am33_2.0 \
-@@ -393,7 +393,7 @@ case $basic_machine in
- 	# Recognize the basic CPU types with company name.
- 	580-* \
- 	| a29k-* \
--	| aarch64-* | aarch64_be-* \
-+	| aarch64-* | aarch64_be-* | arm64*-* \
- 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
- 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
- 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \
diff --git a/contrib/harfbuzz/module.defs b/contrib/harfbuzz/module.defs
index c94353cf2..b6b23e09f 100644
--- a/contrib/harfbuzz/module.defs
+++ b/contrib/harfbuzz/module.defs
@@ -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.6.4.tar.xz
-HARFBUZZ.FETCH.url    += https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-2.6.4.tar.xz
-HARFBUZZ.FETCH.sha256  = 9413b8d96132d699687ef914ebb8c50440efc87b3f775d25856d7ec347c03c12
+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.build_dir             = build
 HARFBUZZ.CONFIGURE.exe         = cmake
diff --git a/contrib/libass/A00-fribidi-include.patch b/contrib/libass/A00-fribidi-include.patch
index 0b8fb97f1..82543b7fa 100644
--- a/contrib/libass/A00-fribidi-include.patch
+++ b/contrib/libass/A00-fribidi-include.patch
@@ -1,12 +1,13 @@
-diff -u libass-0.12.3/libass/ass_shaper.h.orig libass-0.12.3/libass/ass_shaper.h
---- libass-0.12.3/libass/ass_shaper.h.orig	2015-09-17 23:53:21.000000000 -0400
-+++ libass-0.12.3/libass/ass_shaper.h	2015-09-17 23:54:43.000000000 -0400
+diff --git a/libass/ass_shaper.h b/libass/ass_shaper.h
+index 2c4166d..3cb12b0 100644
+--- a/libass/ass_shaper.h
++++ b/libass/ass_shaper.h
 @@ -21,7 +21,7 @@
  
- #include "config.h"
+ typedef struct ass_shaper ASS_Shaper;
  
 -#include <fribidi.h>
 +#include <fribidi/fribidi.h>
+ #include <stdbool.h>
  #include "ass_render.h"
  
- void ass_shaper_info(ASS_Library *lib);
diff --git a/contrib/libass/P01-darwin-applesi-cross.patch b/contrib/libass/P01-darwin-applesi-cross.patch
index 238105196..11bc28e23 100644
--- a/contrib/libass/P01-darwin-applesi-cross.patch
+++ b/contrib/libass/P01-darwin-applesi-cross.patch
@@ -1,8 +1,8 @@
 diff --git a/config.sub b/config.sub
-index 7ffe373..49e3909 100755
+index 9ccf09a..45f8b8a 100755
 --- a/config.sub
 +++ b/config.sub
-@@ -248,7 +248,7 @@ case $basic_machine in
+@@ -244,7 +244,7 @@ case $basic_machine in
  	# Some are omitted here because they have special meanings below.
  	1750a | 580 \
  	| a29k \
@@ -11,7 +11,7 @@ index 7ffe373..49e3909 100755
  	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
  	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
  	| am33_2.0 \
-@@ -370,7 +370,7 @@ case $basic_machine in
+@@ -368,7 +368,7 @@ case $basic_machine in
  	# Recognize the basic CPU types with company name.
  	580-* \
  	| a29k-* \
diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs
index 594f456f1..597cab550 100644
--- a/contrib/libass/module.defs
+++ b/contrib/libass/module.defs
@@ -7,13 +7,15 @@ 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.14.0.tar.gz
-LIBASS.FETCH.url    += https://github.com/libass/libass/releases/download/0.14.0/libass-0.14.0.tar.gz
-LIBASS.FETCH.sha256  = 8d5a5c920b90b70a108007ffcd2289ac652c0e03fc88e6eecefa37df0f2e7fdf
+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
 
 # Tell configure where to find our version of freetype
 LIBASS.CONFIGURE.extra = \
     --enable-asm --enable-harfbuzz \
+    HARFBUZZ_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lharfbuzz" \
+    HARFBUZZ_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/harfbuzz" \
     FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \
     FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \