From 9fca24222d38febab21a62b7ca226c1dd2533970 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sun, 14 Sep 2014 21:04:42 +0000 Subject: strata/graphics-common.morph: This stratum doestn depend on x-common neither wayland --- strata/graphics-common.morph | 2 -- strata/gtk-deps.morph | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index 279ede02..25888d20 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -2,8 +2,6 @@ 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 diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph index dbee2e69..930bba00 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 -- cgit v1.2.1 From 9476f6e193b16b7a6d7fb4cddbc84f4943b9c525 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= 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 ++--------------------------- strata/x-generic/freefont-otf.morph | 5 ----- 2 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 strata/x-generic/freefont-otf.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 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 -- cgit v1.2.1 From 59345aa173ebbc6a6f912183157aec1f3a3a5831 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 12 Sep 2014 13:30:23 +0000 Subject: input-common: xkbcomp is a xkeyboard-config runtime dependency only in X Also add a little hack to create the /usr/share/X11/xkb/ directory, that seems to not be created when compiling without the xkbcomp dependency --- strata/input-common.morph | 15 ++------------- strata/input-common/xkeyboard-config.morph | 7 +++++++ 2 files changed, 9 insertions(+), 13 deletions(-) create mode 100644 strata/input-common/xkeyboard-config.morph diff --git a/strata/input-common.morph b/strata/input-common.morph index f8680849..9c54f0d5 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 + 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" -- cgit v1.2.1 From db58aa6c04dd4fe8981b5690fddd107c0b0e1a45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Fri, 12 Sep 2014 15:58:32 +0000 Subject: Move libpng and libjpg from x-common to graphics-common --- strata/graphics-common.morph | 11 +++++++++++ strata/x-common.morph | 10 ---------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index 25888d20..2f49900e 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -25,6 +25,16 @@ chunks: ref: 75fa95a912718bb94a135d4bf6b13bb38e186ce7 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: cairo repo: upstream:cairo ref: c373daa9d4bade91b3fc8b7850163db4b3aec40a @@ -33,6 +43,7 @@ chunks: - fontconfig - freetype2 - pixman + - libpng - name: harfbuzz repo: upstream:harfbuzz ref: 09b5393874e56fcfd63a92d28e6c1c2ddeee0942 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 -- cgit v1.2.1 From 13d15f2d433679624e7f72d4c4bcffc023c78815 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sun, 14 Sep 2014 21:44:51 +0000 Subject: Move libtif from gtk-deps to graphics-common --- strata/graphics-common.morph | 5 +++++ strata/gtk-deps.morph | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index 2f49900e..56cfae62 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -35,6 +35,11 @@ chunks: 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 diff --git a/strata/gtk-deps.morph b/strata/gtk-deps.morph index 930bba00..6c5db84a 100644 --- a/strata/gtk-deps.morph +++ b/strata/gtk-deps.morph @@ -17,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 -- cgit v1.2.1 From 841efa1b5c7aa3aed5a304e6a2c0ed8146ea19d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 15 Sep 2014 22:04:49 +0000 Subject: strata/graphics-common.morph: Upgrade libpng to latest stable version (1.6.13) --- strata/graphics-common.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index 56cfae62..3f4bd297 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -27,8 +27,8 @@ chunks: build-depends: [] - name: libpng repo: upstream:libpng - ref: 981560ae6094f0b0557e82c33d7ae5f7d81ca0ea - unpetrify-ref: baserock/morph + ref: 259fb7761d747655c607efcec7a12ff1f3c24561 + unpetrify-ref: libpng-1.6.13-signed build-depends: [] - name: libjpeg repo: upstream:libjpeg -- cgit v1.2.1 From 44ab2d3a4a6fbce46842b7443f260aec499bc111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 15 Sep 2014 22:55:19 +0000 Subject: strata/graphics-common.morph: Update to latest pixman (0.32.6) --- strata/graphics-common.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index 3f4bd297..b9844116 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -5,8 +5,8 @@ build-depends: 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 -- cgit v1.2.1 From a009c8569ea34a8cfba6340adab04dcc3b1f674d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 15 Sep 2014 23:27:20 +0000 Subject: strata/x-generic: Update xorg-lib-libXft to latest version (2.3.2) To avoid compilation failure with latest freetype --- strata/x-generic.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/x-generic.morph b/strata/x-generic.morph index df3c7f6b..5128ef19 100644 --- a/strata/x-generic.morph +++ b/strata/x-generic.morph @@ -139,8 +139,8 @@ chunks: build-depends: [] - name: xorg-lib-libXft repo: upstream:xorg-lib-libXft - ref: c5e760a239afc62a1c75e0509868e35957c8df52 - unpetrify-ref: baserock/morph + ref: 214f9b5306d833e2787c75fe41dfdc9228fcb738 + unpetrify-ref: libXft-2.3.2 build-depends: [] - name: xcb-util repo: upstream:xcb-util -- cgit v1.2.1 From 1beae9b3256b555cf77b06eb9ea75aa2bddb4dfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 15 Sep 2014 22:57:33 +0000 Subject: strata/graphics-common.morph: Upgrade to latest freetype (2.5.3) --- strata/graphics-common.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index b9844116..97a4417b 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -10,8 +10,8 @@ chunks: 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 -- cgit v1.2.1 From 6deae6c8af6b2eeb9eccc0630f185080b96cd378 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Mon, 15 Sep 2014 22:59:32 +0000 Subject: strata/graphics-common.morph: Update to latest fontconfig (2.11.1) --- strata/graphics-common.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/graphics-common.morph b/strata/graphics-common.morph index 97a4417b..f5b884ce 100644 --- a/strata/graphics-common.morph +++ b/strata/graphics-common.morph @@ -15,8 +15,8 @@ chunks: 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 -- cgit v1.2.1 From e967774f880fb4641821164cb9ad8b95abdcc7af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Wed, 17 Sep 2014 13:05:10 +0000 Subject: strata/input-common.morh: Update xkeyboard-config to latest stable (1.12) --- strata/input-common.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/input-common.morph b/strata/input-common.morph index 9c54f0d5..20fe6ec0 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -12,8 +12,8 @@ chunks: - name: xkeyboard-config morph: strata/input-common/xkeyboard-config.morph repo: upstream:xkeyboard-config - ref: b4be67b48fb11989f1824dd0b1c8c399430162b0 - unpetrify-ref: baserock/morph + ref: bc3ac1b0d152e929b3532a541596cf9fe286bb9e + unpetrify-ref: xkeyboard-config-2.12 build-depends: [] - name: libevdev repo: upstream:libevdev -- cgit v1.2.1