summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJavier Jardón <jjardon@gnome.org>2015-10-19 08:49:46 +0100
committerJavier Jardón <jjardon@gnome.org>2015-11-02 16:47:55 +0000
commitf09902a53b3e4891496da7715b50c9929618d103 (patch)
treeecd8f0da6f91a4975b12cd4cd017873a180f11cd
parent551513975967a51cf6ccdb204587cf252e79c9e2 (diff)
downloaddefinitions-f09902a53b3e4891496da7715b50c9929618d103.tar.gz
Move libepoxy to mesa-common stratum
Its where really belongs and we avoid duplicate it Change-Id: Ib54cdc7a677f135369c334cb54090fbe74783d04
-rw-r--r--strata/gtk3.morph7
-rw-r--r--strata/mesa-common.morph7
-rw-r--r--strata/x-generic.morph6
3 files changed, 7 insertions, 13 deletions
diff --git a/strata/gtk3.morph b/strata/gtk3.morph
index 6be95d10..4e2537a4 100644
--- a/strata/gtk3.morph
+++ b/strata/gtk3.morph
@@ -6,15 +6,8 @@ build-depends:
- morph: strata/wayland-generic.morph
- morph: strata/x-common.morph
chunks:
-- name: libepoxy
- repo: upstream:libepoxy
- ref: 7422de5b4be7b19d789136b3bb5f932de42db27c
- unpetrify-ref: v1.2
- build-system: autotools
- name: gtk3
morph: strata/gtk3/gtk3.morph
repo: upstream:gtk+
ref: 1ed442180d65da78d071019c0dc0d365932e4503
unpetrify-ref: 3.18.2
- build-depends:
- - libepoxy
diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph
index f47fcf0e..d99d023a 100644
--- a/strata/mesa-common.morph
+++ b/strata/mesa-common.morph
@@ -13,3 +13,10 @@ chunks:
repo: upstream:mesa
ref: 4f1e500150be2e82a2d7eb954f7198cc0c5cbec1
unpetrify-ref: mesa-11.0.0
+- name: libepoxy
+ repo: upstream:libepoxy
+ ref: 7422de5b4be7b19d789136b3bb5f932de42db27c
+ unpetrify-ref: v1.2
+ build-system: autotools
+ build-depends:
+ - mesa
diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index 46522660..58d3d0d1 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -7,11 +7,6 @@ build-depends:
- morph: strata/x-common.morph
- morph: strata/graphics-common.morph
chunks:
-- name: libepoxy
- repo: upstream:libepoxy
- ref: 7422de5b4be7b19d789136b3bb5f932de42db27c
- unpetrify-ref: v1.2
- build-system: autotools
- name: xorg-lib-libxkbfile
repo: upstream:xorg-lib-libxkbfile
ref: 7381c2f9013ef7784c78091fa671e652a62ca706
@@ -42,7 +37,6 @@ chunks:
ref: 2123f7682d522619f101b05fb75efa75dabbe371
unpetrify-ref: xorg-server-1.17.2
build-depends:
- - libepoxy
- xorg-font-util
- xorg-lib-libXfont
- xorg-lib-libxkbfile