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

5 files changed, 54 insertions, 0 deletions

diff --git a/contrib/fribidi/A00-disable-tests.patch b/contrib/fribidi/A00-disable-tests.patch
new file mode 100644
index 000000000..50f26fd2d
--- /dev/null
+++ 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
new file mode 100644
index 000000000..e8d78876a
--- /dev/null
+++ 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
new file mode 100644
index 000000000..38c5e54ae
--- /dev/null
+++ 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
new file mode 100644
index 000000000..b291326eb
--- /dev/null
+++ 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
new file mode 100644
index 000000000..e7b0f6119
--- /dev/null
+++ b/contrib/fribidi/module.rules
@@ -0,0 +1,2 @@
+$(eval $(call import.MODULE.rules,FRIBIDI))
+$(eval $(call import.CONTRIB.rules,FRIBIDI))