From 45e358f7d667d911ec36f8d1c3c0b77103692785 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 25 Sep 2014 14:16:24 +0000 Subject: Change graphics-infra stratum name to xorg-util-macros-common As libdrm was moved to an independent stratum this only holds some macros needed to compile other strata --- strata/graphics-infra.morph | 16 ---------------- strata/input-common.morph | 2 +- strata/libdrm-common.morph | 2 +- strata/wayland-generic.morph | 2 +- strata/x-common.morph | 2 +- strata/xorg-util-macros-common.morph | 16 ++++++++++++++++ 6 files changed, 20 insertions(+), 20 deletions(-) delete mode 100644 strata/graphics-infra.morph create mode 100644 strata/xorg-util-macros-common.morph diff --git a/strata/graphics-infra.morph b/strata/graphics-infra.morph deleted file mode 100644 index c120a76f..00000000 --- a/strata/graphics-infra.morph +++ /dev/null @@ -1,16 +0,0 @@ -name: graphics-infra -kind: stratum -build-depends: -- morph: strata/core.morph -chunks: -- name: xorg-util-macros - repo: upstream:xorg-util-macros - ref: 9a54b858601bd305de2737b06e609084a2a114c2 - unpetrify-ref: util-macros-1.19.0 - build-depends: [] -- name: xcb-pthread-stubs - repo: upstream:xcb-pthread-stubs - ref: 431d2c0be218d878b9dd3862e4232243c599df4b - unpetrify-ref: baserock/morph - build-depends: - - xorg-util-macros diff --git a/strata/input-common.morph b/strata/input-common.morph index 21f4d8ab..0e9d25e6 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -2,7 +2,7 @@ name: input-common kind: stratum build-depends: - morph: strata/foundation.morph -- morph: strata/graphics-infra.morph +- morph: strata/xorg-util-macros-common.morph chunks: - name: mtdev repo: upstream:mtdev-git diff --git a/strata/libdrm-common.morph b/strata/libdrm-common.morph index cea69e38..37bff746 100644 --- a/strata/libdrm-common.morph +++ b/strata/libdrm-common.morph @@ -1,7 +1,7 @@ name: libdrm-common kind: stratum build-depends: -- morph: strata/graphics-infra.morph +- morph: strata/xorg-util-macros-common.morph chunks: - name: xorg-lib-libpciaccess repo: upstream:xorg-lib-libpciaccess diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index df5f4b8f..2e3ad90f 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -2,7 +2,7 @@ name: wayland-generic kind: stratum build-depends: - morph: strata/foundation.morph -- morph: strata/graphics-infra.morph +- morph: strata/xorg-util-macros-common.morph chunks: - name: libxkbcommon repo: upstream:xorg-lib-libxkbcommon diff --git a/strata/x-common.morph b/strata/x-common.morph index 6bec78c7..f842c7a9 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -1,7 +1,7 @@ name: x-common kind: stratum build-depends: -- morph: strata/graphics-infra.morph +- morph: strata/xorg-util-macros-common.morph chunks: - name: xorg-proto-bigreqsproto repo: upstream:xorg-proto-bigreqsproto diff --git a/strata/xorg-util-macros-common.morph b/strata/xorg-util-macros-common.morph new file mode 100644 index 00000000..b8e67888 --- /dev/null +++ b/strata/xorg-util-macros-common.morph @@ -0,0 +1,16 @@ +name: xorg-util-macros-common +kind: stratum +build-depends: +- morph: strata/core.morph +chunks: +- name: xorg-util-macros + repo: upstream:xorg-util-macros + ref: 9a54b858601bd305de2737b06e609084a2a114c2 + unpetrify-ref: util-macros-1.19.0 + build-depends: [] +- name: xcb-pthread-stubs + repo: upstream:xcb-pthread-stubs + ref: 431d2c0be218d878b9dd3862e4232243c599df4b + unpetrify-ref: baserock/morph + build-depends: + - xorg-util-macros -- cgit v1.2.1