summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2014-10-29 18:02:26 (GMT)
committerJavier Jardón <jjardon@gnome.org>2014-10-29 18:02:34 (GMT)
commit0feb008280268902bfb50e4c3bc11f26539ba176 (patch)
tree870e1f28897b228696d52bf565f83789477bf3dd
parentae00d0a6b0ad618d8e7a64659b78dae8fdf5a728 (diff)
parent1f32489e9a04b27de1eae9e2e611f8fc5a747718 (diff)
downloaddefinitions-0feb008280268902bfb50e4c3bc11f26539ba176.tar.gz
Merge branch 'baserock/jjardon/gtk3'
Reviewed-By: Richard Maw <richard.maw@codethink.co.uk> Reviewed-By: James Thomas <james.thomas@codethink.co.uk>
-rw-r--r--strata/foundation.morph6
-rw-r--r--strata/graphics-common.morph15
-rw-r--r--strata/graphics-common/cairo.morph5
-rw-r--r--strata/gtk-deps.morph9
-rw-r--r--strata/gtk-deps/gdk-pixbuf.morph4
-rw-r--r--strata/gtk3.morph13
-rw-r--r--strata/gtk3/gtk3.morph2
-rw-r--r--strata/wayland-generic.morph4
8 files changed, 30 insertions, 28 deletions
diff --git a/strata/foundation.morph b/strata/foundation.morph
index f321eb8..0b2bd92 100644
--- a/strata/foundation.morph
+++ b/strata/foundation.morph
@@ -54,14 +54,12 @@ chunks:
- libusbx
- name: glib
repo: upstream:glib
- ref: 3f8f040349ae821854bccb2c3535a58b0ee66803
- unpetrify-ref: baserock/2.40.0
+ ref: 4125415e7f4d1213fc7122beac0d91af08e37b28
build-depends:
- libffi
- name: gobject-introspection
repo: upstream:gobject-introspection
- ref: 6750a92ca83aa301eeac5eb59e918576fe544231
- unpetrify-ref: baserock/GOBJECT_INTROSPECTION_1_40_0
+ ref: a543d8563f8e9ca059afb7218c63496f577cd0fc
build-depends:
- glib
- name: dbus-pre
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph
index f5b884c..b187df8 100644
--- a/strata/graphics-common.morph
+++ b/strata/graphics-common.morph
@@ -41,9 +41,10 @@ chunks:
unpetrify-ref: Release-v4-0-3
build-depends: []
- name: cairo
+ morph: strata/graphics-common/cairo.morph
repo: upstream:cairo
- ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a
- unpetrify-ref: baserock/genivi/1.12.10
+ ref: f6fd372a8b31a0bebbdfe36090d6ffc7bab9a2f8
+ unpetrify-ref: 1.14.0
build-depends:
- fontconfig
- freetype2
@@ -55,13 +56,3 @@ chunks:
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/graphics-common/cairo.morph b/strata/graphics-common/cairo.morph
new file mode 100644
index 0000000..f91ac38
--- /dev/null
+++ b/strata/graphics-common/cairo.morph
@@ -0,0 +1,5 @@
+name: cairo
+kind: chunk
+build-system: autotools
+configure-commands:
+- ./autogen.sh --prefix="$PREFIX" --enable-glesv2
diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph
index 6c5db84..799ba87 100644
--- a/strata/gtk-deps.morph
+++ b/strata/gtk-deps.morph
@@ -6,6 +6,11 @@ build-depends:
- morph: strata/graphics-common.morph
- morph: strata/x-common.morph
chunks:
+- name: pango
+ repo: upstream:pango
+ ref: e0a21abf52a0b7588b1aa3357818948816ed9103
+ unpetrify-ref: 1.36.8
+ build-depends: []
- name: shared-mime-info
morph: strata/gtk-deps/shared-mime-info.morph
repo: upstream:shared-mime-info
@@ -20,8 +25,8 @@ chunks:
- name: gdk-pixbuf
morph: strata/gtk-deps/gdk-pixbuf.morph
repo: upstream:gdk-pixbuf
- ref: bc45874c7ba5a6a95f032b48ab78115b3e2238ad
- unpetrify-ref: baserock/morph
+ ref: b86959aa16e9d49ec6e286bc57d36c5249578c59
+ unpetrify-ref: 2.30.8
build-depends: []
- name: atk
repo: upstream:atk
diff --git a/strata/gtk-deps/gdk-pixbuf.morph b/strata/gtk-deps/gdk-pixbuf.morph
index 5cb1691..c89c75c 100644
--- a/strata/gtk-deps/gdk-pixbuf.morph
+++ b/strata/gtk-deps/gdk-pixbuf.morph
@@ -3,6 +3,4 @@ kind: chunk
build-system: autotools
install-commands:
- make DESTDIR=$DESTDIR install
-- install -d "$DESTDIR/lib/systemd/system/multi-user.target.wants"
-- install -m 0644 systemd/gdk-pixbuf-cache-loaders.service "$DESTDIR/lib/systemd/system"
-- ln -s ../gdk-pixbuf-cache-loaders.service "$DESTDIR/lib/systemd/system/multi-user.target.wants/gdk-pixbuf-cache-loaders.service"
+- LD_LIBRARY_PATH=$DESTDIR/usr/lib $DESTDIR/usr/bin/gdk-pixbuf-query-loaders > $DESTDIR/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
diff --git a/strata/gtk3.morph b/strata/gtk3.morph
index d70c5b5..f471bf6 100644
--- a/strata/gtk3.morph
+++ b/strata/gtk3.morph
@@ -3,12 +3,17 @@ kind: stratum
description: the gtk3 stratum
build-depends:
- morph: strata/gtk-deps.morph
-- morph: strata/x-generic.morph
- morph: strata/wayland-generic.morph
chunks:
+- name: libepoxy
+ repo: upstream:libepoxy
+ ref: 7422de5b4be7b19d789136b3bb5f932de42db27c
+ unpetrify-ref: v1.2
+ build-depends: []
- name: gtk3
morph: strata/gtk3/gtk3.morph
repo: upstream:gtk+
- ref: f36770fd0566cafb0a0803e5d80047a41ae68f7d
- unpetrify-ref: baserock/morph-gtk-3
- build-depends: []
+ ref: 911f3fb6d29f1570a2d30db6f2085d0202e7ad2a
+ unpetrify-ref: 3.15.0
+ build-depends:
+ - libepoxy
diff --git a/strata/gtk3/gtk3.morph b/strata/gtk3/gtk3.morph
index 7600747..4542dc1 100644
--- a/strata/gtk3/gtk3.morph
+++ b/strata/gtk3/gtk3.morph
@@ -4,7 +4,7 @@ build-system: autotools
configure-commands:
- gdk-pixbuf-query-loaders > loader.cache
- NOCONFIGURE=1 ./autogen.sh
-- ./configure --prefix="$PREFIX"
+- ./configure --prefix="$PREFIX" --enable-wayland-backend
build-commands:
- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
install-commands:
diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph
index 2e3ad90..628ff2a 100644
--- a/strata/wayland-generic.morph
+++ b/strata/wayland-generic.morph
@@ -12,7 +12,7 @@ chunks:
- name: wayland
morph: strata/wayland-generic/wayland.morph
repo: upstream:wayland
- ref: c946301cc7616cda6944e29635b424a12147950f
- unpetrify-ref: baserock/gnome
+ ref: 339e83aa579569711cd14623ca4b2db46256b766
+ unpetrify-ref: 1.6.0
build-depends:
- libxkbcommon