summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-02-03 15:15:41 +0000
committerJavier Jardón <jjardon@gnome.org>2015-02-20 16:11:28 +0000
commitc36e7863e1f5bc88003127d6f2b2a7d30536c330 (patch)
treee9ea0eec887f34c7bf6056caf840a568ebcec3c4
parent3e491eb7ccace4d6c09ebe11bf774186dd98a556 (diff)
downloaddefinitions-c36e7863e1f5bc88003127d6f2b2a7d30536c330.tar.gz
Build with cairo, mesa and GTK+ with X11 support
The GTK+/cairo X11 backend Its needed by some GNOME libraries (like gnome-sesion) GL is needed by gnome-session (GLES is not enough)
-rw-r--r--strata/gtk3.morph1
-rw-r--r--strata/gtk3/gtk3.morph2
-rw-r--r--strata/mesa-common.morph1
-rw-r--r--strata/mesa-common/mesa.morph3
-rw-r--r--strata/x-generic/xserver.morph1
5 files changed, 4 insertions, 4 deletions
diff --git a/strata/gtk3.morph b/strata/gtk3.morph
index 851cb3dd..736c0c24 100644
--- a/strata/gtk3.morph
+++ b/strata/gtk3.morph
@@ -4,6 +4,7 @@ description: the gtk3 stratum
build-depends:
- morph: strata/gtk-deps.morph
- morph: strata/wayland-generic.morph
+- morph: strata/x-common.morph
chunks:
- name: libepoxy
repo: upstream:libepoxy
diff --git a/strata/gtk3/gtk3.morph b/strata/gtk3/gtk3.morph
index 4542dc15..76007474 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" --enable-wayland-backend
+- ./configure --prefix="$PREFIX"
build-commands:
- GDK_PIXBUF_MODULE_FILE="$(pwd)/loader.cache" make
install-commands:
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index efae2449..6f195a1d 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -4,6 +4,7 @@ build-depends:
- morph: strata/llvm-common.morph
- morph: strata/libdrm-common.morph
- morph: strata/wayland-generic.morph
+- morph: strata/x-common.morph
chunks:
- name: mesa
morph: strata/mesa-common/mesa.morph
diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph
index 4194acc2..be0cee6f 100644
--- a/strata/mesa-common/mesa.morph
+++ b/strata/mesa-common/mesa.morph
@@ -16,8 +16,7 @@ configure-commands:
esac
./autogen.sh --prefix="$PREFIX" \
--enable-gles2 \
- --disable-glx \
- --with-egl-platforms=drm,wayland \
+ --with-egl-platforms=drm,wayland,x11 \
--with-gallium-drivers="$GALLIUMDRIVERS" \
--with-dri-drivers="$DRIDRIVERS" \
--enable-gallium-egl
diff --git a/strata/x-generic/xserver.morph b/strata/x-generic/xserver.morph
index ca678331..9f734af3 100644
--- a/strata/x-generic/xserver.morph
+++ b/strata/x-generic/xserver.morph
@@ -4,7 +4,6 @@ build-system: autotools
configure-commands:
- |
./autogen.sh --prefix="$PREFIX" \
- --disable-glx \
--disable-xorg \
--disable-xvfb \
--disable-xnest \