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 | |
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')
-rw-r--r-- | strata/graphics-common.morph | 30 | ||||
-rw-r--r-- | strata/gtk-deps.morph | 9 | ||||
-rw-r--r-- | strata/input-common.morph | 19 | ||||
-rw-r--r-- | strata/input-common/xkeyboard-config.morph | 7 | ||||
-rw-r--r-- | strata/x-common.morph | 10 | ||||
-rw-r--r-- | strata/x-generic.morph | 33 | ||||
-rw-r--r-- | strata/x-generic/freefont-otf.morph | 5 |
7 files changed, 39 insertions, 74 deletions
diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index 279ede02..f5b884ce 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -2,23 +2,21 @@ name: graphics-common kind: stratum build-depends: - morph: strata/mesa-common.morph -- morph: strata/x-common.morph -- morph: strata/wayland-generic.morph chunks: - name: pixman repo: upstream:pixman - ref: 958bd334b3c17f529c80f2eeef4224f45c62f292 - unpetrify-ref: baserock/morph + ref: 87eea99e443b389c978cf37efc52788bf03a0ee0 + unpetrify-ref: pixman-0.32.6 build-depends: [] - name: freetype2 repo: upstream:freetype2 - ref: 2ba18ba1ce730ed79672801b20f986f10a628c95 - unpetrify-ref: baserock/morph + ref: ec8853cd18e1a0c275372769bdad37a79550ed66 + unpetrify-ref: VER-2-5-3 build-depends: [] - name: fontconfig repo: upstream:fontconfig - ref: 72b0480a21958f0f8c115d8e0a5bfbd8d358b5c3 - unpetrify-ref: baserock/morph + ref: 9260b7ec39c34ce68d74e16d47917290a8c3f35a + unpetrify-ref: 2.11.1 build-depends: - freetype2 - name: freefont-otf @@ -27,6 +25,21 @@ chunks: ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7 unpetrify-ref: baserock/morph build-depends: [] +- name: libpng + repo: upstream:libpng + ref: 259fb7761d747655c607efcec7a12ff1f3c24561 + unpetrify-ref: libpng-1.6.13-signed + build-depends: [] +- name: libjpeg + repo: upstream:libjpeg + ref: f57ac58ac664ede6bc6e8cd9d88e0edaa366e21a + unpetrify-ref: baserock/morph + build-depends: [] +- name: libtiff + repo: upstream:libtiff + ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd + unpetrify-ref: Release-v4-0-3 + build-depends: [] - name: cairo repo: upstream:cairo ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a @@ -35,6 +48,7 @@ chunks: - fontconfig - freetype2 - pixman + - libpng - name: harfbuzz repo: upstream:harfbuzz ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942 diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph index dbee2e69..6c5db84a 100644 --- a/strata/gtk-deps.morph +++ b/strata/gtk-deps.morph @@ -4,6 +4,7 @@ description: the GTK+ dependencies stratum build-depends: - morph: strata/foundation.morph - morph: strata/graphics-common.morph +- morph: strata/x-common.morph chunks: - name: shared-mime-info morph: strata/gtk-deps/shared-mime-info.morph @@ -16,18 +17,12 @@ chunks: ref: d213283fcb5228d05eb2c796579f18240e8467e8 unpetrify-ref: 3.12.0 build-depends: [] -- name: libtiff - repo: upstream:libtiff - ref: 2f83c385ff3d5493602308b62ca6d7707725b4fd - unpetrify-ref: Release-v4-0-3 - build-depends: [] - name: gdk-pixbuf morph: strata/gtk-deps/gdk-pixbuf.morph repo: upstream:gdk-pixbuf ref: bc45874c7ba5a6a95f032b48ab78115b3e2238ad unpetrify-ref: baserock/morph - build-depends: - - libtiff + build-depends: [] - name: atk repo: upstream:atk ref: 94766ee6f1a42f94eb9736ba8396bc90af937fe4 diff --git a/strata/input-common.morph b/strata/input-common.morph index f8680849..20fe6ec0 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -9,23 +9,12 @@ chunks: ref: 4381b78fea54de0e775bf54952b2f95e5a06c57d unpetrify-ref: baserock/genivi/baseline build-depends: [] -- name: xorg-lib-libxkbfile - repo: upstream:xorg-lib-libxkbfile - ref: 7381c2f9013ef7784c78091fa671e652a62ca706 - unpetrify-ref: baserock/morph - build-depends: [] -- name: xorg-app-xkbcomp - repo: upstream:xorg-app-xkbcomp - ref: 705b9bbb426410f9510601c7010da51184919b36 - unpetrify-ref: baserock/morph - build-depends: - - xorg-lib-libxkbfile - name: xkeyboard-config + morph: strata/input-common/xkeyboard-config.morph repo: upstream:xkeyboard-config - ref: b4be67b48fb11989f1824dd0b1c8c399430162b0 - unpetrify-ref: baserock/morph - build-depends: - - xorg-app-xkbcomp + ref: bc3ac1b0d152e929b3532a541596cf9fe286bb9e + unpetrify-ref: xkeyboard-config-2.12 + build-depends: [] - name: libevdev repo: upstream:libevdev ref: b23649e1ba9fd5c72fa9318e417b4f17f5f6f528 diff --git a/strata/input-common/xkeyboard-config.morph b/strata/input-common/xkeyboard-config.morph new file mode 100644 index 00000000..7dabe551 --- /dev/null +++ b/strata/input-common/xkeyboard-config.morph @@ -0,0 +1,7 @@ +name: xkeyboard-config +kind: chunk +configure-commands: +- ./autogen.sh --prefix="$PREFIX" --disable-runtime-deps +install-commands: +- mkdir -p "$DESTDIR"/usr/share/X11/xkb/ +- make install DESTDIR="$DESTDIR" diff --git a/strata/x-common.morph b/strata/x-common.morph index fe489832..537569a2 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -9,16 +9,6 @@ chunks: ref: 60aa15443579a9542a1e8818f3c5dd901edb03d9 unpetrify-ref: baserock/morph build-depends: [] -- name: libpng - repo: upstream:libpng - ref: 981560ae6094f0b0557e82c33d7ae5f7d81ca0ea - unpetrify-ref: baserock/morph - build-depends: [] -- name: libjpeg - repo: upstream:libjpeg - ref: f57ac58ac664ede6bc6e8cd9d88e0edaa366e21a - unpetrify-ref: baserock/morph - build-depends: [] - name: xorg-util-macros repo: upstream:xorg-util-macros ref: 9a54b858601bd305de2737b06e609084a2a114c2 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 diff --git a/strata/x-generic/freefont-otf.morph b/strata/x-generic/freefont-otf.morph deleted file mode 100644 index e5c6c482..00000000 --- a/strata/x-generic/freefont-otf.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: freefont-otf -kind: chunk -install-commands: -- mkdir -p $DESTDIR/usr/share/fonts/opentype/freefont -- install -p *.otf $DESTDIR/usr/share/fonts/opentype/freefont |