Merge pull request #4 from bradleysepos/contrib

Update font-related contribs.

8 files changed, 37 insertions, 49 deletions

diff --git a/contrib/fontconfig/module.defs b/contrib/fontconfig/module.defs
index d047d22cc..8fe0785eb 100644
--- a/contrib/fontconfig/module.defs
+++ b/contrib/fontconfig/module.defs
@@ -2,8 +2,8 @@ __deps__ := FREETYPE LIBXML2 LIBICONV
 $(eval $(call import.MODULE.defs,FONTCONFIG,fontconfig,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FONTCONFIG))
 
-FONTCONFIG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/fontconfig-2.11.93.tar.bz2
-FONTCONFIG.EXTRACT.tarbase = fontconfig-2.11.93
+FONTCONFIG.FETCH.url = http://download.handbrake.fr/handbrake/contrib/fontconfig-2.11.94.tar.bz2
+FONTCONFIG.EXTRACT.tarbase = fontconfig-2.11.94
 
 #
 # Under MinGW:
diff --git a/contrib/freetype/module.defs b/contrib/freetype/module.defs
index f4ad34568..4646ce295 100644
--- a/contrib/freetype/module.defs
+++ b/contrib/freetype/module.defs
@@ -1,6 +1,7 @@
-__deps__ := BZIP
+__deps__ := BZIP ZLIB
 $(eval $(call import.MODULE.defs,FREETYPE,freetype,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,FREETYPE))
 
-FREETYPE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/freetype-2.4.7.tar.bz2
+FREETYPE.FETCH.url = http://download.handbrake.fr/handbrake/contrib/freetype-2.6.tar.bz2
 
+FREETYPE.CONFIGURE.extra = --with-harfbuzz=no --with-png=no
diff --git a/contrib/fribidi/A00-disable-tests.patch b/contrib/fribidi/A00-disable-tests.patch
index 50f26fd2d..9c5f0be0d 100644
--- a/contrib/fribidi/A00-disable-tests.patch
+++ b/contrib/fribidi/A00-disable-tests.patch
@@ -1,11 +1,11 @@
-diff -Naur fribidi-0.19.2.orig/bin/Makefile.am fribidi-0.19.2/bin/Makefile.am
---- fribidi-0.19.2.orig/bin/Makefile.am	2005-06-07 01:39:14.000000000 -0700
-+++ fribidi-0.19.2/bin/Makefile.am	2011-10-20 10:19:14.380722654 -0700
+diff -u fribidi-0.19.7/bin/Makefile.am.orig fribidi-0.19.7/bin/Makefile.am
+--- fribidi-0.19.7/bin/Makefile.am.orig	2012-08-27 15:30:17.000000000 -0400
++++ fribidi-0.19.7/bin/Makefile.am	2015-09-17 22:57:45.000000000 -0400
 @@ -1,6 +1,6 @@
  bin_PROGRAMS = fribidi
  
--noinst_PROGRAMS = fribidi-benchmark fribidi-bidi-types fribidi-caprtl2utf8
-+noinst_PROGRAMS = fribidi-bidi-types fribidi-caprtl2utf8
- 
- getopt_SOURCES = getopt.c getopt1.c getopt_int.h getopt.h gettext.h
- 
+-noinst_PROGRAMS = fribidi-benchmark fribidi-bidi-types
++noinst_PROGRAMS = fribidi-bidi-types
+ if FRIBIDI_CHARSETS
+ noinst_PROGRAMS += fribidi-caprtl2utf8
+ endif
diff --git a/contrib/fribidi/P00-mingw-static-lib.patch b/contrib/fribidi/P00-mingw-static-lib.patch
deleted file mode 100644
index e8d78876a..000000000
--- a/contrib/fribidi/P00-mingw-static-lib.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fribidi-0.19.2.orig/lib/fribidi-common.h	2007-04-05 09:13:24.000000000 -0700
-+++ fribidi-0.19.2/lib/fribidi-common.h	2011-10-20 11:00:21.874917516 -0700
-@@ -54,7 +54,7 @@
- /* FRIBIDI_ENTRY is a macro used to declare library entry points. */
- #ifndef FRIBIDI_ENTRY
- # if (defined(WIN32)) || (defined(_WIN32_WCE))
--#  define FRIBIDI_ENTRY __declspec(dllimport)
-+#  define FRIBIDI_ENTRY
- # else /* !WIN32 */
- #  define FRIBIDI_ENTRY		/* empty */
- # endif	/* !WIN32 */
diff --git a/contrib/fribidi/P01-darwin-no-glib.patch b/contrib/fribidi/P01-darwin-no-glib.patch
deleted file mode 100644
index 38c5e54ae..000000000
--- a/contrib/fribidi/P01-darwin-no-glib.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur fribidi-0.19.2.orig/configure.ac fribidi-0.19.2/configure.ac
---- fribidi-0.19.2.orig/configure.ac	2009-03-26 15:37:29.000000000 -0700
-+++ fribidi-0.19.2/configure.ac	2011-10-20 14:15:40.000000000 -0700
-@@ -172,18 +172,8 @@
- GLIB_MINVERSION=2.4
- GLIB_LIBS=
- GLIB_CFLAGS=
--if test x$with_glib = xyes; then
--	PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION)
--	FRIBIDI_USE_GLIB=1
--else
--if test x$with_glib = xno; then
--	FRIBIDI_USE_GLIB=0
--else
--	PKG_CHECK_MODULES(GLIB,$GLIB_PACKAGE >= $GLIB_MINVERSION,
--		FRIBIDI_USE_GLIB=1,
--		FRIBIDI_USE_GLIB=0)
--fi
--fi
-+FRIBIDI_USE_GLIB=0
-+
- if test x$FRIBIDI_USE_GLIB = x0; then
- 	GLIB_PACKAGE=
- fi
diff --git a/contrib/fribidi/module.defs b/contrib/fribidi/module.defs
index b291326eb..646a566ab 100644
--- a/contrib/fribidi/module.defs
+++ b/contrib/fribidi/module.defs
@@ -1,6 +1,16 @@
+ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+__deps__ := PTHREADW32
+endif
+
 $(eval $(call import.MODULE.defs,FRIBIDI,fribidi))
 $(eval $(call import.CONTRIB.defs,FRIBIDI))
 
-FRIBIDI.FETCH.url = http://download.handbrake.fr/handbrake/contrib/fribidi-0.19.2.tar.gz
+FRIBIDI.FETCH.url = http://download.handbrake.fr/handbrake/contrib/fribidi-0.19.7.tar.bz2
+
+ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system))
+    FRIBIDI.CONFIGURE.extra = --with-glib=no
+else ifeq (darwin,$(BUILD.system))
+    FRIBIDI.CONFIGURE.extra = --with-glib=no
+endif
 
 FRIBIDI.CONFIGURE.bootstrap = ./bootstrap;
diff --git a/contrib/libass/A00-fribidi-include.patch b/contrib/libass/A00-fribidi-include.patch
new file mode 100644
index 000000000..0b8fb97f1
--- /dev/null
+++ b/contrib/libass/A00-fribidi-include.patch
@@ -0,0 +1,12 @@
+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
+@@ -21,7 +21,7 @@
+ 
+ #include "config.h"
+ 
+-#include <fribidi.h>
++#include <fribidi/fribidi.h>
+ #include "ass_render.h"
+ 
+ void ass_shaper_info(ASS_Library *lib);
diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs
index fd588d5e8..6f32d0ec1 100644
--- a/contrib/libass/module.defs
+++ b/contrib/libass/module.defs
@@ -2,7 +2,7 @@ __deps__ := FONTCONFIG FREETYPE FRIBIDI
 $(eval $(call import.MODULE.defs,LIBASS,libass,$(__deps__)))
 $(eval $(call import.CONTRIB.defs,LIBASS))
 
-LIBASS.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libass-0.10.0-1.tar.gz
+LIBASS.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libass-0.12.3.tar.gz
 
 # Disable as many external dependencies as I can get away with
 # and tell configure where to find our version of freetype