diff options
author | jstebbins <[email protected]> | 2010-09-28 22:10:49 +0000 |
---|---|---|
committer | jstebbins <[email protected]> | 2010-09-28 22:10:49 +0000 |
commit | 03b2ce0e91c4e4ed44445a075ef5f35bc052b5b8 (patch) | |
tree | 24a1def4ca91cba98676508c6a3b1482ba131cb5 /contrib/libass | |
parent | f1997be4ed1dd373316ac842685f18a6f8ab05ba (diff) |
SSA subtitle burn in
Anime fans rejoice! This patch adds SSA subtitle burn-in support with libass.
Therefore SSA subtitles should now be rendered in full quality, with the
appropriate embedded fonts and positioning information.
Thanks to davidfstr
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3557 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'contrib/libass')
-rw-r--r-- | contrib/libass/A00-configure.patch | 84 | ||||
-rw-r--r-- | contrib/libass/module.defs | 15 | ||||
-rw-r--r-- | contrib/libass/module.rules | 2 |
3 files changed, 101 insertions, 0 deletions
diff --git a/contrib/libass/A00-configure.patch b/contrib/libass/A00-configure.patch new file mode 100644 index 000000000..d26e0fb47 --- /dev/null +++ b/contrib/libass/A00-configure.patch @@ -0,0 +1,84 @@ +--- 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 new file mode 100644 index 000000000..e5528fd43 --- /dev/null +++ b/contrib/libass/module.defs @@ -0,0 +1,15 @@ +__deps__ := FONTCONFIG FREETYPE +$(eval $(call import.MODULE.defs,LIBASS,libass,$(__deps__))) +$(eval $(call import.CONTRIB.defs,LIBASS)) + +LIBASS.FETCH.url = http://download.m0k.org/handbrake/contrib/libass-0.9.9.tar.bz2 +LIBASS.EXTRACT.tarbase = libass-0.9.9 + +# Disable as many external dependencies as I can get away with +# and tell configure where to find our version of freetype +LIBASS.CONFIGURE.extra = \ + --disable-png --disable-enca \ + 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" diff --git a/contrib/libass/module.rules b/contrib/libass/module.rules new file mode 100644 index 000000000..67a5ab679 --- /dev/null +++ b/contrib/libass/module.rules @@ -0,0 +1,2 @@ +$(eval $(call import.MODULE.rules,LIBASS)) +$(eval $(call import.CONTRIB.rules,LIBASS)) |