meta-digi: Add del-image-graphical target image.

Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>

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"

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"

meta-digi-del/conf/distro/del-gui.conf

@@ -0,0 +1,3 @@
+include del.conf
+
+DISTRO_FEATURES += "x11"

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"

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 \
 		"

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 \
 		"

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 \