diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-18 15:11:05 +0100 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-09-18 15:11:05 +0100 |
commit | 4c3190a01a1f3e9a941de114182be456080b816f (patch) | |
tree | 5550559731fb9e9879c4de4d5a0a6edf1e008327 /strata/x-generic.morph | |
parent | 514e813860c041f2fd2fcef4728c1165e81df450 (diff) | |
parent | e967774f880fb4641821164cb9ad8b95abdcc7af (diff) | |
download | definitions-4c3190a01a1f3e9a941de114182be456080b816f.tar.gz |
Merge remote-tracking branch 'gitorious/jjardon/graphics-common'
Reviewed-By: Paul Sherwood <paul.sherwood@codethink.co.uk>
Reviewed-By: Sam Thursfield <sam.thursfield@codethink.co.uk>
Diffstat (limited to 'strata/x-generic.morph')
-rw-r--r-- | strata/x-generic.morph | 33 |
1 files changed, 4 insertions, 29 deletions
diff --git a/strata/x-generic.morph b/strata/x-generic.morph index 13cf8747..5128ef19 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 @@ -162,11 +139,9 @@ chunks: build-depends: [] - name: xorg-lib-libXft repo: upstream:xorg-lib-libXft - ref: c5e760a239afc62a1c75e0509868e35957c8df52 - unpetrify-ref: baserock/morph - build-depends: - - fontconfig - - freetype2 + ref: 214f9b5306d833e2787c75fe41dfdc9228fcb738 + unpetrify-ref: libXft-2.3.2 + build-depends: [] - name: xcb-util repo: upstream:xcb-util ref: 45215e6f56bf57efdf5469567c00eba7a991d3a3 |