From 3b465914c0bcbc9f6d4b8a444fa38ed9fad28d0a Mon Sep 17 00:00:00 2001 From: Alex Gonzalez Date: Tue, 29 Jan 2013 18:02:06 +0100 Subject: [PATCH] meta-digi: Add del-image-graphical target image. Signed-off-by: Alex Gonzalez --- .../conf/machine/include/digi-defaults.inc | 2 + .../amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb | 2 +- meta-digi-del/conf/distro/del-gui.conf | 3 ++ .../images/del-image-graphical.bb | 52 +++++++++++++++++++ .../gst-plugins-bad_0.10.23.bbappend | 8 ++- .../gst-plugins-base_0.10.36.bbappend | 9 ++-- .../gst-plugins-good_0.10.31.bbappend | 4 +- 7 files changed, 71 insertions(+), 9 deletions(-) create mode 100644 meta-digi-del/conf/distro/del-gui.conf create mode 100644 meta-digi-del/recipes-core/images/del-image-graphical.bb diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 958118875..f5cab835c 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -5,6 +5,8 @@ PREFERRED_PROVIDER_u-boot = "u-boot-imx" PREFERRED_PROVIDER_virtual/egl_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}" PREFERRED_PROVIDER_virtual/libgles1_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}" PREFERRED_PROVIDER_virtual/libgles2_mx5 = "${@base_contains('DISTRO_FEATURES', 'x11', 'amd-gpu-x11-bin-mx51', 'amd-gpu-bin-mx51', d)}" +PREFERRED_PROVIDER_virtual/libx11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'libx11', '', d)}" +PREFERRED_PROVIDER_jpeg-native ?= "jpeg-native" # Digi BSP default settings IMAGE_CLASSES += "image_types_digi" diff --git a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb index 1baa851a3..db26fa09b 100644 --- a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb +++ b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb @@ -11,7 +11,7 @@ PR = "r11" LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802" DEPENDS = "libz160" -PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2" +PROVIDES = "${@base_contains('DISTRO_FEATURES', 'x11', '', 'virtual/egl virtual/libgles1 virtual/libgles2', d)}" RDEPENDS = "libz160" SRC_URI = "${DIGI_LOG_MIRROR}/amd-gpu-bin-mx51-${PV}.tar.gz" diff --git a/meta-digi-del/conf/distro/del-gui.conf b/meta-digi-del/conf/distro/del-gui.conf new file mode 100644 index 000000000..dec304f46 --- /dev/null +++ b/meta-digi-del/conf/distro/del-gui.conf @@ -0,0 +1,3 @@ +include del.conf + +DISTRO_FEATURES += "x11" diff --git a/meta-digi-del/recipes-core/images/del-image-graphical.bb b/meta-digi-del/recipes-core/images/del-image-graphical.bb new file mode 100644 index 000000000..f82eedd6b --- /dev/null +++ b/meta-digi-del/recipes-core/images/del-image-graphical.bb @@ -0,0 +1,52 @@ +# +# Copyright (C) 2012 Digi International. +# +DESCRIPTION = "Graphical image based on SATO, a gnome mobile environment visual style." + +IMAGE_FEATURES += "splash package-management x11-base x11-sato" + +LICENSE = "MIT" + +include del-image-minimal.bb + +IMAGE_INSTALL += "packagegroup-core-x11-sato-games" + +#IMAGE_FEATURES += "debug-tweaks" +DISTRO_FEATURES += "pulseaudio" +WEB = "web-webkit" + +SOC_EXTRA_IMAGE_FEATURES ?= "tools-testapps" + +# mesa-demos is currently broken when building with other GL library +# so we avoid it by now and tools-testapps includes it. +SOC_EXTRA_IMAGE_FEATURES_mx5 = "" +SOC_EXTRA_IMAGE_FEATURES_mx6 = "" + +# Add extra image features +EXTRA_IMAGE_FEATURES += " \ + ${SOC_EXTRA_IMAGE_FEATURES} \ + nfs-server \ + tools-debug \ + tools-profile \ + qt4-pkgs \ +" + +SOC_IMAGE_INSTALL = "" +SOC_IMAGE_INSTALL_mx5 = "glcubes-demo" + +# TODO: test the following +# packagegroup-fsl-tools-testapps \ +# packagegroup-fsl-tools-benchmark \ +# packagegroup-qt-in-use-demos \ + +IMAGE_INSTALL += " \ + ${SOC_IMAGE_INSTALL} \ + cpufrequtils \ + nano \ + qt4-plugin-phonon-backend-gstreamer \ + qt4-demos \ + qt4-examples \ + fsl-gui-extrafiles \ + " + +export IMAGE_BASENAME = "del-image-graphical" diff --git a/meta-digi-del/recipes-multimedia/gst-plugins-bad/gst-plugins-bad_0.10.23.bbappend b/meta-digi-del/recipes-multimedia/gst-plugins-bad/gst-plugins-bad_0.10.23.bbappend index 3b1b02b34..ce555704e 100644 --- a/meta-digi-del/recipes-multimedia/gst-plugins-bad/gst-plugins-bad_0.10.23.bbappend +++ b/meta-digi-del/recipes-multimedia/gst-plugins-bad/gst-plugins-bad_0.10.23.bbappend @@ -2,6 +2,13 @@ # which brings in gtk+ DEPENDS = "gst-plugins-base libmusicbrainz tremor curl" +PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG[x11] = ",--without-x," + +EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disable-cdaudio --disable-directfb \ + --with-plugins=musicbrainz,wavpack,ivorbis,mpegvideoparse,freeze --disable-vdpau --disable-apexsink \ + --disable-orc" + EXTRA_OECONF += "\ --disable-rsvg \ --disable-bayer \ @@ -25,5 +32,4 @@ EXTRA_OECONF += "\ --disable-siren \ --disable-vcd \ --disable-videosignal \ - --without-x \ " diff --git a/meta-digi-del/recipes-multimedia/gst-plugins-base/gst-plugins-base_0.10.36.bbappend b/meta-digi-del/recipes-multimedia/gst-plugins-base/gst-plugins-base_0.10.36.bbappend index 146af75ef..831b697de 100644 --- a/meta-digi-del/recipes-multimedia/gst-plugins-base/gst-plugins-base_0.10.36.bbappend +++ b/meta-digi-del/recipes-multimedia/gst-plugins-base/gst-plugins-base_0.10.36.bbappend @@ -1,11 +1,10 @@ +PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11 gio', '', d)}" +PACKAGECONFIG[x11] = ",--disable-x --disable-xshm --disable-xvideo --disable-libvisual," +PACKAGECONFIG[gio] = ",--disable-gio," + EXTRA_OECONF += "\ --disable-cdparanoia \ --disable-examples \ - --disable-gio \ --disable-gtk-doc \ - --disable-libvisual \ --disable-rpath \ - --disable-x \ - --disable-xshm \ - --disable-xvideo \ " diff --git a/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend b/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend index 00826e5e6..ac762584c 100644 --- a/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend +++ b/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend @@ -1,5 +1,6 @@ -PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11 flac', '', d)}" PACKAGECONFIG[x11] = ",--disable-gconf --disable-x --disable-xshm --disable-xvideo," +PACKAGECONFIG[flac] = ",--disable-flac," DEPENDS_no_X := "${@oe_filter_out('gconf', '${DEPENDS}', d)}" DEPENDS_del := "${@base_contains('DISTRO_FEATURES', 'x11', '${DEPENDS}', '${DEPENDS_no_X}', d)}" @@ -16,7 +17,6 @@ EXTRA_OECONF_del += "\ --disable-effectv \ --disable-esdtest \ --disable-examples \ - --disable-flac \ --disable-goom \ --disable-goom2k1 \ --disable-gtk-doc \