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/harfbuzz | |
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/harfbuzz')
-rw-r--r-- | contrib/harfbuzz/module.defs | 25 | ||||
-rw-r--r-- | contrib/harfbuzz/module.rules | 2 |
2 files changed, 27 insertions, 0 deletions
diff --git a/contrib/harfbuzz/module.defs b/contrib/harfbuzz/module.defs new file mode 100644 index 000000000..a723180b8 --- /dev/null +++ b/contrib/harfbuzz/module.defs @@ -0,0 +1,25 @@ +__deps__ := FONTCONFIG FREETYPE +$(eval $(call import.MODULE.defs,HARFBUZZ,harfbuzz,$(__deps__))) +$(eval $(call import.CONTRIB.defs,HARFBUZZ)) + +HARFBUZZ.FETCH.url = http://download.handbrake.fr/handbrake/contrib/harfbuzz-1.2.6.tar.bz2 +HARFBUZZ.FETCH.url += https://www.freedesktop.org/software/harfbuzz/release/harfbuzz-1.2.6.tar.bz2 +HARFBUZZ.FETCH.md5 = 9f4b6831c86135faef011e991f59f77f + +# Tell configure where to find our versions of freetype and fontconfig +HARFBUZZ.CONFIGURE.extra = \ + --with-fontconfig=yes --with-freetype=yes \ + 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" + +ifeq ($(BUILD.system),darwin) + HARFBUZZ.CONFIGURE.extra += --with-coretext=no --with-glib=no +endif + +ifeq (1-mingw,$(BUILD.cross)-$(BUILD.system)) + HARFBUZZ.CONFIGURE.extra += --with-directwrite=no --with-glib=no \ + --with-gobject=no --with-cairo=no --with-icu=no --with-graphite=no \ + --with-uniscribe=no +endif diff --git a/contrib/harfbuzz/module.rules b/contrib/harfbuzz/module.rules new file mode 100644 index 000000000..dab4f1d1c --- /dev/null +++ b/contrib/harfbuzz/module.rules @@ -0,0 +1,2 @@ +$(eval $(call import.MODULE.rules,HARFBUZZ)) +$(eval $(call import.CONTRIB.rules,HARFBUZZ)) |