From f0423b50122a7b6921db3cc63d022a3556f32d55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 24 Oct 2014 18:52:00 +0000 Subject: strata/gtk3: add libepoxy This is needed by modern versions of xserver and GTK+ Put it in here until we upgrade the xserver to avoid rebuilds --- strata/gtk3.morph | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/strata/gtk3.morph b/strata/gtk3.morph index d70c5b5f..773b7d2a 100644 --- a/strata/gtk3.morph +++ b/strata/gtk3.morph @@ -6,6 +6,11 @@ build-depends: - 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+ -- cgit v1.2.1 From 4f4373034b5822074325632a715113a481e88d50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 25 Oct 2014 14:25:36 +0000 Subject: strata/foundation: upgrade GLib --- strata/foundation.morph | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/strata/foundation.morph b/strata/foundation.morph index f321eb87..0b2bd92e 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 -- cgit v1.2.1 From ad47db8bc978e04f18c77f66d49991e9cff77dd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 25 Oct 2014 18:27:17 +0000 Subject: strata/gtk-deps: Upgrade gdk-pixbuf At this point we already have all the graphic libraries in the system, so we can run 'gdk-pixbuf-query-loaders' here instead in every boot of the system --- strata/gtk-deps.morph | 4 ++-- strata/gtk-deps/gdk-pixbuf.morph | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph index 6c5db84a..3fc21608 100644 --- a/strata/gtk-deps.morph +++ b/strata/gtk-deps.morph @@ -20,8 +20,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 5cb16917..c89c75c8 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 -- cgit v1.2.1 From b82d92b5fee59cfcb82905c8e5fc4084330ceb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 25 Oct 2014 18:28:05 +0000 Subject: Move pango to gtk-deps --- strata/graphics-common.morph | 10 ---------- strata/gtk-deps.morph | 5 +++++ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index f5b884ce..9e5a87b1 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -55,13 +55,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/gtk-deps.morph b/strata/gtk-deps.morph index 3fc21608..33d83bec 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: f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd + unpetrify-ref: baserock/1.36.3 + build-depends: [] - name: shared-mime-info morph: strata/gtk-deps/shared-mime-info.morph repo: upstream:shared-mime-info -- cgit v1.2.1 From 67d6129038217b3952e636feb87db30bcd729e22 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 25 Oct 2014 19:06:24 +0000 Subject: strata/gtk-deps: Upgrade pango to latest stable version (1.36.8) --- strata/gtk-deps.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph index 33d83bec..799ba87a 100644 --- a/strata/gtk-deps.morph +++ b/strata/gtk-deps.morph @@ -8,8 +8,8 @@ build-depends: chunks: - name: pango repo: upstream:pango - ref: f8b1566e81af9e36ac018af4f0ae85ee7db4b8fd - unpetrify-ref: baserock/1.36.3 + ref: e0a21abf52a0b7588b1aa3357818948816ed9103 + unpetrify-ref: 1.36.8 build-depends: [] - name: shared-mime-info morph: strata/gtk-deps/shared-mime-info.morph -- cgit v1.2.1 From a5ab9ad7fd6fdcb44735174362f512fe34cf770c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sat, 25 Oct 2014 22:45:46 +0000 Subject: strata/graphics-common: Upgrade cairo to latest stable (1.14.0) --- strata/graphics-common.morph | 5 +++-- strata/graphics-common/cairo.morph | 5 +++++ 2 files changed, 8 insertions(+), 2 deletions(-) create mode 100644 strata/graphics-common/cairo.morph diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index 9e5a87b1..b187df8f 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 diff --git a/strata/graphics-common/cairo.morph b/strata/graphics-common/cairo.morph new file mode 100644 index 00000000..f91ac385 --- /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 -- cgit v1.2.1 From 80355281d52e4b7784ef1d7f760464bda2565708 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 29 Oct 2014 17:58:27 +0000 Subject: strata/wayland-generic: Upgrade wayland to latest stable (1.6.0) --- strata/wayland-generic.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index 2e3ad90f..628ff2ad 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 -- cgit v1.2.1 From a5a3ff41d50e71c59a077e439d768ae696cd5059 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 24 Oct 2014 18:52:47 +0000 Subject: strata/gtk3: Upgrade to latest GTK+ This version adds GL support --- strata/gtk3.morph | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/strata/gtk3.morph b/strata/gtk3.morph index 773b7d2a..cb4ee05e 100644 --- a/strata/gtk3.morph +++ b/strata/gtk3.morph @@ -14,6 +14,7 @@ chunks: - 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 -- cgit v1.2.1 From 1f32489e9a04b27de1eae9e2e611f8fc5a747718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 27 Oct 2014 17:55:29 +0000 Subject: gtk3: Only build wayland backend --- strata/gtk3.morph | 1 - strata/gtk3/gtk3.morph | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/strata/gtk3.morph b/strata/gtk3.morph index cb4ee05e..f471bf6e 100644 --- a/strata/gtk3.morph +++ b/strata/gtk3.morph @@ -3,7 +3,6 @@ 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 diff --git a/strata/gtk3/gtk3.morph b/strata/gtk3/gtk3.morph index 76007474..4542dc15 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: -- cgit v1.2.1