Merge remote branch 'freescale/denzil'

* freescale/denzil:
  imx6qsabrelite: Use xserver-xorg instead of xserver-xorg-lite
  cogl: Use OpenGL ES2 for mx5 SoCs
  imx-base.inc: Set preferred implementation of virtual/libgl for mx5 SoCs
  amd-gpu-x11-bin-mx51: Add provides to 'virtual/libgl'

4 files changed, 10 insertions, 5 deletions

diff --git a/conf/machine/imx6qsabrelite.conf b/conf/machine/imx6qsabrelite.conf
index 2528142..e10229a 100644
--- a/conf/machine/imx6qsabrelite.conf
+++ b/conf/machine/imx6qsabrelite.conf
@@ -10,15 +10,13 @@ SOC_FAMILY = "mx6"
 
 KERNEL_DEVICETREE = "${S}/arch/arm/boot/dts/imx6q-sabrelite.dts"
 
-# no GST until codecs are public
-MACHINE_GSTREAMER_PLUGIN = ""
-
 UBOOT_ENTRYPOINT =  "0x10800000"
 UBOOT_LOADADDRESS = "0x10800000"
 UBOOT_MACHINE = "mx6qsabrelite_config"
 
 # Needs to override until all BSP is public
-XSERVER = "xserver-xorg-lite \
+MACHINE_GSTREAMER_PLUGIN = ""
+XSERVER = "xserver-xorg \
            xf86-input-evdev \
            xf86-video-fbdev"
 MACHINE_EXTRA_RRECOMMENDS = "kernel-modules \
diff --git a/conf/machine/include/imx-base.inc b/conf/machine/include/imx-base.inc
index 33be4c4..1145709 100644
--- a/conf/machine/include/imx-base.inc
+++ b/conf/machine/include/imx-base.inc
@@ -28,6 +28,8 @@ MACHINE_EXTRA_RRECOMMENDS += "imx-audio \
 # Gstreamer plugin
 MACHINE_GSTREAMER_PLUGIN ?= "gst-fsl-plugin"
 
+PREFERRED_PROVIDER_virtual/libgl_mx5 ?= "amd-gpu-x11-bin-mx51"
+
 EXTRA_IMAGEDEPENDS = "u-boot"
 
 SDCARD_ROOTFS ?= "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ext3"
diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
index 49fdaab..79118c6 100644
--- a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
+++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb
@@ -4,11 +4,12 @@
 DESCRIPTION = "GPU driver and apps for x11 on mx51"
 LICENSE = "MIT"
 SECTION = "libs"
-PR = "r8"
+PR = "r9"
 
 #todo: Replace for correct AMD license
 LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802"
 DEPENDS = "virtual/libx11 libz160"
+PROVIDES = "virtual/libgl"
 RDEPENDS = "libz160"
 
 SRC_URI = "file://${PN}-${PV}.tar.gz \
diff --git a/recipes-graphics/clutter/cogl_1.8.2.bbappend b/recipes-graphics/clutter/cogl_1.8.2.bbappend
new file mode 100644
index 0000000..d2e6ca6
--- /dev/null
+++ b/recipes-graphics/clutter/cogl_1.8.2.bbappend
@@ -0,0 +1,4 @@
+PRINC := "${@int(PRINC) + 1}"
+
+EXTRA_OECONF_mx5 = "${BASE_CONF} --with-flavour=glx --enable-gles2 --disable-gl"
+PACKAGE_ARCH_mx5 = "${MACHINE_ARCH}"