From fa35f9272d937f67f73632d7b4b97491c93bd035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 28 Aug 2014 01:22:10 +0100 Subject: Build only one wayland independent of the architecture This makes gtk (and everything that is on top) independent of the architecture we are building. --- strata/wayland-generic.morph | 135 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 135 insertions(+) create mode 100644 strata/wayland-generic.morph (limited to 'strata/wayland-generic.morph') diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph new file mode 100644 index 00000000..5c5c825a --- /dev/null +++ b/strata/wayland-generic.morph @@ -0,0 +1,135 @@ +name: wayland-generic +kind: stratum +build-depends: +- morph: strata/x-common.morph +chunks: +- name: libxkbcommon + repo: upstream:xorg-lib-libxkbcommon + ref: b721254769212d671a4729f1c88b059979b80efc + unpetrify-ref: baserock/genivi/baseline + build-depends: [] +- name: wayland + morph: strata/wayland-generic/wayland.morph + repo: upstream:wayland + ref: baserock/gnome + build-depends: + - libxkbcommon +- name: mesa-wayland + morph: strata/wayland-generic/mesa-wayland.morph + repo: upstream:mesa + ref: a77b370b4ba1045e2612650503cf45827af94a12 + unpetrify-ref: baserock/10.0.4-gallium + 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-wayland + - pixman +- name: mtdev + repo: upstream:mtdev-git + ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d + unpetrify-ref: baserock/genivi/baseline + build-depends: [] +- name: xorg-lib-libxkbfile + repo: upstream:xorg-lib-libxkbfile + ref: 7381c2f9013ef7784c78091fa671e652a62ca706 + unpetrify-ref: baserock/morph + build-depends: [] +- name: xorg-app-xkbcomp + repo: upstream:xorg-app-xkbcomp + ref: 705b9bbb426410f9510601c7010da51184919b36 + unpetrify-ref: baserock/morph + build-depends: + - xorg-lib-libxkbfile +- name: xkeyboard-config + repo: upstream:xkeyboard-config + ref: b4be67b48fb11989f1824dd0b1c8c399430162b0 + unpetrify-ref: baserock/morph + build-depends: + - xorg-app-xkbcomp +- name: libevdev + repo: upstream:libevdev + ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528 + unpetrify-ref: baserock/genivi/baseline + build-depends: [] +- name: linux-api-headers + morph: strata/wayland-generic/linux-api-headers.morph + repo: upstream:linux + ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe + unpetrify-ref: baserock/morph + build-depends: [] +- name: libinput + repo: upstream:libinput + ref: f0fd32db8f3df558e1d763dfa2db76cdca260323 + unpetrify-ref: baserock/genivi/baseline + build-depends: + - libxkbcommon + - 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 +- name: weston + morph: strata/wayland-generic/weston.morph + repo: upstream:weston + ref: 8658e06e69cc3944e89684a2de619e479751633f + unpetrify-ref: baserock/genivi/baseline-h-1.1 + build-depends: + - pango + - wayland + - mesa-wayland + - libinput + - cairo + - pixman + - libxkbcommon +- name: wayland-ivi-extension + morph: strata/wayland-generic/wayland-ivi-extension.morph + repo: upstream:genivi/wayland-ivi-extension + ref: 8b59529cf3b279a948f253bc79263d00d3f051a5 + unpetrify-ref: baserock/genivi/baseline-h-1.1 + build-depends: + - wayland + - weston -- cgit v1.2.1 From e0736b45a40321cb8b70ae5d4ff2d46b3dba41d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 28 Aug 2014 01:22:11 +0100 Subject: Build a unique mesa with wayland and x11 support --- strata/wayland-generic.morph | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'strata/wayland-generic.morph') diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index 5c5c825a..5c8313f2 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -14,11 +14,11 @@ chunks: ref: baserock/gnome build-depends: - libxkbcommon -- name: mesa-wayland - morph: strata/wayland-generic/mesa-wayland.morph +- name: mesa + morph: strata/wayland-generic/mesa.morph repo: upstream:mesa - ref: a77b370b4ba1045e2612650503cf45827af94a12 - unpetrify-ref: baserock/10.0.4-gallium + ref: b8e3777eb34a6f585d7c168003bd8ebd69bf107c + unpetrify-ref: baserock/gnome build-depends: - wayland - name: pixman @@ -52,7 +52,7 @@ chunks: - fontconfig - freetype2 - wayland - - mesa-wayland + - mesa - pixman - name: mtdev repo: upstream:mtdev-git @@ -120,7 +120,7 @@ chunks: build-depends: - pango - wayland - - mesa-wayland + - mesa - libinput - cairo - pixman -- cgit v1.2.1 From c3d6de72c552a95267c1815b4a1fcbe1199c0581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 28 Aug 2014 01:22:12 +0100 Subject: Move weston to its own stratum --- strata/wayland-generic.morph | 21 --------------------- 1 file changed, 21 deletions(-) (limited to 'strata/wayland-generic.morph') diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index 5c8313f2..8240f635 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -112,24 +112,3 @@ chunks: - fontconfig - freetype2 - freefont-otf -- name: weston - morph: strata/wayland-generic/weston.morph - repo: upstream:weston - ref: 8658e06e69cc3944e89684a2de619e479751633f - unpetrify-ref: baserock/genivi/baseline-h-1.1 - build-depends: - - pango - - wayland - - mesa - - libinput - - cairo - - pixman - - libxkbcommon -- name: wayland-ivi-extension - morph: strata/wayland-generic/wayland-ivi-extension.morph - repo: upstream:genivi/wayland-ivi-extension - ref: 8b59529cf3b279a948f253bc79263d00d3f051a5 - unpetrify-ref: baserock/genivi/baseline-h-1.1 - build-depends: - - wayland - - weston -- cgit v1.2.1 From 021367d3c00599e730af1c907fba071038b9b1c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 28 Aug 2014 01:22:13 +0100 Subject: 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 --- strata/wayland-generic.morph | 49 -------------------------------------------- 1 file changed, 49 deletions(-) (limited to 'strata/wayland-generic.morph') diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index 8240f635..6bc1518a 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 -- cgit v1.2.1 From 7bbdf1f098496546481db75fb37077776ee62aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 28 Aug 2014 01:22:14 +0100 Subject: Move common input components from wayland-generic to input-common stratum This is libinput library and deps These are common dependencies to weston and clutter/gtk --- strata/wayland-generic.morph | 42 ------------------------------------------ 1 file changed, 42 deletions(-) (limited to 'strata/wayland-generic.morph') diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index 6bc1518a..d24ffccc 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -21,45 +21,3 @@ chunks: unpetrify-ref: baserock/gnome build-depends: - wayland -- name: mtdev - repo: upstream:mtdev-git - ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d - unpetrify-ref: baserock/genivi/baseline - build-depends: [] -- name: xorg-lib-libxkbfile - repo: upstream:xorg-lib-libxkbfile - ref: 7381c2f9013ef7784c78091fa671e652a62ca706 - unpetrify-ref: baserock/morph - build-depends: [] -- name: xorg-app-xkbcomp - repo: upstream:xorg-app-xkbcomp - ref: 705b9bbb426410f9510601c7010da51184919b36 - unpetrify-ref: baserock/morph - build-depends: - - xorg-lib-libxkbfile -- name: xkeyboard-config - repo: upstream:xkeyboard-config - ref: b4be67b48fb11989f1824dd0b1c8c399430162b0 - unpetrify-ref: baserock/morph - build-depends: - - xorg-app-xkbcomp -- name: libevdev - repo: upstream:libevdev - ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528 - unpetrify-ref: baserock/genivi/baseline - build-depends: [] -- name: linux-api-headers - morph: strata/wayland-generic/linux-api-headers.morph - repo: upstream:linux - ref: 316df4c3eb667636eadf4b663f4087f1f9cc3cfe - unpetrify-ref: baserock/morph - build-depends: [] -- name: libinput - repo: upstream:libinput - ref: f0fd32db8f3df558e1d763dfa2db76cdca260323 - unpetrify-ref: baserock/genivi/baseline - build-depends: - - libxkbcommon - - mtdev - - libevdev - - linux-api-headers -- cgit v1.2.1 From ae380fa19f904931f173089ee0e98a33a0e8b41f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 28 Aug 2014 01:22:15 +0100 Subject: Do not build the same mesa in different strata, move to its own stratum --- strata/wayland-generic.morph | 7 ------- 1 file changed, 7 deletions(-) (limited to 'strata/wayland-generic.morph') diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index d24ffccc..e21a5d5d 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -14,10 +14,3 @@ chunks: ref: baserock/gnome build-depends: - libxkbcommon -- name: mesa - morph: strata/wayland-generic/mesa.morph - repo: upstream:mesa - ref: b8e3777eb34a6f585d7c168003bd8ebd69bf107c - unpetrify-ref: baserock/gnome - build-depends: - - wayland -- cgit v1.2.1