ASS bump to 0.10.0

libass has a new dependency on fribidi. So also add fribidi to contribs. I repackaged the libass distribution because the configure script shipped with it is damaged beyond repair for darwin. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@4304 b64f7644-9d1e-0410-96f1-a4d463321fa5
strogo · Oct 21, 2011 · f28797d · f28797d
1 parent 68fe94b
commit f28797d
Show file tree

Hide file tree

Showing 11 changed files with 95 additions and 88 deletions.
diff --git a/contrib/fribidi/A00-disable-tests.patch b/contrib/fribidi/A00-disable-tests.patch
@@ -0,0 +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
+@@ -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
+
diff --git a/contrib/fribidi/P00-mingw-static-lib.patch b/contrib/fribidi/P00-mingw-static-lib.patch
@@ -0,0 +1,11 @@
+--- 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
@@ -0,0 +1,24 @@
+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
@@ -0,0 +1,6 @@
+$(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.CONFIGURE.bootstrap = ./bootstrap;
diff --git a/contrib/fribidi/module.rules b/contrib/fribidi/module.rules
@@ -0,0 +1,2 @@
+$(eval $(call import.MODULE.rules,FRIBIDI))
+$(eval $(call import.CONTRIB.rules,FRIBIDI))
diff --git a/contrib/libass/A00-configure.patch b/contrib/libass/A00-configure.patch
diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs
@@ -1,9 +1,8 @@
-__deps__ := FONTCONFIG FREETYPE
+__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.9.9.tar.bz2
-LIBASS.EXTRACT.tarbase = libass-0.9.9
+LIBASS.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libass-0.10.0-1.tar.gz
 
 # Disable as many external dependencies as I can get away with
 # and tell configure where to find our version of freetype
@@ -12,4 +11,6 @@ LIBASS.CONFIGURE.extra = \
     FREETYPE_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfreetype" \
     FREETYPE_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/freetype2" \
     FONTCONFIG_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfontconfig" \
-    FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include"
+    FONTCONFIG_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include" \
+    FRIBIDI_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfribidi" \
+    FRIBIDI_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include/fribidi"
diff --git a/libhb/module.defs b/libhb/module.defs
@@ -102,6 +102,12 @@ else
     LIBHB.GCC.l += iconv
 endif
 
+ifeq (1,$(FRIBIDI.enabled))
+    LIBHB.dll.libs += $(CONTRIB.build/)lib/libfribidi.a
+else
+	LIBHB.GCC.l += fribidi
+endif
+
 ifneq ($(HAS.pthread),1)
 LIBHB.dll.libs += $(CONTRIB.build/)lib/libpthreadGC2.a
 else

diff --git a/macosx/HandBrake.xcodeproj/project.pbxproj b/macosx/HandBrake.xcodeproj/project.pbxproj
@@ -749,6 +749,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -784,6 +785,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -854,6 +856,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -895,6 +898,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -986,6 +990,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1027,6 +1032,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1118,6 +1124,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1159,6 +1166,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1250,6 +1258,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1291,6 +1300,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1385,6 +1395,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1426,6 +1437,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1520,6 +1532,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1561,6 +1574,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1655,6 +1669,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1696,6 +1711,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1790,6 +1806,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1831,6 +1848,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1933,6 +1951,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",
@@ -1978,6 +1997,7 @@
 					"$(EXTERNAL_BUILD)/contrib/lib/libfaac.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfontconfig.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libfreetype.a",
+					"$(EXTERNAL_BUILD)/contrib/lib/libfribidi.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmkv.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp3lame.a",
 					"$(EXTERNAL_BUILD)/contrib/lib/libmp4v2.a",

diff --git a/make/include/main.defs b/make/include/main.defs
@@ -16,6 +16,11 @@ ifneq ($(HAS.bz2),1)
 endif
 endif
 
+ifneq (,$(filter $(BUILD.system),darwin cygwin mingw))
+    MODULES += contrib/fribidi
+endif
+
+
 MODULES += contrib/faac
 MODULES += contrib/ffmpeg
 MODULES += contrib/fontconfig

diff --git a/test/module.defs b/test/module.defs
@@ -32,6 +32,11 @@ ifeq (1,$(ZLIB.enabled))
 else
 	TEST.GCC.l += z
 endif
+ifeq (1,$(FRIBIDI.enabled))
+    TEST.libs += $(CONTRIB.build/)lib/libfribidi.a
+else
+	TEST.GCC.l += fribidi
+endif
 
 ###############################################################################
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		$(eval $(call import.MODULE.rules,FRIBIDI))
		$(eval $(call import.CONTRIB.rules,FRIBIDI))