summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-11-03 13:13:21 +0000
committerJavier Jardón <jjardon@gnome.org>2015-11-03 13:14:00 +0000
commitdf7650d0bbc01ad7075a80e02ce39cb0e07a5b10 (patch)
tree2f380397b2d1f5c6fde121bc67a36b1115c0bbf1
parent39001e0b152771dd7f93d99d57e3f1a8b2854460 (diff)
downloaddefinitions-df7650d0bbc01ad7075a80e02ce39cb0e07a5b10.tar.gz
strata/graphics-common.morph: Upgrade freetype to 2.6.1
Since 2.5.3, freetype depends on HarfBuzz, but HarfBuzz depends on FreeType as well. Build freetype two times to avoid this chicken and egg problem as described in http://sourceforge.net/projects/freetype/files/freetype2/2.5.3/ Change-Id: Ic124b7a727d0e72941d4501ad5ae8e6c977c698d
-rw-r--r--strata/graphics-common.morph81
1 files changed, 44 insertions, 37 deletions
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
index 03af37a4..6540f213 100644
--- a/strata/graphics-common.morph
+++ b/strata/graphics-common.morph
@@ -13,36 +13,48 @@ chunks:
unpetrify-ref: pixman-0.32.6
- name: freetype2
repo: upstream:freetype2
- ref: ec8853cd18e1a0c275372769bdad37a79550ed66
- unpetrify-ref: VER-2-5-3
+ ref: 8cabd919ca63f0e6c12e8405e8542a45d910fa62
+ unpetrify-ref: VER-2-6-1
build-system: autotools
+- name: colm-tarball
+ repo: upstream:colm-tarball
+ ref: 404ae0f284a3b2d41fcdb53826550e4dfec5c65c
+ unpetrify-ref: colm-0.12.0
+ build-system: autotools
+- name: ragel-tarball
+ repo: upstream:ragel-tarball
+ ref: eafd7a3974e8605fd02794269db6114a3446e016
+ unpetrify-ref: ragel-6.9
+ build-system: autotools
+ build-depends:
+ - colm-tarball
+- name: harfbuzz
+ repo: upstream:harfbuzz
+ ref: 432ffc47a46d41bea17d839d0d3980e654c6e638
+ unpetrify-ref: 1.0.4
+ build-system: autotools
+ build-depends:
+ - freetype2
+ - ragel-tarball
+- name: freetype2-harfbuzz
+ repo: upstream:freetype2
+ ref: 8cabd919ca63f0e6c12e8405e8542a45d910fa62
+ unpetrify-ref: VER-2-6-1
+ build-system: autotools
+ build-depends:
+ - harfbuzz
- name: fontconfig
repo: upstream:fontconfig
ref: 9260b7ec39c34ce68d74e16d47917290a8c3f35a
unpetrify-ref: 2.11.1
build-system: autotools
build-depends:
- - freetype2
-- name: freefont-otf
- morph: strata/graphics-common/freefont-otf.morph
- repo: upstream:freefont-otf
- ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
- unpetrify-ref: baserock/morph
+ - freetype2-harfbuzz
- name: libpng
repo: upstream:libpng
ref: 88dd30b232362b65cca374dda39096888163dd6b
unpetrify-ref: libpng-1.6.16-signed
build-system: autotools
-- name: libjpeg
- repo: upstream:libjpeg
- ref: f57ac58ac664ede6bc6e8cd9d88e0edaa366e21a
- unpetrify-ref: baserock/morph
- build-system: autotools
-- name: libtiff
- repo: upstream:libtiff
- ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd
- unpetrify-ref: Release-v4-0-3
- build-system: autotools
- name: cairo
morph: strata/graphics-common/cairo.morph
repo: upstream:cairo
@@ -50,29 +62,24 @@ chunks:
unpetrify-ref: 1.14.0
build-depends:
- fontconfig
- - freetype2
+ - freetype2-harfbuzz
- pixman
- libpng
-- name: colm-tarball
- repo: upstream:colm-tarball
- ref: 404ae0f284a3b2d41fcdb53826550e4dfec5c65c
- unpetrify-ref: colm-0.12.0
- build-system: autotools
-- name: ragel-tarball
- repo: upstream:ragel-tarball
- ref: eafd7a3974e8605fd02794269db6114a3446e016
- unpetrify-ref: ragel-6.9
+- name: freefont-otf
+ morph: strata/graphics-common/freefont-otf.morph
+ repo: upstream:freefont-otf
+ ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
+ unpetrify-ref: baserock/morph
+- name: libjpeg
+ repo: upstream:libjpeg
+ ref: f57ac58ac664ede6bc6e8cd9d88e0edaa366e21a
+ unpetrify-ref: baserock/morph
build-system: autotools
- build-depends:
- - colm-tarball
-- name: harfbuzz
- repo: upstream:harfbuzz
- ref: 432ffc47a46d41bea17d839d0d3980e654c6e638
- unpetrify-ref: 1.0.4
+- name: libtiff
+ repo: upstream:libtiff
+ ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd
+ unpetrify-ref: Release-v4-0-3
build-system: autotools
- build-depends:
- - freetype2
- - ragel-tarball
- name: libwebp
repo: upstream:libwebp
ref: fcd94e925a9377cccfcf9de6db278126a52b97a4