From fa35f9272d937f67f73632d7b4b97491c93bd035 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 28 Aug 2014 01:22:10 +0100 Subject: Build only one wayland independent of the architecture This makes gtk (and everything that is on top) independent of the architecture we are building. --- strata/wayland-armv7-versatile/cairo.morph | 5 -- strata/wayland-armv7-versatile/freefont-otf.morph | 5 -- .../linux-api-headers.morph | 9 ---- strata/wayland-armv7-versatile/mesa-wayland.morph | 7 --- .../wayland-ivi-extension.morph | 8 ---- strata/wayland-armv7-versatile/wayland.morph | 7 --- strata/wayland-armv7-versatile/weston.morph | 53 ---------------------- 7 files changed, 94 deletions(-) delete mode 100644 strata/wayland-armv7-versatile/cairo.morph delete mode 100644 strata/wayland-armv7-versatile/freefont-otf.morph delete mode 100644 strata/wayland-armv7-versatile/linux-api-headers.morph delete mode 100644 strata/wayland-armv7-versatile/mesa-wayland.morph delete mode 100644 strata/wayland-armv7-versatile/wayland-ivi-extension.morph delete mode 100644 strata/wayland-armv7-versatile/wayland.morph delete mode 100644 strata/wayland-armv7-versatile/weston.morph (limited to 'strata/wayland-armv7-versatile') diff --git a/strata/wayland-armv7-versatile/cairo.morph b/strata/wayland-armv7-versatile/cairo.morph deleted file mode 100644 index f91ac385..00000000 --- a/strata/wayland-armv7-versatile/cairo.morph +++ /dev/null @@ -1,5 +0,0 @@ -name: cairo -kind: chunk -build-system: autotools -configure-commands: -- ./autogen.sh --prefix="$PREFIX" --enable-glesv2 diff --git a/strata/wayland-armv7-versatile/freefont-otf.morph b/strata/wayland-armv7-versatile/freefont-otf.morph deleted file mode 100644 index e5c6c482..00000000 --- a/strata/wayland-armv7-versatile/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 diff --git a/strata/wayland-armv7-versatile/linux-api-headers.morph b/strata/wayland-armv7-versatile/linux-api-headers.morph deleted file mode 100644 index 595138fe..00000000 --- a/strata/wayland-armv7-versatile/linux-api-headers.morph +++ /dev/null @@ -1,9 +0,0 @@ -name: linux-api-headers -kind: chunk -build-commands: -- make mrproper -- make headers_check -install-commands: -- make INSTALL_HDR_PATH=dest headers_install -- install -d "$DESTDIR${PREFIX-/usr}/include" -- cp -r dest/include/* "$DESTDIR/${PREFIX-/usr}/include" diff --git a/strata/wayland-armv7-versatile/mesa-wayland.morph b/strata/wayland-armv7-versatile/mesa-wayland.morph deleted file mode 100644 index f39c4241..00000000 --- a/strata/wayland-armv7-versatile/mesa-wayland.morph +++ /dev/null @@ -1,7 +0,0 @@ -name: mesa-wayland -kind: chunk -build-system: autotools -configure-commands: -- ./autogen.sh --prefix="$PREFIX" --enable-gles2 --enable-gallium-egl --with-egl-platforms=wayland,drm - --enable-gbm --enable-dri --enable-shared-glapi --with-gallium-drivers=swrast --with-dri-drivers=swrast - --with-state-trackers=egl diff --git a/strata/wayland-armv7-versatile/wayland-ivi-extension.morph b/strata/wayland-armv7-versatile/wayland-ivi-extension.morph deleted file mode 100644 index c3308ce7..00000000 --- a/strata/wayland-armv7-versatile/wayland-ivi-extension.morph +++ /dev/null @@ -1,8 +0,0 @@ -name: wayland-ivi-extension -kind: chunk -configure-commands: -- cmake -DCMAKE_INSTALL_PREFIX=$PREFIX -build-commands: -- make -install-commands: -- make install DESTDIR=$DESTDIR diff --git a/strata/wayland-armv7-versatile/wayland.morph b/strata/wayland-armv7-versatile/wayland.morph deleted file mode 100644 index 752a5d6e..00000000 --- a/strata/wayland-armv7-versatile/wayland.morph +++ /dev/null @@ -1,7 +0,0 @@ -name: wayland -kind: chunk -description: Wayland server -build-system: autotools -configure-commands: -- autoreconf -ivf -- ./configure --prefix="$PREFIX" --disable-documentation diff --git a/strata/wayland-armv7-versatile/weston.morph b/strata/wayland-armv7-versatile/weston.morph deleted file mode 100644 index 8ce58496..00000000 --- a/strata/wayland-armv7-versatile/weston.morph +++ /dev/null @@ -1,53 +0,0 @@ -name: weston -kind: chunk -description: weston compositor -build-system: autotools -configure-commands: -- autoreconf -ivf -- | - LDFLAGS='-L/lib64 -lrt' \ - ./configure --prefix=$PREFIX --with-cairo-glesv2 --disable-xwayland \ - --disable-drm-compositor --disable-x11-compositor \ - --disable-wayland-compositor --disable-weston-launch --enable-egl \ - --enable-clients --enable-demo-clients-install --enable-fbdev-compositor -post-install-commands: -- install -d "$DESTDIR/usr/share/weston" -- install -m 0644 data/*.png "$DESTDIR/usr/share/weston/" -- sed -i 's,/weston.build/data/,/usr/share/weston/,g' ivi-shell/weston.ini -- sed -i 's,/weston.build/clients/,/usr/bin/,g' ivi-shell/weston.ini -- sed -i 's,/weston.build/,/usr/libexec/,g' ivi-shell/weston.ini -- sed -i '/^\[ivi-launcher\]/,$d' ivi-shell/weston.ini -- | - cat <> ivi-shell/weston.ini - [ivi-launcher] - workspace-id=0 - icon-id=4001 - icon=/usr/share/weston/icon_ivi_flower.png - path=/usr/bin/weston-flower - - [ivi-launcher] - workspace-id=0 - icon-id=4002 - icon=/usr/share/weston/icon_ivi_clickdot.png - path=/usr/bin/weston-clickdot - - [ivi-launcher] - workspace-id=1 - icon-id=4003 - icon=/usr/share/weston/icon_ivi_simple-egl.png - path=/usr/bin/weston-simple-egl - - [ivi-launcher] - workspace-id=1 - icon-id=4004 - icon=/usr/share/weston/icon_ivi_simple-shm.png - path=/usr/bin/weston-simple-shm - - [ivi-launcher] - workspace-id=2 - icon-id=4005 - icon=/usr/share/weston/icon_ivi_smoke.png - path=/usr/bin/weston-smoke - EOF -- install -d "$DESTDIR/usr/share/doc/weston" -- install -m 0644 ivi-shell/weston.ini "$DESTDIR/usr/share/doc/weston/ivi-shell-weston.ini" -- cgit v1.2.1