summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-08-28 00:22:13 (GMT)
committerRichard Maw <richard.maw@codethink.co.uk>2014-08-28 10:46:22 (GMT)
commit021367d3c00599e730af1c907fba071038b9b1c9 (patch)
treecab03a0ce2618a5e5fc6df5387f678694fef2d01
parentc3d6de72c552a95267c1815b4a1fcbe1199c0581 (diff)
downloaddefinitions-021367d3c00599e730af1c907fba071038b9b1c9.tar.gz
Move common graphics components from wayland-generic to an independent stratum
Basically pixman, cairo, pango and deps These are common dependencies for weston and gtk/clutter
-rw-r--r--strata/graphics-common.morph52
-rw-r--r--strata/graphics-common/freefont-otf.morph (renamed from strata/wayland-generic/freefont-otf.morph)0
-rw-r--r--strata/gtk-deps.morph4
-rw-r--r--strata/wayland-generic.morph49
-rw-r--r--strata/wayland-generic/cairo.morph5
-rw-r--r--strata/weston-genivi.morph1
-rw-r--r--systems/genivi-baseline-system-armv7lhf-versatile.morph2
-rw-r--r--systems/genivi-baseline-system-x86_64-generic.morph2
8 files changed, 58 insertions, 57 deletions
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
new file mode 100644
index 0000000..bc1a7da
--- /dev/null
+++ b/strata/graphics-common.morph
@@ -0,0 +1,52 @@
+name: graphics-common
+kind: stratum
+build-depends:
+- morph: strata/x-common.morph
+- morph: strata/wayland-generic.morph
+chunks:
+- name: pixman
+ repo: upstream:pixman
+ ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: freetype2
+ repo: upstream:freetype2
+ ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: fontconfig
+ repo: upstream:fontconfig
+ ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
+ unpetrify-ref: baserock/morph
+ build-depends:
+ - freetype2
+- name: freefont-otf
+ morph: strata/graphics-common/freefont-otf.morph
+ repo: upstream:freefont-otf
+ ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
+ unpetrify-ref: baserock/morph
+ build-depends: []
+- name: cairo
+ repo: upstream:cairo
+ ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a
+ unpetrify-ref: baserock/genivi/1.12.10
+ build-depends:
+ - fontconfig
+ - freetype2
+ - pixman
+- name: harfbuzz
+ repo: upstream:harfbuzz
+ ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
+ unpetrify-ref: baserock/0.9.12
+ build-depends:
+ - freetype2
+- name: pango
+ repo: upstream:pango
+ ref: f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd
+ unpetrify-ref: baserock/1.36.3
+ build-depends:
+ - cairo
+ - harfbuzz
+ - fontconfig
+ - freetype2
+ - freefont-otf
diff --git a/strata/wayland-generic/freefont-otf.morph b/strata/graphics-common/freefont-otf.morph
index e5c6c48..e5c6c48 100644
--- a/strata/wayland-generic/freefont-otf.morph
+++ b/strata/graphics-common/freefont-otf.morph
diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph
index 0d9d745..dbee2e6 100644
--- a/strata/gtk-deps.morph
+++ b/strata/gtk-deps.morph
@@ -3,9 +3,7 @@ kind: stratum
description: the GTK+ dependencies stratum
build-depends:
- morph: strata/foundation.morph
-- morph: strata/x-common.morph
-- morph: strata/x-generic.morph
-- morph: strata/wayland-generic.morph
+- morph: strata/graphics-common.morph
chunks:
- name: shared-mime-info
morph: strata/gtk-deps/shared-mime-info.morph
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 8240f63..6bc1518 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -21,39 +21,6 @@ chunks:
unpetrify-ref: baserock/gnome
build-depends:
- wayland
-- name: pixman
- repo: upstream:pixman
- ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: freetype2
- repo: upstream:freetype2
- ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: fontconfig
- repo: upstream:fontconfig
- ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
- unpetrify-ref: baserock/morph
- build-depends:
- - freetype2
-- name: freefont-otf
- morph: strata/wayland-generic/freefont-otf.morph
- repo: upstream:freefont-otf
- ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
- unpetrify-ref: baserock/morph
- build-depends: []
-- name: cairo
- morph: strata/wayland-generic/cairo.morph
- repo: upstream:cairo
- ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a
- unpetrify-ref: baserock/genivi/1.12.10
- build-depends:
- - fontconfig
- - freetype2
- - wayland
- - mesa
- - pixman
- name: mtdev
repo: upstream:mtdev-git
ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d
@@ -96,19 +63,3 @@ chunks:
- mtdev
- libevdev
- linux-api-headers
-- name: harfbuzz
- repo: upstream:harfbuzz
- ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942
- unpetrify-ref: baserock/0.9.12
- build-depends:
- - freetype2
-- name: pango
- repo: upstream:pango
- ref: f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd
- unpetrify-ref: baserock/1.36.3
- build-depends:
- - cairo
- - harfbuzz
- - fontconfig
- - freetype2
- - freefont-otf
diff --git a/strata/wayland-generic/cairo.morph b/strata/wayland-generic/cairo.morph
deleted file mode 100644
index f91ac38..0000000
--- a/strata/wayland-generic/cairo.morph
+++ /dev/null
@@ -1,5 +0,0 @@
-name: cairo
-kind: chunk
-build-system: autotools
-configure-commands:
-- ./autogen.sh --prefix="$PREFIX" --enable-glesv2
diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph
index 356a556..1f62b5a 100644
--- a/strata/weston-genivi.morph
+++ b/strata/weston-genivi.morph
@@ -1,6 +1,7 @@
name: weston-genivi
kind: stratum
build-depends:
+- morph: strata/graphics-common.morph
- morph: strata/x-common.morph
- morph: strata/wayland-generic.morph
chunks:
diff --git a/systems/genivi-baseline-system-armv7lhf-versatile.morph b/systems/genivi-baseline-system-armv7lhf-versatile.morph
index 82f9973..aec413d 100644
--- a/systems/genivi-baseline-system-armv7lhf-versatile.morph
+++ b/systems/genivi-baseline-system-armv7lhf-versatile.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/genivi.morph
- name: wayland-generic
morph: strata/wayland-generic.morph
+- name: graphics-common
+ morph: strata/graphics-common.morph
- name: weston-genivi
morph: strata/weston-genivi.morph
configuration-extensions:
diff --git a/systems/genivi-baseline-system-x86_64-generic.morph b/systems/genivi-baseline-system-x86_64-generic.morph
index 8747b3a..711011c 100644
--- a/systems/genivi-baseline-system-x86_64-generic.morph
+++ b/systems/genivi-baseline-system-x86_64-generic.morph
@@ -25,6 +25,8 @@ strata:
morph: strata/genivi.morph
- name: wayland-generic
morph: strata/wayland-generic.morph
+- name: graphics-common
+ morph: strata/graphics-common.morph
- name: weston-genivi
morph: strata/weston-genivi.morph
configuration-extensions: