diff options
-rw-r--r-- | strata/wayland-generic.morph | 12 | ||||
-rw-r--r-- | strata/wayland-generic/mesa.morph (renamed from strata/wayland-generic/mesa-wayland.morph) | 4 | ||||
-rw-r--r-- | strata/x-generic.morph | 8 | ||||
-rw-r--r-- | strata/x-generic/mesa.morph (renamed from strata/x-generic/mesa-x.morph) | 4 |
4 files changed, 14 insertions, 14 deletions
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 diff --git a/strata/wayland-generic/mesa-wayland.morph b/strata/wayland-generic/mesa.morph index 06dfeee3..ea85006e 100644 --- a/strata/wayland-generic/mesa-wayland.morph +++ b/strata/wayland-generic/mesa.morph @@ -1,7 +1,7 @@ -name: mesa-wayland +name: mesa kind: chunk build-system: autotools configure-commands: -- ./autogen.sh --prefix="$PREFIX" --enable-gles2 --enable-gallium-egl --with-egl-platforms=wayland,drm +- ./autogen.sh --prefix="$PREFIX" --enable-gles2 --enable-gallium-egl --with-egl-platforms=wayland,drm,x11 --enable-gbm --enable-dri --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=,i915,i965,swrast --with-state-trackers=egl diff --git a/strata/x-generic.morph b/strata/x-generic.morph index 1f68e064..03d19daf 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -3,11 +3,11 @@ kind: stratum build-depends: - morph: strata/x-common.morph chunks: -- name: mesa-x - morph: strata/x-generic/mesa-x.morph +- name: mesa + morph: strata/x-generic/mesa.morph repo: upstream:mesa ref: b8e3777eb34a6f585d7c168003bd8ebd69bf107c - unpetrify-ref: baserock/genivi/morph + unpetrify-ref: baserock/gnome build-depends: [] - name: xorg-lib-libxkbfile repo: upstream:xorg-lib-libxkbfile @@ -103,7 +103,7 @@ chunks: unpetrify-ref: baserock/morph build-depends: - libsha1 - - mesa-x + - mesa - pixman - xorg-font-util - xorg-lib-libXaw diff --git a/strata/x-generic/mesa-x.morph b/strata/x-generic/mesa.morph index a5a51500..38078d12 100644 --- a/strata/x-generic/mesa-x.morph +++ b/strata/x-generic/mesa.morph @@ -1,4 +1,4 @@ -name: mesa-x +name: mesa kind: chunk build-system: autotools configure-commands: @@ -15,7 +15,7 @@ configure-commands: ./autogen.sh --prefix="$PREFIX" \ --enable-gles2 \ --disable-gallium-egl \ - --with-egl-platforms=x11,drm \ + --with-egl-platforms=x11,drm,wayland \ --enable-gbm --enable-shared-glapi \ --with-gallium-drivers=swrast \ --with-dri-drivers=$DRIDRIVERS |