diff options
| author | Bradley Sepos <[email protected]> | 2016-05-01 18:57:42 -0400 |
|---|---|---|
| committer | Bradley Sepos <[email protected]> | 2016-05-25 15:54:05 -0400 |
| commit | 85c90d645736c5b60093e91216208e9edd81b750 (patch) | |
| tree | 90619436f7e2c422d0bdaa18e45ad83bc5460166 /contrib/libass | |
| parent | 810bde37ee14a29a087eabe409839fc5c53ada06 (diff) | |
contrib: Update to libass 0.13.2 and add HarfBuzz 1.2.6.
HarfBuzz is now enabled when building libass.
Resolves #162.
Additional libass notes:
- Add yasm dependency for better performance.
- Remove no longer valid configure params.
- Disable new coretext and directwrite font selection backends pending additional testing (coretext did not build properly).
Diffstat (limited to 'contrib/libass')
| -rw-r--r-- | contrib/libass/module.defs | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/contrib/libass/module.defs b/contrib/libass/module.defs index 48a3d4fc1..a13491b76 100644 --- a/contrib/libass/module.defs +++ b/contrib/libass/module.defs @@ -1,19 +1,14 @@ -__deps__ := FONTCONFIG FREETYPE FRIBIDI +__deps__ := YASM FONTCONFIG FREETYPE FRIBIDI HARFBUZZ $(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.12.3.tar.gz -LIBASS.FETCH.url += https://github.com/libass/libass/releases/download/0.12.3/libass-0.12.3.tar.gz -LIBASS.FETCH.md5 = 648ee785f966c69d4b5d50948e509d93 +LIBASS.FETCH.url = http://download.handbrake.fr/handbrake/contrib/libass-0.13.2.tar.gz +LIBASS.FETCH.url += https://github.com/libass/libass/releases/download/0.13.2/libass-0.13.2.tar.gz +LIBASS.FETCH.md5 = b4d82616bb18e8e954b18746a105a3b8 -# TODO: libass >= 0.13.0 -#LIBASS.FETCH.url = https://github.com/libass/libass/releases/download/0.13.0/libass-0.13.0.tar.gz -#LIBASS.FETCH.md5 = 44290519105b3779b8b25813a25a9914 - -# Disable as many external dependencies as I can get away with -# and tell configure where to find our version of freetype +# Tell configure where to find our versions of freetype and fontconfig LIBASS.CONFIGURE.extra = \ - --disable-png --disable-enca --disable-harfbuzz \ + --enable-asm --enable-fontconfig --enable-harfbuzz \ 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" \ @@ -24,3 +19,11 @@ LIBASS.CONFIGURE.extra += \ FRIBIDI_LIBS="-L$(call fn.ABSOLUTE,$(CONTRIB.build/))lib -lfribidi" \ FRIBIDI_CFLAGS="-I$(call fn.ABSOLUTE,$(CONTRIB.build/))include" endif + +ifeq ($(BUILD.system),darwin) + LIBASS.CONFIGURE.extra += --disable-coretext +endif + +ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) + LIBASS.CONFIGURE.extra += --disable-directwrite +endif |