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

2 files changed, 5 insertions, 88 deletions

diff --git a/contrib/libass/A00-configure.patch b/contrib/libass/A00-configure.patch
deleted file mode 100644
index d26e0fb47..000000000
--- a/contrib/libass/A00-configure.patch
+++ /dev/null
@@ -1,84 +0,0 @@
---- libass-0.9.9/configure	2010-02-28 20:38:16.000000000 -0800
-+++ libass-0.9.9/configure	2010-08-19 23:24:11.000000000 -0700
-@@ -15728,10 +15728,10 @@
- { echo "$as_me:$LINENO: checking for FREETYPE" >&5
- echo $ECHO_N "checking for FREETYPE... $ECHO_C" >&6; }
- 
--if test -n "$PKG_CONFIG"; then
-     if test -n "$FREETYPE_CFLAGS"; then
-         pkg_cv_FREETYPE_CFLAGS="$FREETYPE_CFLAGS"
-     else
-+if test -n "$PKG_CONFIG"; then
-         if test -n "$PKG_CONFIG" && \
-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 9.10.3\"") >&5
-   ($PKG_CONFIG --exists --print-errors "freetype2 >= 9.10.3") 2>&5
-@@ -15742,14 +15742,14 @@
- else
-   pkg_failed=yes
- fi
--    fi
- else
- 	pkg_failed=untried
- fi
--if test -n "$PKG_CONFIG"; then
-+    fi
-     if test -n "$FREETYPE_LIBS"; then
-         pkg_cv_FREETYPE_LIBS="$FREETYPE_LIBS"
-     else
-+if test -n "$PKG_CONFIG"; then
-         if test -n "$PKG_CONFIG" && \
-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"freetype2 >= 9.10.3\"") >&5
-   ($PKG_CONFIG --exists --print-errors "freetype2 >= 9.10.3") 2>&5
-@@ -15760,10 +15760,10 @@
- else
-   pkg_failed=yes
- fi
--    fi
- else
- 	pkg_failed=untried
- fi
-+    fi
- 
- 
- 
-@@ -15849,10 +15849,10 @@
- { echo "$as_me:$LINENO: checking for FONTCONFIG" >&5
- echo $ECHO_N "checking for FONTCONFIG... $ECHO_C" >&6; }
- 
--if test -n "$PKG_CONFIG"; then
-     if test -n "$FONTCONFIG_CFLAGS"; then
-         pkg_cv_FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS"
-     else
-+if test -n "$PKG_CONFIG"; then
-         if test -n "$PKG_CONFIG" && \
-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.4.2\"") >&5
-   ($PKG_CONFIG --exists --print-errors "fontconfig >= 2.4.2") 2>&5
-@@ -15863,14 +15863,14 @@
- else
-   pkg_failed=yes
- fi
--    fi
- else
- 	pkg_failed=untried
- fi
--if test -n "$PKG_CONFIG"; then
-+    fi
-     if test -n "$FONTCONFIG_LIBS"; then
-         pkg_cv_FONTCONFIG_LIBS="$FONTCONFIG_LIBS"
-     else
-+if test -n "$PKG_CONFIG"; then
-         if test -n "$PKG_CONFIG" && \
-     { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"fontconfig >= 2.4.2\"") >&5
-   ($PKG_CONFIG --exists --print-errors "fontconfig >= 2.4.2") 2>&5
-@@ -15881,10 +15881,10 @@
- else
-   pkg_failed=yes
- fi
--    fi
- else
- 	pkg_failed=untried
- fi
-+    fi
- 
- 
- 
diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs
index dd27833cc..c8fd4360c 100644
--- 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"