From 9476f6e193b16b7a6d7fb4cddbc84f4943b9c525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Sun, 14 Sep 2014 21:03:22 +0000
Subject: strata/x-generic.morph: make this stratum depend on graphics-common

So we do not build pixman, freetype2, fontconfig and freefont-otf
in 2 different places
---
 strata/x-generic.morph | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'strata/x-generic.morph')

diff --git a/strata/x-generic.morph b/strata/x-generic.morph
index 13cf8747..df3c7f6b 100644
--- a/strata/x-generic.morph
+++ b/strata/x-generic.morph
@@ -3,17 +3,13 @@ kind: stratum
 build-depends:
 - morph: strata/mesa-common.morph
 - morph: strata/x-common.morph
+- morph: strata/graphics-common.morph
 chunks:
 - name: xorg-lib-libxkbfile
   repo: upstream:xorg-lib-libxkbfile
   ref: 7381c2f9013ef7784c78091fa671e652a62ca706
   unpetrify-ref: baserock/morph
   build-depends: []
-- name: pixman
-  repo: upstream:pixman
-  ref: 958bd334b3c17f529c80f2eeef4224f45c62f292
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-font-util
   repo: upstream:xorg-font-util
   ref: 5f01ea79f1cb2328bfc4130b1e693f71be916b87
@@ -25,30 +21,12 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - xorg-font-util
-- name: freetype2
-  repo: upstream:freetype2
-  ref: 2ba18ba1ce730ed79672801b20f986f10a628c95
-  unpetrify-ref: baserock/morph
-  build-depends: []
-- name: fontconfig
-  repo: upstream:fontconfig
-  ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3
-  unpetrify-ref: baserock/morph
-  build-depends:
-  - freetype2
 - name: xorg-lib-libXfont
   repo: upstream:xorg-lib-libXfont
   ref: b8dd42dce868f9c16a59790ce51f0542b59cb79d
   unpetrify-ref: baserock/morph
   build-depends:
-  - freetype2
   - xorg-lib-libfontenc
-- name: freefont-otf
-  morph: strata/x-generic/freefont-otf.morph
-  repo: upstream:freefont-otf
-  ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7
-  unpetrify-ref: baserock/morph
-  build-depends: []
 - name: xorg-lib-libICE
   repo: upstream:xorg-lib-libICE
   ref: 1b1cf8072b2559e15ac440d5484a29a81d6918c6
@@ -98,7 +76,6 @@ chunks:
   unpetrify-ref: baserock/morph
   build-depends:
   - libsha1
-  - pixman
   - xorg-font-util
   - xorg-lib-libXaw
   - xorg-lib-libXfont
@@ -164,9 +141,7 @@ chunks:
   repo: upstream:xorg-lib-libXft
   ref: c5e760a239afc62a1c75e0509868e35957c8df52
   unpetrify-ref: baserock/morph
-  build-depends:
-  - fontconfig
-  - freetype2
+  build-depends: []
 - name: xcb-util
   repo: upstream:xcb-util
   ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3
-- 
cgit v1.2.1