diff options
| author | Javier Jardón <jjardon@gnome.org> | 2015-11-06 13:22:19 +0000 |
|---|---|---|
| committer | Baserock Gerrit <gerrit@baserock.org> | 2015-11-06 15:23:42 +0000 |
| commit | 37dcfe0f473fbbcf0b0bd5edd3bf3b2b03830923 (patch) | |
| tree | 9a1ef8c393da668c7165fecf0697ad452ab0af91 | |
| parent | 0abb5c7554cd8717d2803cbbc9eb97a82e00fb45 (diff) | |
| download | definitions-37dcfe0f473fbbcf0b0bd5edd3bf3b2b03830923.tar.gz | |
Revert "strata/graphics-common.morph: Upgrade freetype to 2.6.1"
This change broke the gnome and weston sessions
This reverts commit df7650d0bbc01ad7075a80e02ce39cb0e07a5b10.
Change-Id: I70daee88662057781115b8ccbeddf4a66b65e0c4
| -rw-r--r-- | strata/graphics-common.morph | 81 |
1 files changed, 37 insertions, 44 deletions
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index 6540f213..03af37a4 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -13,48 +13,36 @@ chunks: unpetrify-ref: pixman-0.32.6 - name: freetype2 repo: upstream:freetype2 - ref: 8cabd919ca63f0e6c12e8405e8542a45d910fa62 - unpetrify-ref: VER-2-6-1 + ref: ec8853cd18e1a0c275372769bdad37a79550ed66 + unpetrify-ref: VER-2-5-3 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-harfbuzz + - freetype2 +- name: freefont-otf + morph: strata/graphics-common/freefont-otf.morph + repo: upstream:freefont-otf + ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7 + unpetrify-ref: baserock/morph - 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 @@ -62,24 +50,29 @@ chunks: unpetrify-ref: 1.14.0 build-depends: - fontconfig - - freetype2-harfbuzz + - freetype2 - pixman - libpng -- 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 +- name: colm-tarball + repo: upstream:colm-tarball + ref: 404ae0f284a3b2d41fcdb53826550e4dfec5c65c + unpetrify-ref: colm-0.12.0 build-system: autotools -- name: libtiff - repo: upstream:libtiff - ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd - unpetrify-ref: Release-v4-0-3 +- 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: libwebp repo: upstream:libwebp ref: fcd94e925a9377cccfcf9de6db278126a52b97a4 |