Merge remote-tracking branch 'origin/stable' into dev

* origin/stable: (45 commits) Update sha1 for meta-fsl-arm-extra Include u-boot-fw-tools to image New sha1 for meta-fsl-arm-extra Fix c_rehash problem on ca-certificates linux-boundary: revert 1G/3G memory split configure Use specific SHA1 from all of the meta repos beagleboard specific u-boot was removed from meta-ti Old libgles-omap3 packages were removed from meta-ti toradex: enable FunctionFS module needed for adb bbb: correct path for kernel configure fragment image: include i2c-tools in image adb: enabled network mode for toradex toradex: Add hardware acceleration for gstream adbd: add dependency to openssl for libcrypto Include toradex repository imx6: set preferred version for gpu drivers Include older Vivante drivers for Apalis iMX6 Include support for Toradox Apalis iMX6 BBB: enable USB serial kernel drivers No need for RPi in BBMASK ... Change-Id: I9a3a329c0ec64476a5809c7bcd06a2bbe44655b4
author: Samuli Piippo <samuli.piippo@digia.com> 2014-09-02 12:13:36 +0300
committer: Samuli Piippo <samuli.piippo@digia.com> 2014-09-02 12:15:45 +0300
commit: 74d228d7fd5b6c533852a6856b01d4d21f80216b (patch)
tree: d51284ba079a53c824cdd3bf6a434dda2fa61584
parent: fa7c1238796da94fff794d865e501622301a5d85 (diff)
parent: a1af90f3e900e5fd93fdedf74bafd2269f92ec45 (diff)
download: meta-boot2qt-74d228d7fd5b6c533852a6856b01d4d21f80216b.tar.gz
60 files changed, 904 insertions, 806 deletions
diff --git a/README b/README
index a2aa884..b3b55a4 100644
--- a/README
+++ b/README
@@ -28,27 +28,31 @@ OpenEmbedded and Yocto.
 This layer depends on:
-URI: git://git.openembedded.org/openembedded-core
+URI: git://git.yoctoproject.org/poky
-branch: dora
+branch: daisy
-revision: HEAD
+revision: b0ce70ffa820c8b4069bdb413f7aa9db668b9428
 URI: git://git.openembedded.org/meta-openembedded
 layer: meta-oe
-branch: dora
+branch: daisy
-revision: HEAD
+revision: a6dcf6265822ca1484d991d10a3042e04a960cdb
 URI: git://git.yoctoproject.org/meta-ti
-branch: dora
+branch: daisy
-revision: HEAD
+revision: 5dad1bc02dd922a6c4fa4d68f6ea9ec779cf5e66
 URI: git://git.yoctoproject.org/meta-fsl-arm
-branch: dora
+branch: daisy
-revision: HEAD
+revision: f5bf277a5a5fba2c3b64ed7d2dbec1903d96386b
-URI: git://github.com/Freescale/meta-fsl-arm-extra.git
+URI: git://github.com/Freescale/meta-fsl-arm-extra
-branch: dora
+branch: daisy
-revision: HEAD
+revision: 029f535cfbc5746288c6129babb2d7679927a183
 URI: git://git.yoctoproject.org/meta-raspberrypi
-branch: dora
+branch: daisy
-revision: HEAD
+revision: cc74bf6c1f9ab9beea52c4c75797f3ad51f72c55
+URI: git://git.toradex.com/meta-toradex.git
+branch: V2.2
+revision: 371ea626f29a2a12294ab6ea30e36743a9e2f78f
diff --git a/b2qt-init-build-env b/b2qt-init-build-env
index 8c4da01..e1f34fc 100755
--- a/b2qt-init-build-env
+++ b/b2qt-init-build-env
@@ -33,29 +33,32 @@ mkdir -p ${1}
 DIR=$(readlink -f $(dirname $0))
 BUILDDIR=$(readlink -f $1)
-if [ ! -d ${BUILDDIR}/poky ]; then
+checkout() {
-    git clone git://git.yoctoproject.org/poky ${BUILDDIR}/poky -b dora
+    REPO=$1
-fi
+    REPODIR=${REPO##*/}
+    if [ ${REPODIR} != "poky" ]; then
-if [ ! -d ${BUILDDIR}/poky/meta-openembedded ]; then
+        REPODIR="poky/${REPODIR}"
-    git clone git://git.openembedded.org/meta-openembedded ${BUILDDIR}/poky/meta-openembedded -b dora
+    fi
-fi
+    REF=${2%%:*}
+    SHA1=${2##*:}
-if [ ! -d ${BUILDDIR}/poky/meta-ti ]; then
+    if [ ! -d ${BUILDDIR}/${REPODIR} ]; then
-    git clone git://git.yoctoproject.org/meta-ti ${BUILDDIR}/poky/meta-ti -b dora
+        mkdir ${BUILDDIR}/${REPODIR}
-fi
+        cd ${BUILDDIR}/${REPODIR}
+        git init
+        git remote add origin ${REPO} -f
+        git checkout ${REF}
+        git reset --hard ${SHA1}
+        cd -
+    fi
+}
-if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm ]; then
+checkout git://git.yoctoproject.org/poky                "daisy:b0ce70ffa820c8b4069bdb413f7aa9db668b9428"
-    git clone git://git.yoctoproject.org/meta-fsl-arm ${BUILDDIR}/poky/meta-fsl-arm -b dora
+checkout git://git.yoctoproject.org/meta-fsl-arm        "daisy:f5bf277a5a5fba2c3b64ed7d2dbec1903d96386b"
-fi
+checkout git://github.com/Freescale/meta-fsl-arm-extra  "daisy:6c3871ea5b0ec358e978814b5b38cef40d8dcbbc"
+checkout git://git.yoctoproject.org/meta-ti             "daisy:5dad1bc02dd922a6c4fa4d68f6ea9ec779cf5e66"
-if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm-extra ]; then
+checkout git://git.yoctoproject.org/meta-raspberrypi    "daisy:cc74bf6c1f9ab9beea52c4c75797f3ad51f72c55"
-    git clone git://github.com/Freescale/meta-fsl-arm-extra.git ${BUILDDIR}/poky/meta-fsl-arm-extra -b dora
+checkout git://git.toradex.com/meta-toradex             "V2.2:371ea626f29a2a12294ab6ea30e36743a9e2f78f"
-fi
+checkout git://git.openembedded.org/meta-openembedded   "daisy:a6dcf6265822ca1484d991d10a3042e04a960cdb"
-if [ ! -d ${BUILDDIR}/poky/meta-raspberrypi ]; then
-    git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b dora
-fi
 if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then
    ln -s ${DIR} ${BUILDDIR}/poky/meta-b2qt
diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass
index 5292965..cbb6c4c 100644
--- a/classes/bootfs-image.bbclass
+++ b/classes/bootfs-image.bbclass
@@ -26,7 +26,7 @@ BOOTFS_LINK_NAME = "${IMAGE_BASENAME}-boot-${MACHINE}"
 BOOTFS_DEPENDS ?= ""
 fakeroot do_bootfs () {
-        if [ -n ${BOOTFS_CONTENT} ]; then
+        if [ -z "${BOOTFS_CONTENT}" ]; then
                exit 0
        fi
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 5a95ec2..9789ceb 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -34,6 +34,7 @@ BBLAYERS ?= " \
  ##COREBASE##/meta-fsl-arm-extra \
  ##COREBASE##/meta-ti \
  ##COREBASE##/meta-raspberrypi \
+  ##COREBASE##/meta-toradex \
  ##COREBASE##/meta-openembedded/meta-oe \
  ##COREBASE##/meta-b2qt \
  "
diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf
index 66ddcf1..8819c93 100644
--- a/conf/distro/b2qt.conf
+++ b/conf/distro/b2qt.conf
@@ -24,7 +24,7 @@ include conf/distro/poky.conf
 DISTRO = "b2qt"
 DISTRO_NAME = "Boot to Qt for Embedded Linux"
-DISTRO_VERSION = "1.5"
+DISTRO_VERSION = "1.6"
 SDK_VERSION := "${DISTRO_VERSION}"
 MAINTAINER = "B2Qt <B2Qt@digia.com>"
@@ -39,7 +39,7 @@ include conf/distro/include/${MACHINE}.conf
 SYSVINIT_ENABLED_GETTYS = ""
-DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 irda largefile pcmcia usbgadget usbhost wifi xattr nfs zeroconf pci 3g nfc"
+DISTRO_FEATURES_DEFAULT = "alsa argp bluetooth ext2 largefile usbgadget usbhost wifi xattr nfs"
 POKY_DEFAULT_DISTRO_FEATURES = "largefile opengl multiarch"
 DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio"
diff --git a/conf/distro/include/apalis-imx6.conf b/conf/distro/include/apalis-imx6.conf
new file mode 100644
index 0000000..144693d
--- /dev/null
+++ b/conf/distro/include/apalis-imx6.conf
@@ -0,0 +1,52 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+IMAGE_FSTYPES = "tar.gz"
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    u-boot-${MACHINE}.imx:u-boot.imx \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy"
+PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.9-1.0.0-hfp"
+PREFERRED_VERSION_imx-lib = "3.10.9-1.0.0"
+MACHINE_EXTRA_INSTALL = "\
+        libgal-mx6 \
+        libegl-mx6 \
+        libgles2-mx6 \
+        gst-fsl-plugin \
+        "
+MACHINE_EXTRA_INSTALL_SDK = " \
+        libgal-mx6 \
+        libegl-mx6 \
+        libegl-mx6-dev \
+        libgles2-mx6 \
+        libgles2-mx6-dev \
+        "
+ADB_PRODUCTID = "0x0000"
+SERIAL_CONSOLES = "115200;ttymxc0 \
+                   115200;ttymxc1"
diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf
new file mode 100644
index 0000000..a19f85f
--- /dev/null
+++ b/conf/distro/include/imx6qsabresd.conf
@@ -0,0 +1,52 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+IMAGE_FSTYPES = "tar.gz ext3 sdcard"
+BOOTFS_CONTENT = "\
+    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx6q-sabresd.dtb:imx6q-sabresd.dtb \
+    ${KERNEL_IMAGETYPE}-imx6q-sabresd-hdcp.dtb:imx6q-sabresd-hdcp.dtb \
+    ${KERNEL_IMAGETYPE}-imx6q-sabresd-ldo.dtb:imx6q-sabresd-ldo.dtb \
+    u-boot-${MACHINE}.imx:u-boot.imx \
+    "
+BOOTFS_DEPENDS = "u-boot:do_deploy"
+PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.0-hfp"
+PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0"
+MACHINE_EXTRA_INSTALL = "\
+        libgal-mx6 \
+        libegl-mx6 \
+        libgles2-mx6 \
+        gst-fsl-plugin \
+        "
+MACHINE_EXTRA_INSTALL_SDK = " \
+        libgal-mx6 \
+        libegl-mx6 \
+        libegl-mx6-dev \
+        libgles2-mx6 \
+        libgles2-mx6-dev \
+        "
+ADB_PRODUCTID = "0x0000"
diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf
index 2a64026..9af8417 100644
--- a/conf/distro/include/nitrogen6x.conf
+++ b/conf/distro/include/nitrogen6x.conf
@@ -24,6 +24,9 @@ IMAGE_FSTYPES = "tar.gz"
 BOOTFS_CONTENT = "\
    ${KERNEL_IMAGETYPE}:${KERNEL_IMAGETYPE} \
+    ${KERNEL_IMAGETYPE}-imx6q-${MACHINE}.dtb:imx6q-${MACHINE}.dtb \
+    ${KERNEL_IMAGETYPE}-imx6dl-${MACHINE}.dtb:imx6dl-${MACHINE}.dtb \
+    ${KERNEL_IMAGETYPE}-imx6q-sabrelite.dtb:imx6q-sabrelite.dtb \
    6x_bootscript-${MACHINE}:6x_bootscript \
    6x_upgrade-${MACHINE}:6x_upgrade \
    "
@@ -31,6 +34,9 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-bounda
 EXTRA_IMAGEDEPENDS += "u-boot-script-boundary"
+PREFERRED_VERSION_gpu-viv-bin-mx6q = "3.10.17-1.0.0-hfp"
+PREFERRED_VERSION_imx-lib = "3.10.17-1.0.0"
 MACHINE_EXTRA_INSTALL = "\
        libgal-mx6 \
        libegl-mx6 \
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index a9e1b34..3874397 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -275,7 +275,8 @@ CONF_VERSION = "1"
 INHERIT += "rm_work"
-BBMASK = "meta-ti/recipes-misc|meta-raspberrypi/recipes-graphics/mesa/mesa_9.2.2.bbappend"
+BBMASK = "meta-ti/recipes-misc"
+BBMASK += "|meta-toradex/recipes/images|meta-toradex/recipes-browser|meta-toradex/recipes-connectivity|meta-toradex/recipes-gnome|meta-toradex/recipes-mozilla|meta-toradex/recipes-graphics|meta-toradex/recipes-devtools/mtd|meta-toradex/recipes-core/psplash|meta-toradex/recipes-lxde|meta-toradex/recipes-multimedia/webm|meta-toradex/recipes/trdx-config|meta-toradex/recipes-core/util-linux|meta-toradex/recipes-core/systemd|meta-toradex/recipes-support|meta-toradex/recipes-core/dropbear|meta-toradex/recipes/base-files|meta-toradex/recipes-multimedia/gstreamer"
 ACCEPT_FSL_EULA = "1"
 LICENSE_FLAGS_WHITELIST = "commercial"
diff --git a/recipes/adbd/adbd.bb b/recipes/adbd/adbd.bb
index 9e3ed67..562e1d1 100644
--- a/recipes/adbd/adbd.bb
+++ b/recipes/adbd/adbd.bb
@@ -31,6 +31,7 @@ PR = "r0"
 SRCREV = "${PV}"
 RRECOMMENDS_${PN} += "kernel-module-g-ffs"
+DEPENDS = "openssl"
 SRC_URI = "git://android.googlesource.com/platform/system/core;protocol=https \
           file://adbd.patch;striplevel=2 \
diff --git a/recipes/adbd/files/apalis-imx6/defaults b/recipes/adbd/files/apalis-imx6/defaults
new file mode 100644
index 0000000..0fbba4c
--- /dev/null
+++ b/recipes/adbd/files/apalis-imx6/defaults
@@ -0,0 +1,4 @@
+VENDOR=0x18d1
+PRODUCT=0x0000
+SERIAL=$(hostname)-$(sed -e 's/://g' /sys/class/net/eth0/address)
+USE_ETHERNET=yes
diff --git a/recipes/base-files/base-files/blacklist.conf b/recipes/base-files/base-files/blacklist.conf
new file mode 100644
index 0000000..a8b8885
--- /dev/null
+++ b/recipes/base-files/base-files/blacklist.conf
@@ -0,0 +1 @@
+blacklist evbug
diff --git a/recipes/base-files/base-files_3.0.14.bbappend b/recipes/base-files/base-files_3.0.14.bbappend
index 4b8908a..6e083e2 100644
--- a/recipes/base-files/base-files_3.0.14.bbappend
+++ b/recipes/base-files/base-files_3.0.14.bbappend
@@ -20,7 +20,15 @@
 ##
 #############################################################################
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "\
+    file://blacklist.conf \
+    "
 do_install_append() {
-       ln -s /home/root ${D}/root
+        ln -s /home/root ${D}/root
-       echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname
+        echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname
+        install -m 0755 -d ${D}${sysconfdir}/modprobe.d
+        install -m 0644 ${WORKDIR}/blacklist.conf ${D}${sysconfdir}/modprobe.d
 }
diff --git a/recipes/busybox/busybox_1.21.1.bbappend b/recipes/busybox/busybox_1.22.1.bbappend
index fe5d5ea..fe5d5ea 100644
--- a/recipes/busybox/busybox_1.21.1.bbappend
+++ b/recipes/busybox/busybox_1.22.1.bbappend
diff --git a/recipes/ca-certificates/ca-certificates_20130610.bbappend b/recipes/ca-certificates/ca-certificates_20130610.bbappend
new file mode 100644
index 0000000..723a900
--- /dev/null
+++ b/recipes/ca-certificates/ca-certificates_20130610.bbappend
@@ -0,0 +1,24 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+SRC_URI_remove = "file://0001-update-ca-certificates-remove-c-rehash.patch"
+DEPENDS_class-native = "coreutils-native"
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
new file mode 100644
index 0000000..f661539
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q.inc
@@ -0,0 +1,246 @@
+# Copyright (C) 2012-2013 Freescale Semiconductor
+# Copyright (C) 2012-2013 O.S. Systems Software LTDA.
+# Released under the MIT license (see COPYING.MIT for the terms)
+DESCRIPTION = "GPU driver and apps for imx6"
+SECTION = "libs"
+LICENSE = "Proprietary"
+LIC_FILES_CHKSUM = "file://usr/include/gc_vdk.h;endline=11;md5=19f5925343fa3da65596eeaa4ddb5fd3"
+DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxdamage libxext libxfixes mesa', '', d)}"
+PROVIDES += "virtual/wayland-egl virtual/libgl virtual/libgal-x11 virtual/egl virtual/libgles1 virtual/libgles2 virtual/libopenvg"
+PE = "1"
+inherit fsl-eula-unpack
+SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \
+           file://egl.pc \
+           file://egl_x11.pc \
+           file://glesv1_cm.pc \
+           file://glesv1_cm_x11.pc \
+           file://glesv2.pc \
+           file://glesv2_x11.pc \
+           file://vg.pc \
+           file://vg_x11.pc \
+           file://gc_wayland_protocol.pc \
+           file://wayland-egl.pc \
+           file://wayland-viv.pc \
+          "
+PACKAGES =+ "libclc-mx6 libclc-mx6-dev libclc-mx6-dbg \
+        libgl-mx6 libgl-mx6-dev libgl-mx6-dbg \
+        libgles-mx6 libgles-mx6-dev libgles-mx6-dbg \
+        libgles2-mx6 libgles2-mx6-dev libgles2-mx6-dbg \
+        libglslc-mx6 libglslc-mx6-dev libglslc-mx6-dbg \
+        libopencl-mx6 libopencl-mx6-dev libopencl-mx6-dbg \
+        libopenvg-mx6 libopenvg-mx6-dev libopenvg-mx6-dbg \
+        libvdk-mx6 libvdk-mx6-dev libvdk-mx6-dbg \
+        libegl-mx6 libegl-mx6-dev libegl-mx6-dbg \
+        libgal-mx6 libgal-mx6-dev libgal-mx6-dbg \
+        libvivante-mx6 libvivante-mx6-dev libvivante-mx6-dbg \
+        libvivante-dri-mx6 \
+        libvivante-dfb-mx6 \
+        libwayland-viv-mx6 libwayland-viv-mx6-dev libwayland-viv-mx6-dbg \
+        libgc-wayland-protocol-mx6 libgc-wayland-protocol-mx6-dev libgc-wayland-protocol-mx6-dbg \
+        libwayland-egl-mx6-dev \
+"
+# Skip package if it does not match the machine float-point type in use
+python __anonymous () {
+        is_machine_hardfp = base_contains("TUNE_FEATURES", "callconvention-hard", True, False, d)
+        is_package_hardfp = d.getVar("PACKAGE_FP_TYPE", True) == "hardfp"
+        if is_package_hardfp != is_machine_hardfp:
+                PN = d.getVar("PN", True)
+                PV = d.getVar("PV", True)
+                bb.debug(1, "Skipping %s (%s) as machine and package float-point does not match" % (PN, PV))
+                raise bb.parse.SkipPackage("Package Float-Point is not compatible with the machine")
+}
+USE_X11 = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}"
+USE_DFB = "${@base_contains("DISTRO_FEATURES", "directfb", "yes", "no", d)}"
+USE_WL = "${@base_contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}"
+# Inhibit warnings about files being stripped.
+INHIBIT_PACKAGE_STRIP = "1"
+INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+# FIXME: The provided binary doesn't provide soname. If in future BSP
+# release the libraries are fixed, we can drop this hack.
+REALSOLIBS := "${SOLIBS}"
+SOLIBS = "${SOLIBSDEV}"
+# For the packages that make up the OpenGL interfaces, inject variables so that
+# they don't get Debian-renamed (which would remove the -mx6 suffix).
+#
+# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have
+# the source we cannot fix it. Disable the insane check for now.
+python __anonymous() {
+    packages = d.getVar('PACKAGES', True).split()
+    for p in packages:
+        d.appendVar("INSANE_SKIP_%s" % p, " ldflags")
+    for p in (("libegl", "libegl1"), ("libgl", "libgl1"),
+              ("libgles1", "libglesv1-cm1"), ("libgles2", "libglesv2-2"),
+              ("libgles3",)):
+        fullp = p[0] + "-mx6"
+        pkgs = " ".join(p)
+        d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
+        d.appendVar("RREPLACES_" + fullp, pkgs)
+        d.appendVar("RPROVIDES_" + fullp, pkgs)
+        d.appendVar("RCONFLICTS_" + fullp, pkgs)
+        # For -dev, the first element is both the Debian and original name
+        fullp += "-dev"
+        pkgs = p[0] + "-dev"
+        d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1")
+        d.appendVar("RREPLACES_" + fullp, pkgs)
+        d.appendVar("RPROVIDES_" + fullp, pkgs)
+        d.appendVar("RCONFLICTS_" + fullp, pkgs)
+}
+do_install () {
+    install -d ${D}${libdir}
+    install -d ${D}${includedir}
+    cp -a ${S}/usr/lib/*.so* ${D}${libdir}
+    cp -axr ${S}/usr/include/* ${D}${includedir}
+    cp -axr ${S}/opt ${D}
+    install -d ${D}${libdir}/pkgconfig
+    # The preference order, based in DISTRO_FEATURES, is x11, wayland, directfb and fb
+    if [ "${USE_X11}" = "yes" ]; then
+        cp -r ${S}/usr/lib/dri ${D}${libdir}
+        backend=x11
+        install -m 0644 ${WORKDIR}/egl_x11.pc ${D}${libdir}/pkgconfig/egl.pc
+        install -m 0644 ${WORKDIR}/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
+        install -m 0644 ${WORKDIR}/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc
+        install -m 0644 ${WORKDIR}/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc
+        #FIXME: WL & X11 is not currently functional
+        #if [ "${USE_WL}" = "yes" ]; then
+        #    install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
+        #    install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
+        #    install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
+        #fi
+    elif [ "${USE_WL}" = "yes" ]; then
+        backend=wl
+        install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
+        install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
+        install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
+        install -m 0644 ${WORKDIR}/vg.pc ${D}${libdir}/pkgconfig/vg.pc
+        install -m 0644 ${WORKDIR}/gc_wayland_protocol.pc ${D}${libdir}/pkgconfig/gc_wayland_protocol.pc
+        install -m 0644 ${WORKDIR}/wayland-egl.pc ${D}${libdir}/pkgconfig/wayland-egl.pc
+        install -m 0644 ${WORKDIR}/wayland-viv.pc ${D}${libdir}/pkgconfig/wayland-viv.pc
+    else
+        install -m 0644 ${WORKDIR}/egl.pc ${D}${libdir}/pkgconfig/egl.pc
+        install -m 0644 ${WORKDIR}/glesv1_cm.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc
+        install -m 0644 ${WORKDIR}/glesv2.pc ${D}${libdir}/pkgconfig/glesv2.pc
+        install -m 0644 ${WORKDIR}/vg.pc ${D}${libdir}/pkgconfig/vg.pc
+        if [ "${USE_DFB}" = "yes" ]; then
+            cp -r ${S}/usr/lib/directfb-1.6-0 ${D}${libdir}
+            backend=dfb
+        else
+            # Regular framebuffer
+            backend=fb
+        fi
+    fi
+    # We'll only have one backend here so we rename it to generic name
+    # and avoid rework in other packages, when possible
+    mv ${D}${libdir}/libGL.so.1.2 ${D}${libdir}/libGL.so.1.2.0
+    ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so.1.2
+    ln -sf libGL.so.1.2.0 ${D}${libdir}/libGL.so
+    mv ${D}${libdir}/libEGL-${backend}.so ${D}${libdir}/libEGL.so.1.0
+    ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so.1
+    ln -sf libEGL.so.1.0 ${D}${libdir}/libEGL.so
+    mv ${D}${libdir}/libGAL-${backend}.so ${D}${libdir}/libGAL.so
+    mv ${D}${libdir}/libVIVANTE-${backend}.so ${D}${libdir}/libVIVANTE.so
+    for backend in wl x11 fb dfb; do
+        find ${D}${libdir} -name "*-$backend.so" -exec rm '{}' ';'
+    done
+    find ${D}${libdir} -type f -exec chmod 644 {} \;
+    find ${D}${includedir} -type f -exec chmod 644 {} \;
+}
+S = "${WORKDIR}/${PN}-${PV}"
+FILES_${PN} += "/opt"
+FILES_${PN}-dev = "${includedir}"
+FILES_${PN}-dbg = "${libdir}/.debug /opt/viv_samples/*/*/.debug"
+FILES_libclc-mx6 = "${libdir}/libCLC${SOLIBS}"
+FILES_libclc-mx6-dev = "${includedir}/CL ${libdir}/libCLC${SOLIBSDEV}"
+FILES_libclc-mx6-dbg = "${libdir}/.debug/libCLC${SOLIBS}"
+# libEGL.so is used by some demo apps from Freescale
+INSANE_SKIP_libegl-mx6 += "dev-so"
+FILES_libegl-mx6 = "${libdir}/libEGL${REALSOLIBS} ${libdir}/libEGL${SOLIBSDEV} "
+FILES_libegl-mx6-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc"
+FILES_libegl-mx6-dbg = "${libdir}/.debug/libEGL${SOLIBS}"
+FILES_libgal-mx6 = "${libdir}/libGAL${SOLIBS}"
+FILES_libgal-mx6-dev = "${libdir}/libGAL${SOLIBSDEV}"
+FILES_libgal-mx6-dbg = "${libdir}/.debug/libGAL${SOLIBS}"
+FILES_libgl-mx6 = "${libdir}/libGL${REALSOLIBS}"
+FILES_libgl-mx6-dev = "${libdir}/libGL${SOLIBSDEV}"
+FILES_libgl-mx6-dbg = "${libdir}/.debug/libGL.${SOLIBS}"
+RDEPENDS_libgl-mx6-dev = "libgl-mesa-dev"
+# libEGL needs to open libGLESv1.so
+INSANE_SKIP_libgles-mx6 += "dev-so"
+FILES_libgles-mx6 = "${libdir}/libGLESv1*${REALSOLIBS} ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBS}"
+FILES_libgles-mx6-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBS} ${libdir}/libGLES_*${SOLIBSDEV} ${libdir}/pkgconfig/glesv1_cm.pc"
+FILES_libgles-mx6-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS} ${libdir}/.debug/libGLES_*${SOLIBS}"
+# libEGL needs to open libGLESv2.so
+INSANE_SKIP_libgles2-mx6 += "dev-so"
+FILES_libgles2-mx6 = "${libdir}/libGLESv2${REALSOLIBS} ${libdir}/libGLESv2${SOLIBS}"
+FILES_libgles2-mx6-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV} ${libdir}/pkgconfig/glesv2.pc"
+FILES_libgles2-mx6-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}"
+RDEPENDS_libgles2-mx6 = "libglslc-mx6"
+FILES_libglslc-mx6 = "${libdir}/libGLSLC${SOLIBS}"
+FILES_libglslc-mx6-dev = "${includedir}/CL ${libdir}/libGLSLC${SOLIBSDEV}"
+FILES_libglslc-mx6-dbg = "${libdir}/.debug/libGLSLC${SOLIBS}"
+FILES_libopencl-mx6 = "${libdir}/libOpenCL${SOLIBS}"
+FILES_libopencl-mx6-dev = "${includedir}/CL ${libdir}/libOpenCL${SOLIBSDEV}"
+FILES_libopencl-mx6-dbg = "${libdir}/.debug/libOpenCL${SOLIBS}"
+RDEPENDS_libopencl-mx6 = "libclc-mx6"
+FILES_libopenvg-mx6 = "${libdir}/libOpenVG*${SOLIBS}"
+FILES_libopenvg-mx6-dev = "${includedir}/VG ${libdir}/libOpenVG*${SOLIBSDEV} ${libdir}/pkgconfig/vg.pc"
+FILES_libopenvg-mx6-dbg = "${libdir}/.debug/libOpenVG*${SOLIBS}"
+FILES_libvdk-mx6 = "${libdir}/libVDK${SOLIBS}"
+FILES_libvdk-mx6-dev = "${includedir}/*vdk.h ${libdir}/libVDK${SOLIBSDEV}"
+FILES_libvdk-mx6-dbg = "${libdir}/.debug/libVDK${SOLIBS}"
+FILES_libvivante-mx6 = "${libdir}/libVIVANTE${SOLIBS}"
+FILES_libvivante-mx6-dev = "${libdir}/libVIVANTE${SOLIBSDEV}"
+FILES_libvivante-mx6-dbg = "${libdir}/.debug/libVIVANTE${SOLIBS}"
+FILES_libvivante-dri-mx6 = "${libdir}/dri/vivante_dri.so"
+FILES_libvivante-dfb-mx6 = "${libdir}/directfb-1.6-0/gfxdrivers/libdirectfb_gal.so"
+INSANE_SKIP_libwayland-viv-mx6 += "dev-so"
+FILES_libwayland-viv-mx6 =  "${libdir}/libwayland-viv${REALSOLIBS}  ${libdir}/libwayland-viv${SOLIBS}"
+FILES_libwayland-viv-mx6-dev = "${libdir})/libwayland-viv${SOLIBSDEV} ${libdir}/pkgconfig/wayland-viv.pc"
+FILES_libwayland-viv-mx6-dbg = "${libdir}/.debug/libwayland-viv${SOLIBS}"
+INSANE_SKIP_libgc-wayland-protocol-mx6 += "dev-so"
+FILES_libgc-wayland-protocol-mx6 = "${libdir}/libgc_wayland_protocol${REALSOLIBS} ${libdir}/libgc_wayland_protocol${SOLIBS}"
+FILES_libgc-wayland-protocol-mx6-dev = "${libdir}/libgc_wayland_protocol${SOLIBSDEV} ${libdir}/pkgconfig/gc_wayland_protocol.pc"
+FILES_libgc-wayland-protocol-mx6-dbg = "${libdir}/libgc_wayland_protocol${SOLIBS}"
+FILES_libwayland-egl-mx6-dev = "${libdir}/pkgconfig/wayland-egl.pc"
+COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
new file mode 100644
index 0000000..dc91d7c
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/0001-change-header-path-to-HAL.patch
@@ -0,0 +1,30 @@
+From 1a4a35678ef70283d1a31835deecd39711a9db86 Mon Sep 17 00:00:00 2001
+From: Jeremy Stashluk <jstashluk@dekaresearch.com>
+Date: Wed, 30 Jan 2013 13:16:53 -0500
+Subject: [PATCH] change header path to HAL
+The gpu-viv-bin-mx6q package from Freescale puts this header in the HAL
+directory under the system. I think this is a problem in the LTIB release as
+well.
+Upstream-Status: Pending
+Signed-off-by: Jeremy Stashluk <jstashluk@dekaresearch.com>
+---
+ usr/include/gc_vdk_types.h |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+Index: gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h
+===================================================================
+--- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/gc_vdk_types.h
+++ gpu-viv-bin-mx6q-1.1.0/usr/include/gc_vdk_types.h
+@@ -39,7 +39,7 @@ extern "C" {
+ #endif
+ 
+ #include <EGL/egl.h>
+-#include "gc_hal_eglplatform_type.h"
+#include <HAL/gc_hal_eglplatform_type.h>
+ 
+ 
+ /*******************************************************************************
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
new file mode 100644
index 0000000..a21922d
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+Name: egl
+Description: Vivante EGL library
+Requires.private:
+Version: 8.0
+Libs: -L${libdir} -lEGL
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir} -DLINUX
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
new file mode 100644
index 0000000..5921583
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/egl_x11.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+Name: egl
+Description: Vivante EGL library
+Requires.private: libdrm x11 xext xdamage xfixes xcb
+Version: 8.0
+Libs: -L${libdir} -lEGL
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir} -DLINUX
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch
new file mode 100644
index 0000000..3eac116
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/fix-conflicting-TLS-definition.patch
@@ -0,0 +1,31 @@
+Avoid conflicting types with Xorg newer code
+Upstream-Status: Pending
+Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
+Index: gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h
+===================================================================
+--- gpu-viv-bin-mx6q-1.1.0.orig/usr/include/HAL/gc_hal_base.h
+++ gpu-viv-bin-mx6q-1.1.0/usr/include/HAL/gc_hal_base.h
+@@ -101,7 +101,7 @@ extern gcsPLS gcPLS;
+ typedef struct _gcsTLS * gcsTLS_PTR;
+ 
+ typedef void (* gctTLS_DESTRUCTOR) (
+-    gcsTLS_PTR TLS
+    gcsTLS_PTR pTLS
+     );
+ 
+ typedef struct _gcsTLS
+@@ -648,10 +648,10 @@ gcoOS_SetPLSValue(
+ /* Get access to the thread local storage. */
+ gceSTATUS
+ gcoOS_GetTLS(
+-    OUT gcsTLS_PTR * TLS
+    OUT gcsTLS_PTR * pTLS
+     );
+ 
+-    /* Copy the TLS from a source thread. */
+    /* Copy the pTLS from a source thread. */
+     gceSTATUS gcoOS_CopyTLS(IN gcsTLS_PTR Source);
+ 
+ /* Destroy the objects associated with the current thread. */
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
new file mode 100644
index 0000000..732a073
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_hal_eglplatform-remove-xlib-undefs.patch
@@ -0,0 +1,34 @@
+From c59f9640d185759208f9d55a93b6602936dcb5e8 Mon Sep 17 00:00:00 2001
+From: Adrian Alonso <aalonso00@gmail.com>
+Date: Sat, 26 Jan 2013 17:52:04 -0600
+Subject: [PATCH 2/2] gc_hal_eglplatform: remove xlib undefs
+* Remove header undefs for Always and Status definitions
+Signed-off-by: Adrian Alonso <aalonso00@gmail.com>
+---
+ usr/include/HAL/gc_hal_eglplatform.h | 3 ---
+ 1 file changed, 3 deletions(-)
+diff --git a/usr/include/HAL/gc_hal_eglplatform.h b/usr/include/HAL/gc_hal_eglplatform.h
+index a968fe7..e80c65a 100644
+--- a/usr/include/HAL/gc_hal_eglplatform.h
+++ b/usr/include/HAL/gc_hal_eglplatform.h
+@@ -341,14 +341,11 @@ typedef Pixmap      HALNativePixmapType;
+ /* Rename some badly named X defines. */
+ #ifdef Status
+ #   define XStatus      int
+-#   undef Status
+ #endif
+ #ifdef Always
+ #   define XAlways      2
+-#   undef Always
+ #endif
+ #ifdef CurrentTime
+-#   undef CurrentTime
+ #   define XCurrentTime 0
+ #endif
+ 
+-- 
+1.8.1
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
new file mode 100644
index 0000000..f4610ea
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/gc_wayland_protocol.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+Name: gc_wayland_protocol
+Description: Vivante Wayland Protocol Extension Library
+Version: 0.1
+Cflags: -I${includedir}
+Libs: -L${libdir} -lgc_wayland_protocol
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
new file mode 100644
index 0000000..d97b067
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+Name: glesv1_cm
+Description: Vivante OpenGL ES 1.1 CM library
+Requires.private:
+Version: 8.0
+Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
new file mode 100644
index 0000000..e801633
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv1_cm_x11.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+Name: glesv1_cm
+Description: Vivante OpenGL ES 1.1 CM library
+Requires.private: libdrm x11 xext xdamage xfixes xcb
+Version: 8.0
+Libs: -L${libdir} -lGLESv1_CM -lEGL -lGAL
+Libs.private: -lm -lpthread -ldl
+Cflags: -I${includedir}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
new file mode 100644
index 0000000..9be46f2
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+Name: glesv2
+Description: Vivante OpenGL ES 2.0 library
+Requires.private:
+Version: 8.0
+Libs: -L${libdir} -lGLESv2 -lEGL -lGAL
+Libs.private: -lpthread -lrt
+Cflags: -I${includedir}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
new file mode 100644
index 0000000..57ad807
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/glesv2_x11.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+Name: glesv2
+Description: Vivante OpenGL ES 2.0 library
+Requires.private: libdrm x11 xext xdamage xfixes xcb
+Version: 8.0
+Libs: -L${libdir} -lGLESv2 -lEGL -lGAL
+Libs.private: -lpthread -lrt
+Cflags: -I${includedir}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
new file mode 100644
index 0000000..7c00def
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+Name: vg
+Description: Vivante OpenVG 1.1 library
+Requires.private:
+Version: 8.0
+Libs: -L${libdir} -lOpenVG -lEGL -lGAL
+Libs.private: -lpthread -lrt
+Cflags: -I${includedir}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
new file mode 100644
index 0000000..94fb91e
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/vg_x11.pc
@@ -0,0 +1,12 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=/usr/lib
+includedir=/usr/include
+Name: vg
+Description: Vivante OpenVG 1.1 library
+Requires.private: libdrm x11 xext xdamage xfixes xcb
+Version: 8.0
+Libs: -L${libdir} -lOpenVG -lEGL -lGAL
+Libs.private: -lpthread -lrt
+Cflags: -I${includedir}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
new file mode 100644
index 0000000..ba1b898
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-egl.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+Name: wayland-egl
+Description: Bind the driver EGL to the Wayland API
+Version: 1.0.0
+Libs: -L${libdir} -lEGL
+Cflags: -I${includedir}
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
new file mode 100644
index 0000000..3fdedd0
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q/wayland-viv.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+includedir=${prefix}/include
+Name: Wayland Vivante Lib
+Description: Wayland server side library for Vivante's EGL driver
+Version: 0.1
+Cflags: -I${includedir}/wayland-viv
+Libs: -L${libdir} -lwayland-viv
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.0-hfp.bbappend
index bed361e..bed361e 100644
--- a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.0-hfp.bbappend
diff --git a/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb
new file mode 100644
index 0000000..5c7727b
--- /dev/null
+++ b/recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bb
@@ -0,0 +1,11 @@
+# Copyright (C) 2013 Freescale Semiconductor
+# Released under the MIT license (see COPYING.MIT for the terms)
+require gpu-viv-bin-mx6q.inc
+SRC_URI[md5sum] = "52f5ebbb6a9b5d0eafdb952246de584e"
+SRC_URI[sha256sum] = "8b0386e13d4a7c770f8bc8e7a6119629c5ed379488dd5ef635bc92353f906003"
+PACKAGE_FP_TYPE = "hardfp"
+RDEPENDS_libgl-mx6-dev = ""
diff --git a/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb b/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb
new file mode 100644
index 0000000..f2a736a
--- /dev/null
+++ b/recipes/imx-lib/imx-lib_3.10.9-1.0.0.bb
@@ -0,0 +1,10 @@
+# Copyright (C) 2013 Freescale Semiconductor
+require recipes-bsp/imx-lib/imx-lib.inc
+SRC_URI[md5sum] = "5cc9c8d09c7ba401cdab4a2ecbda89e2"
+SRC_URI[sha256sum] = "d1581c2f2956731da0c42e9dc17514a4d00790deeb83defeb5e07d14746190d8"
+PE = "1"
+COMPATIBLE_MACHINE = "(mx6)"
diff --git a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
index 6a37c89..0646e73 100644
--- a/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
+++ b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend
@@ -29,7 +29,7 @@ do_install_append() {
 }
 # Inhibit warnings about files being stripped.
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
 pkg_postinst_${PN}_append() {
 ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
diff --git a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend b/recipes/libgles/libgles-omap3_5.01.01.01.bbappend
index 82bfdb2..9a90577 100644
--- a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend
+++ b/recipes/libgles/libgles-omap3_5.01.01.01.bbappend
@@ -28,7 +28,7 @@ BINLOCATION_beaglebone  = "${S}/gfx_rel_es8.x"
 LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
 # Inhibit warnings about files being stripped.
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
+INHIBIT_PACKAGE_STRIP = "1"
 pkg_postinst_${PN}_append() {
 ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
diff --git a/recipes/libsdl/libsdl_1.2.15.bbappend b/recipes/libsdl/libsdl_1.2.15.bbappend
index 36424fd..3a08249 100644
--- a/recipes/libsdl/libsdl_1.2.15.bbappend
+++ b/recipes/libsdl/libsdl_1.2.15.bbappend
@@ -1 +1 @@
-DEPENDS_remove = "virtual/libgl"
+DEPENDS_remove = "virtual/libgl libglu"
diff --git a/recipes/linux/linux-am335x-psp_3.2.bbappend b/recipes/linux/linux-am335x-psp_3.2.bbappend
index 313111b..fd7dd31 100644
--- a/recipes/linux/linux-am335x-psp_3.2.bbappend
+++ b/recipes/linux/linux-am335x-psp_3.2.bbappend
@@ -30,5 +30,11 @@ do_configure_append() {
        echo "CONFIG_DEVTMPFS=y"                >> ${S}/.config
+        # Enable USB serial support
+        echo "CONFIG_USB_SERIAL=m"              >> ${S}/.config
+        echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${S}/.config
+        echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${S}/.config
+        echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${S}/.config
        yes '' | oe_runmake oldconfig
 }
diff --git a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend b/recipes/linux/linux-boundary_3.10.17.bbappend
index 5446ffa..ae59272 100644
--- a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend
+++ b/recipes/linux/linux-boundary_3.10.17.bbappend
@@ -20,27 +20,21 @@
 ##
 #############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
+do_configure_prepend() {
-BINLOCATION_beaglebone  = "${S}/gfx_rel_es8.x"
+        # Use multitouch protocol for touchscreen that support it
+        echo "CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
+        echo "CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
-LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
+        # FunctionFS for adb
+        echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
-do_install_append() {
+        # Enable USB serial support
-        echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini
+        echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
-}
+        echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
+        echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
-# Inhibit warnings about files being stripped.
+        echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
-INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
-pkg_postinst_${PN}_append() {
+        # fix imx-vpu break on video decoding
-ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
+        echo "CONFIG_VMSPLIT_2G=y"              >> ${WORKDIR}/defconfig
-echo ${ESREV} > $D${sysconfdir}/powervr-esrev
 }
-RRECOMMENDS_${PN} = "omap3-sgx-modules"
-RRECOMMENDS_${PN}-blitwsegl = ""
-RRECOMMENDS_${PN}-flipwsegl = ""
-RRECOMMENDS_${PN}-frontwsegl = ""
-RRECOMMENDS_${PN}-linuxfbwsegl = ""
diff --git a/recipes/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-imx_3.10.17.bbappend
index 610dc4d..082c431 100644
--- a/recipes/linux/linux-boundary_3.0.35.bbappend
+++ b/recipes/linux/linux-imx_3.10.17.bbappend
@@ -20,12 +20,13 @@
 ##
 #############################################################################
 do_configure_prepend() {
-        # Use multitouch protocol for touchscreen that support it
-        echo "CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
-        echo "CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=n"      >> ${WORKDIR}/defconfig
        # FunctionFS for adb
        echo "CONFIG_USB_FUNCTIONFS=m"  >> ${WORKDIR}/defconfig
+        # Enable USB serial support
+        echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
+        echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
+        echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
+        echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
 }
diff --git a/recipes/linux/linux-mainline_3.2.bbappend b/recipes/linux/linux-mainline_3.2.bbappend
index 4c2cb59..9e195dc 100644
--- a/recipes/linux/linux-mainline_3.2.bbappend
+++ b/recipes/linux/linux-mainline_3.2.bbappend
@@ -29,6 +29,12 @@ do_configure_prepend() {
        echo "CONFIG_USB_FUNCTIONFS_RNDIS=n"    >> ${WORKDIR}/defconfig
        echo "CONFIG_USB_FUNCTIONFS_GENERIC=y"  >> ${WORKDIR}/defconfig
+        # Enable USB serial support
+        echo "CONFIG_USB_SERIAL=m"              >> ${WORKDIR}/defconfig
+        echo "CONFIG_USB_SERIAL_GENERIC=y"      >> ${WORKDIR}/defconfig
+        echo "CONFIG_USB_SERIAL_FTDI_SIO=m"     >> ${WORKDIR}/defconfig
+        echo "CONFIG_USB_SERIAL_PL2303=m"       >> ${WORKDIR}/defconfig
        # Remove beagleboard logo
        if [ -e ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm ]; then
                rm ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm
diff --git a/recipes/linux/linux-ti-staging/usb-serial.cfg b/recipes/linux/linux-ti-staging/usb-serial.cfg
new file mode 100644
index 0000000..8f0688e
--- /dev/null
+++ b/recipes/linux/linux-ti-staging/usb-serial.cfg
@@ -0,0 +1,4 @@
+CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_GENERIC=y
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_PL2303=m
diff --git a/recipes/linux/linux-ti-staging_3.12.bbappend b/recipes/linux/linux-ti-staging_3.12.bbappend
index fe2bdd2..b2d6104 100644
--- a/recipes/linux/linux-ti-staging_3.12.bbappend
+++ b/recipes/linux/linux-ti-staging_3.12.bbappend
@@ -20,4 +20,9 @@
 ##
 #############################################################################
+FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+SRC_URI += "\
+    file://usb-serial.cfg \
+    "
+KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/usb-serial.cfg"
 KERNEL_DEVICETREE_b2qt = "am335x-evm.dtb am335x-evmsk.dtb am335x-bone.dtb am335x-boneblack.dtb"
diff --git a/recipes/linux/linux-toradex-fsl_git.bbappend b/recipes/linux/linux-toradex-fsl_git.bbappend
new file mode 100644
index 0000000..adee8c4
--- /dev/null
+++ b/recipes/linux/linux-toradex-fsl_git.bbappend
@@ -0,0 +1,26 @@
+#############################################################################
+##
+## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+##
+## This file is part of the Qt Enterprise Embedded Scripts of the Qt
+## framework.
+##
+## $QT_BEGIN_LICENSE$
+## Commercial License Usage Only
+## Licensees holding valid commercial Qt license agreements with Digia
+## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
+## may use this file in accordance with the terms contained in said license
+## agreement.
+##
+## For further information use the contact form at
+## http://qt.digia.com/contact-us.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+config_script () {
+        # FunctionFS for adb
+        echo "CONFIG_USB_FUNCTIONFS=m"  >> ${S}/.config
+}
diff --git a/recipes/linux/linux-yocto_3.10.bbappend b/recipes/linux/linux-yocto_3.14.bbappend
index 2645cbc..2645cbc 100644
--- a/recipes/linux/linux-yocto_3.10.bbappend
+++ b/recipes/linux/linux-yocto_3.14.bbappend
diff --git a/recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch b/recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
deleted file mode 100644
index 9f7002a..0000000
--- a/recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From 877b8ea9a79d1d51f8e6b032801731538590d39e Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Tue, 4 Jun 2013 06:04:44 -0700
-Subject: [PATCH] configure: Avoid use of AC_CHECK_FILE for cross compiling
-The AC_CHECK_FILE macro can't be used for cross compiling as it will
-result in "error: cannot check for file existence when cross compiling".
-Replace it with the AS_IF macro.
-Upstream-Status: Submitted
-http://lists.freedesktop.org/archives/mesa-dev/2013-June/040168.html
-Signed-off-by: Jonathan Liu <net147@gmail.com>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
- configure.ac | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-diff --git a/configure.ac b/configure.ac
-index 36065f1..2b4a374 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -1694,8 +1694,8 @@ if test "x$enable_gallium_llvm" = xyes; then
-                 CLANG_LIBDIR=${LLVM_LIBDIR}
-             fi
-             CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
-            AC_CHECK_FILE("$CLANG_RESOURCE_DIR/include/stddef.h",,
-                AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.]))
-+            AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"],
-+                [AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])])
-         fi
-     else
-        MESA_LLVM=0
-@@ -1912,7 +1912,7 @@ if test "x$MESA_LLVM" != x0; then
-     if test "x$with_llvm_shared_libs" = xyes; then
-         dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
-         LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
-        AC_CHECK_FILE("$LLVM_LIBDIR/lib$LLVM_SO_NAME.so", llvm_have_one_so=yes,)
-+        AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.so"], [llvm_have_one_so=yes])
- 
-         if test "x$llvm_have_one_so" = xyes; then
-             dnl LLVM was built using auto*, so there is only one shared object.
-@@ -1920,8 +1920,8 @@ if test "x$MESA_LLVM" != x0; then
-         else
-             dnl If LLVM was built with CMake, there will be one shared object per
-             dnl component.
-            AC_CHECK_FILE("$LLVM_LIBDIR/libLLVMTarget.so",,
-                    AC_MSG_ERROR([Could not find llvm shared libraries:
-+            AS_IF([test ! -f "$LLVM_LIBDIR/libLLVMTarget.so"],
-+                    [AC_MSG_ERROR([Could not find llvm shared libraries:
-        Please make sure you have built llvm with the --enable-shared option
-        and that your llvm libraries are installed in $LLVM_LIBDIR
-        If you have installed your llvm libraries to a different directory you
-@@ -1932,7 +1932,7 @@ if test "x$MESA_LLVM" != x0; then
-                --enable-opencl
-        If you do not want to build with llvm shared libraries and instead want to
-        use llvm static libraries then remove these options from your configure
-       invocation and reconfigure.]))
-+       invocation and reconfigure.])])
- 
-            dnl We don't need to update LLVM_LIBS in this case because the LLVM
-            dnl install uses a shared object for each compoenent and we have
-- 
-1.8.2.1
diff --git a/recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch b/recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch
deleted file mode 100644
index a9f2394..0000000
--- a/recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From 17d94fa96f095571651f0260378785c2a801ff16 Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Thu, 27 Jun 2013 14:49:54 +0300
-Subject: [PATCH] fix xlib dependency from pipe-loader
---
- src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c |    2 ++
- 1 file changed, 2 insertions(+)
-diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
-index c2b78c6..8c59c83 100644
--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
-+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
-@@ -31,7 +31,9 @@
- #include "util/u_dl.h"
- #include "sw/null/null_sw_winsys.h"
- #include "target-helpers/inline_sw_helper.h"
-+#ifdef X11
- #include "state_tracker/xlib_sw_winsys.h"
-+#endif
- 
- struct pipe_loader_sw_device {
-    struct pipe_loader_device base;
-- 
-1.7.10.4
diff --git a/recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch b/recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
deleted file mode 100644
index b74fddc..0000000
--- a/recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From 9915636fb8afe75ee2e8e013e4f495a4cb937afb Mon Sep 17 00:00:00 2001
-From: Brian Paul <brianp@vmware.com>
-Date: Wed, 6 Mar 2013 16:57:20 -0700
-Subject: [PATCH] llvmpipe: remove the power of two sizeof(struct cmd_block)
- assertion
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-It fails on 32-bit systems (I only tested on 64-bit).  Power of two
-size isn't required, so just remove the assertion.
-Reviewed-by: José Fonseca <jfonseca@vmware.com>
-Upstream-Status: Backport
-http://cgit.freedesktop.org/mesa/mesa/commit/?id=9915636fb8afe75ee2e8e013e4f495a4cb937afb
---
- src/gallium/drivers/llvmpipe/lp_scene.c | 7 -------
- 1 file changed, 7 deletions(-)
-diff --git a/src/gallium/drivers/llvmpipe/lp_scene.c b/src/gallium/drivers/llvmpipe/lp_scene.c
-index dd0943e..a0912eb 100644
--- a/src/gallium/drivers/llvmpipe/lp_scene.c
-+++ b/src/gallium/drivers/llvmpipe/lp_scene.c
-@@ -76,13 +76,6 @@ lp_scene_create( struct pipe_context *pipe )
-       assert(maxCommandBytes < LP_SCENE_MAX_SIZE);
-       /* We'll also need space for at least one other data block */
-       assert(maxCommandPlusData <= LP_SCENE_MAX_SIZE);
-
-      /* Ideally, the size of a cmd_block object will be a power of two
-       * in order to avoid wasting space when we allocation them from
-       * data blocks (which are power of two also).
-       */
-      assert(sizeof(struct cmd_block) ==
-             util_next_power_of_two(sizeof(struct cmd_block)));
-    }
- #endif
--
-1.8.3
diff --git a/recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch b/recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch
deleted file mode 100644
index 47ba167..0000000
--- a/recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch
+++ /dev/null
@@ -1,358 +0,0 @@
-From d52a7ec5dcdf3936bd727b854831efb90acfd2ba Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniel@fooishbar.org>
-Date: Fri, 24 May 2013 17:20:27 +0100
-Subject: [PATCH] EGL: Mutate NativeDisplayType depending on config
-If we go through ./configure without enabling X11 anywhere, then set the
-fallback types for EGL NativeDisplay and friends, rather than assuming
-X11/Xlib.
-Signed-off-by: Daniel Stone <daniel@fooishbar.org>
---
- configure.ac                 |    9 +++
- include/EGL/eglplatform.h    |  146 ------------------------------------------
- include/EGL/eglplatform.h.in |  146 ++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 155 insertions(+), 146 deletions(-)
- delete mode 100644 include/EGL/eglplatform.h
- create mode 100644 include/EGL/eglplatform.h.in
-diff --git a/configure.ac b/configure.ac
-index 4a98996..6fa77da 100644
--- a/configure.ac
-+++ b/configure.ac
-@@ -1576,12 +1576,20 @@ fi
- 
- EGL_PLATFORMS="$egl_platforms"
- 
-+if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then
-+    MESA_EGL_NO_X11_HEADERS=0
-+else
-+    MESA_EGL_NO_X11_HEADERS=1
-+fi
-+
- AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1)
- AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep 'wayland' >/dev/null 2>&1)
- AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep 'drm' >/dev/null 2>&1)
- AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep 'fbdev' >/dev/null 2>&1)
- AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep 'null' >/dev/null 2>&1)
- 
-+AC_SUBST([MESA_EGL_NO_X11_HEADERS])
-+
- AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x")
- AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x")
- 
-@@ -2053,6 +2061,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
- 
- dnl Substitute the config
- AC_CONFIG_FILES([Makefile
-+                include/EGL/eglplatform.h
-                src/Makefile
-                src/egl/Makefile
-                src/egl/drivers/Makefile
-diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
-deleted file mode 100644
-index 17fdc61..0000000
--- a/include/EGL/eglplatform.h
-+++ /dev/null
-@@ -1,146 +0,0 @@
-#ifndef __eglplatform_h_
-#define __eglplatform_h_
-
-/*
-** Copyright (c) 2007-2009 The Khronos Group Inc.
-**
-** Permission is hereby granted, free of charge, to any person obtaining a
-** copy of this software and/or associated documentation files (the
-** "Materials"), to deal in the Materials without restriction, including
-** without limitation the rights to use, copy, modify, merge, publish,
-** distribute, sublicense, and/or sell copies of the Materials, and to
-** permit persons to whom the Materials are furnished to do so, subject to
-** the following conditions:
-**
-** The above copyright notice and this permission notice shall be included
-** in all copies or substantial portions of the Materials.
-**
-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-*/
-
-/* Platform-specific types and definitions for egl.h
- * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $
- *
- * Adopters may modify khrplatform.h and this file to suit their platform.
- * You are encouraged to submit all modifications to the Khronos group so that
- * they can be included in future versions of this file.  Please submit changes
- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
- * by filing a bug against product "EGL" component "Registry".
- */
-
-#include <KHR/khrplatform.h>
-
-/* Macros used in EGL function prototype declarations.
- *
- * EGL functions should be prototyped as:
- *
- * EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
- * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
- *
- * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
- */
-
-#ifndef EGLAPI
-#define EGLAPI KHRONOS_APICALL
-#endif
-
-#ifndef EGLAPIENTRY
-#define EGLAPIENTRY  KHRONOS_APIENTRY
-#endif
-#define EGLAPIENTRYP EGLAPIENTRY*
-
-/* The types NativeDisplayType, NativeWindowType, and NativePixmapType
- * are aliases of window-system-dependent types, such as X Display * or
- * Windows Device Context. They must be defined in platform-specific
- * code below. The EGL-prefixed versions of Native*Type are the same
- * types, renamed in EGL 1.3 so all types in the API start with "EGL".
- *
- * Khronos STRONGLY RECOMMENDS that you use the default definitions
- * provided below, since these changes affect both binary and source
- * portability of applications using EGL running on different EGL
- * implementations.
- */
-
-#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN 1
-#endif
-#include <windows.h>
-
-typedef HDC     EGLNativeDisplayType;
-typedef HBITMAP EGLNativePixmapType;
-typedef HWND    EGLNativeWindowType;
-
-#elif defined(__WINSCW__) || defined(__SYMBIAN32__)  /* Symbian */
-
-typedef int   EGLNativeDisplayType;
-typedef void *EGLNativeWindowType;
-typedef void *EGLNativePixmapType;
-
-#elif defined(WL_EGL_PLATFORM)
-
-typedef struct wl_display     *EGLNativeDisplayType;
-typedef struct wl_egl_pixmap  *EGLNativePixmapType;
-typedef struct wl_egl_window  *EGLNativeWindowType;
-
-#elif defined(__GBM__)
-
-typedef struct gbm_device  *EGLNativeDisplayType;
-typedef struct gbm_bo      *EGLNativePixmapType;
-typedef void               *EGLNativeWindowType;
-
-#elif defined(ANDROID) /* Android */
-
-struct ANativeWindow;
-struct egl_native_pixmap_t;
-
-typedef struct ANativeWindow        *EGLNativeWindowType;
-typedef struct egl_native_pixmap_t  *EGLNativePixmapType;
-typedef void                        *EGLNativeDisplayType;
-
-#elif defined(__unix__)
-
-#ifdef MESA_EGL_NO_X11_HEADERS
-
-typedef void            *EGLNativeDisplayType;
-typedef khronos_uint32_t EGLNativePixmapType;
-typedef khronos_uint32_t EGLNativeWindowType;
-
-#else
-
-/* X11 (tentative)  */
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-typedef Display *EGLNativeDisplayType;
-typedef Pixmap   EGLNativePixmapType;
-typedef Window   EGLNativeWindowType;
-
-#endif /* MESA_EGL_NO_X11_HEADERS */
-
-#else
-#error "Platform not recognized"
-#endif
-
-/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
-typedef EGLNativeDisplayType NativeDisplayType;
-typedef EGLNativePixmapType  NativePixmapType;
-typedef EGLNativeWindowType  NativeWindowType;
-
-
-/* Define EGLint. This must be a signed integral type large enough to contain
- * all legal attribute names and values passed into and out of EGL, whether
- * their type is boolean, bitmask, enumerant (symbolic constant), integer,
- * handle, or other.  While in general a 32-bit integer will suffice, if
- * handles are 64 bit types, then EGLint should be defined as a signed 64-bit
- * integer type.
- */
-typedef khronos_int32_t EGLint;
-
-#endif /* __eglplatform_h */
-diff --git a/include/EGL/eglplatform.h.in b/include/EGL/eglplatform.h.in
-new file mode 100644
-index 0000000..5126c92
--- /dev/null
-+++ b/include/EGL/eglplatform.h.in
-@@ -0,0 +1,146 @@
-+#ifndef __eglplatform_h_
-+#define __eglplatform_h_
-+
-+/*
-+** Copyright (c) 2007-2009 The Khronos Group Inc.
-+**
-+** Permission is hereby granted, free of charge, to any person obtaining a
-+** copy of this software and/or associated documentation files (the
-+** "Materials"), to deal in the Materials without restriction, including
-+** without limitation the rights to use, copy, modify, merge, publish,
-+** distribute, sublicense, and/or sell copies of the Materials, and to
-+** permit persons to whom the Materials are furnished to do so, subject to
-+** the following conditions:
-+**
-+** The above copyright notice and this permission notice shall be included
-+** in all copies or substantial portions of the Materials.
-+**
-+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
-+*/
-+
-+/* Platform-specific types and definitions for egl.h
-+ * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $
-+ *
-+ * Adopters may modify khrplatform.h and this file to suit their platform.
-+ * You are encouraged to submit all modifications to the Khronos group so that
-+ * they can be included in future versions of this file.  Please submit changes
-+ * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
-+ * by filing a bug against product "EGL" component "Registry".
-+ */
-+
-+#include <KHR/khrplatform.h>
-+
-+/* Macros used in EGL function prototype declarations.
-+ *
-+ * EGL functions should be prototyped as:
-+ *
-+ * EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
-+ * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
-+ *
-+ * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
-+ */
-+
-+#ifndef EGLAPI
-+#define EGLAPI KHRONOS_APICALL
-+#endif
-+
-+#ifndef EGLAPIENTRY
-+#define EGLAPIENTRY  KHRONOS_APIENTRY
-+#endif
-+#define EGLAPIENTRYP EGLAPIENTRY*
-+
-+/* The types NativeDisplayType, NativeWindowType, and NativePixmapType
-+ * are aliases of window-system-dependent types, such as X Display * or
-+ * Windows Device Context. They must be defined in platform-specific
-+ * code below. The EGL-prefixed versions of Native*Type are the same
-+ * types, renamed in EGL 1.3 so all types in the API start with "EGL".
-+ *
-+ * Khronos STRONGLY RECOMMENDS that you use the default definitions
-+ * provided below, since these changes affect both binary and source
-+ * portability of applications using EGL running on different EGL
-+ * implementations.
-+ */
-+
-+#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
-+#ifndef WIN32_LEAN_AND_MEAN
-+#define WIN32_LEAN_AND_MEAN 1
-+#endif
-+#include <windows.h>
-+
-+typedef HDC     EGLNativeDisplayType;
-+typedef HBITMAP EGLNativePixmapType;
-+typedef HWND    EGLNativeWindowType;
-+
-+#elif defined(__WINSCW__) || defined(__SYMBIAN32__)  /* Symbian */
-+
-+typedef int   EGLNativeDisplayType;
-+typedef void *EGLNativeWindowType;
-+typedef void *EGLNativePixmapType;
-+
-+#elif defined(WL_EGL_PLATFORM)
-+
-+typedef struct wl_display     *EGLNativeDisplayType;
-+typedef struct wl_egl_pixmap  *EGLNativePixmapType;
-+typedef struct wl_egl_window  *EGLNativeWindowType;
-+
-+#elif defined(__GBM__)
-+
-+typedef struct gbm_device  *EGLNativeDisplayType;
-+typedef struct gbm_bo      *EGLNativePixmapType;
-+typedef void               *EGLNativeWindowType;
-+
-+#elif defined(ANDROID) /* Android */
-+
-+struct ANativeWindow;
-+struct egl_native_pixmap_t;
-+
-+typedef struct ANativeWindow        *EGLNativeWindowType;
-+typedef struct egl_native_pixmap_t  *EGLNativePixmapType;
-+typedef void                        *EGLNativeDisplayType;
-+
-+#elif defined(__unix__)
-+
-+#if @MESA_EGL_NO_X11_HEADERS@
-+
-+typedef void            *EGLNativeDisplayType;
-+typedef khronos_uint32_t EGLNativePixmapType;
-+typedef khronos_uint32_t EGLNativeWindowType;
-+
-+#else
-+
-+/* X11 (tentative)  */
-+#include <X11/Xlib.h>
-+#include <X11/Xutil.h>
-+
-+typedef Display *EGLNativeDisplayType;
-+typedef Pixmap   EGLNativePixmapType;
-+typedef Window   EGLNativeWindowType;
-+
-+#endif /* MESA_EGL_NO_X11_HEADERS */
-+
-+#else
-+#error "Platform not recognized"
-+#endif
-+
-+/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
-+typedef EGLNativeDisplayType NativeDisplayType;
-+typedef EGLNativePixmapType  NativePixmapType;
-+typedef EGLNativeWindowType  NativeWindowType;
-+
-+
-+/* Define EGLint. This must be a signed integral type large enough to contain
-+ * all legal attribute names and values passed into and out of EGL, whether
-+ * their type is boolean, bitmask, enumerant (symbolic constant), integer,
-+ * handle, or other.  While in general a 32-bit integer will suffice, if
-+ * handles are 64 bit types, then EGLint should be defined as a signed 64-bit
-+ * integer type.
-+ */
-+typedef khronos_int32_t EGLint;
-+
-+#endif /* __eglplatform_h */
-- 
-1.7.10.4
diff --git a/recipes/mesa/mesa/fix-glsl-cross.patch b/recipes/mesa/mesa/fix-glsl-cross.patch
deleted file mode 100644
index 34226ea..0000000
--- a/recipes/mesa/mesa/fix-glsl-cross.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-The target libtool is used when building host binaries, which predictably
-doesn't work.
-Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=44618)
-Signed-off-by: Jonathan Liu <net147@gmail.com>
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am
-index e11a17f..8ebe0a2 100644
--- a/src/glsl/builtin_compiler/Makefile.am
-+++ b/src/glsl/builtin_compiler/Makefile.am
-@@ -64,6 +64,8 @@ AM_CXXFLAGS = $(AM_CFLAGS)
- include ../Makefile.sources
- 
- noinst_PROGRAMS = builtin_compiler
-+
-+if !CROSS_COMPILING
- noinst_LTLIBRARIES = libglslcore.la libglcpp.la
- 
- libglcpp_la_SOURCES =                                  \
-@@ -73,6 +75,7 @@ libglcpp_la_SOURCES =                                 \
- libglslcore_la_SOURCES =                               \
-        $(BUILTIN_COMPILER_GENERATED_CXX_FILES)         \
-        $(LIBGLSL_FILES)
-+endif
- 
- builtin_compiler_SOURCES = \
-        $(top_srcdir)/src/mesa/main/hash_table.c        \
-@@ -81,4 +84,14 @@ builtin_compiler_SOURCES = \
-        $(top_srcdir)/src/mesa/program/symbol_table.c   \
-        $(BUILTIN_COMPILER_CXX_FILES)                   \
-        $(GLSL_COMPILER_CXX_FILES)
-+
-+if CROSS_COMPILING
-+builtin_compiler_SOURCES += \
-+       $(LIBGLCPP_GENERATED_FILES) \
-+       $(LIBGLCPP_FILES) \
-+       $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
-+       $(LIBGLSL_FILES)
-+builtin_compiler_CPPFLAGS = $(AM_CPPFLAGS)
-+else
- builtin_compiler_LDADD = libglslcore.la libglcpp.la
-+endif
diff --git a/recipes/mesa/mesa/glapi.patch b/recipes/mesa/mesa/glapi.patch
deleted file mode 100644
index 74cac0b..0000000
--- a/recipes/mesa/mesa/glapi.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 5ea43e65498505fc5d11d63668cda165146eb55b Mon Sep 17 00:00:00 2001
-From: Andreas Boll <andreas.boll.dev@gmail.com>
-Date: Thu, 30 May 2013 11:32:43 +0000
-Subject: glapi: Add some missing static_dispatch="false" annotations to es_EXT.xml
-This fixes the following build errors on powerpc:
-  CC     glapi_dispatch.lo
-  In file included from glapi_dispatch.c:90:0:
-  ../../../../../src/mapi/glapi/glapitemp.h:1640:1: error: no previous
-  prototype for 'glReadBufferNV' [-Werror=missing-prototypes]
-  ../../../../../src/mapi/glapi/glapitemp.h:4198:1: error: no previous
-  prototype for 'glDrawBuffersNV' [-Werror=missing-prototypes]
-  ../../../../../src/mapi/glapi/glapitemp.h:6377:1: error: no previous
-  prototype for 'glFlushMappedBufferRangeEXT'
-  [-Werror=missing-prototypes]
-  ../../../../../src/mapi/glapi/glapitemp.h:6389:1: error: no previous
-  prototype for 'glMapBufferRangeEXT' [-Werror=missing-prototypes]
-  ../../../../../src/mapi/glapi/glapitemp.h:6401:1: error: no previous
-  prototype for 'glBindVertexArrayOES' [-Werror=missing-prototypes]
-  ../../../../../src/mapi/glapi/glapitemp.h:6413:1: error: no previous
-  prototype for 'glDeleteVertexArraysOES' [-Werror=missing-prototypes]
-  ../../../../../src/mapi/glapi/glapitemp.h:6433:1: error: no previous
-  prototype for 'glGenVertexArraysOES' [-Werror=missing-prototypes]
-  ../../../../../src/mapi/glapi/glapitemp.h:6445:1: error: no previous
-  prototype for 'glIsVertexArrayOES' [-Werror=missing-prototypes]
-NOTE: This is a candidate for the 9.0 and 9.1 branches.
-Reviewed-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
-Reviewed-by: Brian Paul <brianp@vmware.com>
---
-diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
-index ff378ac..f412333 100644
--- a/src/mapi/glapi/gen/es_EXT.xml
-+++ b/src/mapi/glapi/gen/es_EXT.xml
-@@ -689,22 +689,25 @@
- 
- <!-- 71. GL_OES_vertex_array_object -->
- <category name="GL_OES_vertex_array_object" number="71">
-    <function name="BindVertexArrayOES" alias="BindVertexArray" es2="2.0">
-+    <function name="BindVertexArrayOES" alias="BindVertexArray"
-+              static_dispatch="false" es2="2.0">
-         <param name="array" type="GLuint"/>
-     </function>
- 
-     <function name="DeleteVertexArraysOES" alias="DeleteVertexArrays"
-              es2="2.0">
-+              static_dispatch="false" es2="2.0">
-         <param name="n" type="GLsizei"/>
-         <param name="arrays" type="const GLuint *" count="n"/>
-     </function>
- 
-    <function name="GenVertexArraysOES" alias="GenVertexArrays" es2="2.0">
-+    <function name="GenVertexArraysOES" alias="GenVertexArrays"
-+              static_dispatch="false" es2="2.0">
-         <param name="n" type="GLsizei"/>
-         <param name="arrays" type="GLuint *" output="true" count="n"/>
-     </function>
- 
-    <function name="IsVertexArrayOES" alias="IsVertexArray" es2="2.0">
-+    <function name="IsVertexArrayOES" alias="IsVertexArray"
-+              static_dispatch="false" es2="2.0">
-         <param name="array" type="GLuint"/>
-         <return type="GLboolean"/>
-     </function>
-@@ -779,7 +782,8 @@
-         <size name="Get" mode="get"/>
-     </enum>
- 
-    <function name="DrawBuffersNV" alias="DrawBuffers" es2="2.0">
-+    <function name="DrawBuffersNV" alias="DrawBuffers"
-+              static_dispatch="false" es2="2.0">
-         <param name="n" type="GLsizei" counter="true"/>
-         <param name="bufs" type="const GLenum *" count="n"/>
-     </function>
-@@ -787,7 +791,8 @@
- 
- <!-- 93. GL_NV_read_buffer -->
- <category name="GL_NV_read_buffer">
-    <function name="ReadBufferNV" alias="ReadBuffer" es2="2.0">
-+    <function name="ReadBufferNV" alias="ReadBuffer"
-+              static_dispatch="false" es2="2.0">
-         <param name="mode" type="GLenum"/>
-     </function>
- </category>
-@@ -815,8 +820,8 @@
-     <enum name="MAP_FLUSH_EXPLICIT_BIT_EXT"               value="0x0010"/>
-     <enum name="MAP_UNSYNCHRONIZED_BIT_EXT"               value="0x0020"/>
- 
-    <function name="MapBufferRangeEXT" alias="MapBufferRange" es1="1.0"
-              es2="2.0">
-+    <function name="MapBufferRangeEXT" alias="MapBufferRange"
-+              static_dispatch="false" es1="1.0" es2="2.0">
-         <param name="target" type="GLenum"/>
-         <param name="offset" type="GLintptr"/>
-         <param name="size" type="GLsizeiptr"/>
-@@ -825,7 +830,7 @@
-     </function>
- 
-     <function name="FlushMappedBufferRangeEXT" alias="FlushMappedBufferRange"
-              es1="1.0" es2="2.0">
-+              static_dispatch="false" es1="1.0" es2="2.0">
-         <param name="target" type="GLenum"/>
-         <param name="offset" type="GLintptr"/>
-         <param name="length" type="GLsizeiptr"/>
--
-cgit v0.9.0.2-2-gbebe
diff --git a/recipes/mesa/mesa_9.1.6.bbappend b/recipes/mesa/mesa_9.2.5.bbappend
index 627f70b..627f70b 100644
--- a/recipes/mesa/mesa_9.1.6.bbappend
+++ b/recipes/mesa/mesa_9.2.5.bbappend
diff --git a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend b/recipes/openssl/openssl_1.0.1g.bbappend
index 73a2408..1ba0a2e 100644
--- a/recipes/libgles/libgles-omap3_4.05.00.03.bbappend
+++ b/recipes/openssl/openssl_1.0.1g.bbappend
@@ -20,20 +20,9 @@
 ##
 #############################################################################
-BINLOCATION_omap3  = "${S}/gfx_rel_es5.x"
+PACKAGECONFIG += "perl"
-TOOLCHAIN_PATH = "${STAGING_DIR_TARGET}"
+do_install_append () {
+        rmdir ${D}${libdir}/ssl/certs
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+        ln -s ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/
-SRC_URI += " file://0001-Add-GLchar-typedef.patch"
-LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
-do_install_append() {
-        echo "ParamBufferSize=33554432" >> ${D}${sysconfdir}/powervr.ini
-}
-pkg_postinst_${PN}_append() {
-ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' )
-echo ${ESREV} > $D${sysconfdir}/powervr-esrev
 }
diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
index 9c92438..281204c 100644
--- a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
+++ b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb
@@ -30,6 +30,10 @@ require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
 RDEPENDS_${PN} = "\
    python-nativesdk \
    python-subprocess-nativesdk \
+    python-compiler-nativesdk \
+    python-multiprocessing-nativesdk \
+    python-shell-nativesdk \
+    python-threading-nativesdk \
    "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
index 0942a7e..bcc7868 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-base.bb
@@ -32,6 +32,7 @@ RDEPENDS_${PN} = "\
        psplash \
        openssh-sftp-server \
        openssl \
+        openssl-misc \
        libpng \
        jpeg \
        tiff \
@@ -45,5 +46,6 @@ RDEPENDS_${PN} = "\
        alsa-utils-amixer \
        hunspell \
        ca-certificates \
+        linux-firmware \
        ${MACHINE_EXTRA_INSTALL} \
        "
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
index f6a8a54..5a076c1 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb
@@ -35,6 +35,7 @@ RDEPENDS_${PN} = "\
        gst-plugins-good-id3demux \
        gst-plugins-good-auparse \
        gst-plugins-good-isomp4 \
+        gst-plugins-good-icydemux \
        gst-plugins-ugly-rmdemux \
        gst-plugins-ugly-asf \
        gst-plugins-ugly-a52dec \
diff --git a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
index 61ca211..3320efe 100644
--- a/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
+++ b/recipes/packagegroup/packagegroup-b2qt-embedded-tools.bb
@@ -30,4 +30,6 @@ RDEPENDS_${PN} = "\
        ldd \
        binutils \
        binutils-symlinks \
+        i2c-tools \
+        u-boot-fw-utils \
        "
diff --git a/recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-kernel-args.patch b/recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-kernel-args.patch
deleted file mode 100644
index 1dea7f5..0000000
--- a/recipes/u-boot/u-boot-beagleboard/0001-beagle-change-default-kernel-args.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 9ac6875931f5f9d073ca31cd6e1fb7636afb76bc Mon Sep 17 00:00:00 2001
-From: Samuli Piippo <samuli.piippo@digia.com>
-Date: Thu, 23 May 2013 14:37:10 +0300
-Subject: [PATCH] beagle: change default kernel args
- default resolution to 800x600
- increase VRAM for fb0
- disable console blank
- disable console cursor blinking
- use extrabootargs
---
- include/configs/omap3_beagle.h |   20 ++++++++++++++++----
- 1 file changed, 16 insertions(+), 4 deletions(-)
-diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
-index 1cc46dc..945e15e 100644
--- a/include/configs/omap3_beagle.h
-+++ b/include/configs/omap3_beagle.h
-@@ -224,7 +224,7 @@
-        "optargs=\0" \
-        "camera=none\0" \
-        "vram=12M\0" \
-       "dvimode=640x480MR-16@60\0" \
-+       "dvimode=800x600MR-16@60\0" \
-        "defaultdisplay=dvi\0" \
-        "mmcdev=0\0" \
-        "mmcroot=/dev/mmcblk0p2 ro\0" \
-@@ -240,20 +240,28 @@
-                "buddy2=${buddy2} "\
-                "camera=${camera} "\
-                "vram=${vram} " \
-+               "omapfb.vram=0:${vram} " \
-                "omapfb.mode=dvi:${dvimode} " \
-                "omapdss.def_disp=${defaultdisplay} " \
-                "root=${mmcroot} " \
-               "rootfstype=${mmcrootfstype}\0" \
-+               "rootfstype=${mmcrootfstype} " \
-+               "consoleblank=0 " \
-+               "vt.global_cursor_default=0 " \
-+               "${extrabootargs}\0" \
-        "nandargs=setenv bootargs console=${console} " \
-                "${optargs} " \
-                "mpurate=${mpurate} " \
-                "buddy=${buddy} "\
-                "camera=${camera} "\
-                "vram=${vram} " \
-+               "omapfb.vram=0:${vram} " \
-                "omapfb.mode=dvi:${dvimode} " \
-                "omapdss.def_disp=${defaultdisplay} " \
-                "root=${nandroot} " \
-               "rootfstype=${nandrootfstype}\0" \
-+               "rootfstype=${nandrootfstype} " \
-+               "consoleblank=0 " \
-+               "vt.global_cursor_default=0 " \
-+               "${extrabootargs}\0" \
-        "bootenv=uEnv.txt\0" \
-        "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
-        "importbootenv=echo Importing environment from mmc ...; " \
-@@ -263,10 +271,14 @@
-                "mpurate=${mpurate} " \
-                "buddy=${buddy} "\
-                "vram=${vram} " \
-+               "omapfb.vram=0:${vram} " \
-                "omapfb.mode=dvi:${dvimode} " \
-                "omapdss.def_disp=${defaultdisplay} " \
-                "root=${ramroot} " \
-               "rootfstype=${ramrootfstype}\0" \
-+               "rootfstype=${ramrootfstype} " \
-+               "consoleblank=0 " \
-+               "vt.global_cursor_default=0 " \
-+               "${extrabootargs}\0" \
-        "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
-        "loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
-        "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \
-- 
-1.7.10.4
diff --git a/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch b/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
new file mode 100644
index 0000000..59a4505
--- /dev/null
+++ b/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
@@ -0,0 +1,133 @@
+From 2288d6475ba3ab9a7fb3cd4aa0aa3a7c60dbfac6 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo <samuli.piippo@digia.com>
+Date: Fri, 9 May 2014 10:23:50 +0300
+Subject: [PATCH] Updated kernel arguments for sabre sd
+- Enable I2C
+- detect if hdmi is used and change video arguments accordingly
+- disable blanking and cursor blinking
+---
+ board/freescale/mx6sabresd/mx6sabresd.c | 23 +++++++++++++++++++++++
+ include/configs/mx6sabre_common.h       | 21 +++++++++++++++++++++
+ 2 files changed, 44 insertions(+)
+diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
+index 12d8c56..303b774 100644
+--- a/board/freescale/mx6sabresd/mx6sabresd.c
+++ b/board/freescale/mx6sabresd/mx6sabresd.c
+@@ -12,6 +12,7 @@
+ #include <asm/arch/mx6-pins.h>
+ #include <asm/errno.h>
+ #include <asm/gpio.h>
+#include <asm/imx-common/mxc_i2c.h>
+ #include <asm/imx-common/iomux-v3.h>
+ #include <asm/imx-common/boot_mode.h>
+ #include <mmc.h>
+@@ -24,6 +25,7 @@
+ #include <ipu_pixfmt.h>
+ #include <asm/io.h>
+ #include <asm/arch/sys_proto.h>
+#include <i2c.h>
+ DECLARE_GLOBAL_DATA_PTR;
+ 
+ #define UART_PAD_CTRL  (PAD_CTL_PUS_100K_UP |                  \
+@@ -40,6 +42,12 @@ DECLARE_GLOBAL_DATA_PTR;
+ #define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \
+                      PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
+ 
+#define I2C_PAD_CTRL  (PAD_CTL_PUS_100K_UP |                   \
+       PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS |   \
+       PAD_CTL_ODE | PAD_CTL_SRE_FAST)
+
+#define I2C_PAD MUX_PAD_CTRL(I2C_PAD_CTRL)
+
+ int dram_init(void)
+ {
+        gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
+@@ -130,6 +138,19 @@ iomux_v3_cfg_t const ecspi1_pads[] = {
+        MX6_PAD_KEY_ROW1__GPIO4_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL),
+ };
+ 
+static struct i2c_pads_info i2c_pad_info1 = {
+       .scl = {
+               .i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | I2C_PAD,
+               .gpio_mode = MX6_PAD_KEY_COL3__GPIO4_IO12 | I2C_PAD,
+               .gp = IMX_GPIO_NR(4, 12)
+       },
+       .sda = {
+               .i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | I2C_PAD,
+               .gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | I2C_PAD,
+               .gp = IMX_GPIO_NR(4, 13)
+       }
+};
+
+ static void setup_spi(void)
+ {
+        imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads));
+@@ -477,6 +498,8 @@ int board_init(void)
+        setup_spi();
+ #endif
+ 
+       setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
+
+        return 0;
+ }
+ 
+diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
+index 5ee7fa5..b83bf74 100644
+--- a/include/configs/mx6sabre_common.h
+++ b/include/configs/mx6sabre_common.h
+@@ -85,6 +85,13 @@
+ /* Command definition */
+ #include <config_cmd_default.h>
+ 
+/* I2C Configs */
+#define CONFIG_CMD_I2C
+#define CONFIG_SYS_I2C
+#define CONFIG_SYS_I2C_MXC
+#define CONFIG_SYS_I2C_SPEED           100000
+#define CONFIG_I2C_EDID
+
+ #define CONFIG_CMD_BMODE
+ #define CONFIG_CMD_BOOTZ
+ #define CONFIG_CMD_SETEXPR
+@@ -117,6 +124,15 @@
+ #define EMMC_ENV ""
+ #endif
+ 
+#define VIDEOARGS \
+       "videoargs=" \
+       "i2c dev 1 ; " \
+       "if i2c probe 0x50 ; then " \
+               "setenv video mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 ; " \
+       "else " \
+               "setenv video mxcfb0:dev=ldb,LDB-XGA,if=RGB666 ldb=sin1 ; " \
+       "fi\0"
+
+ #define CONFIG_EXTRA_ENV_SETTINGS \
+        "script=boot.scr\0" \
+        "uimage=uImage\0" \
+@@ -144,7 +160,11 @@
+                        "fi; "  \
+                "fi\0" \
+        EMMC_ENV          \
+       VIDEOARGS \
+        "mmcargs=setenv bootargs console=${console},${baudrate} " \
+               "video=${video} "\
+               "consoleblank=0 " \
+               "vt.global_cursor_default=0 " \
+                "root=${mmcroot}\0" \
+        "loadbootscript=" \
+                "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
+@@ -153,6 +173,7 @@
+        "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
+        "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
+        "mmcboot=echo Booting from mmc ...; " \
+               "run videoargs; " \
+                "run mmcargs; " \
+                "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
+                        "if run loadfdt; then " \
+-- 
+1.8.3.2
diff --git a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend b/recipes/u-boot/u-boot-fslc_2014.01.bbappend
index f6fbde1..b4ff56f 100644
--- a/recipes/u-boot/u-boot-beagleboard_2011.09.bbappend
+++ b/recipes/u-boot/u-boot-fslc_2014.01.bbappend
@@ -20,7 +20,7 @@
 ##
 #############################################################################
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
+FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
 SRC_URI += " \
-        file://0001-beagle-change-default-kernel-args.patch \
+        file://0001-Updated-kernel-arguments-for-sabre-sd.patch \
        "
diff --git a/recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend b/recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend
index 9a200b2..9a200b2 100644
--- a/recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend
+++ b/recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend
author	Samuli Piippo <samuli.piippo@digia.com>	2014-09-02 12:13:36 +0300
committer	Samuli Piippo <samuli.piippo@digia.com>	2014-09-02 12:15:45 +0300
commit	74d228d7fd5b6c533852a6856b01d4d21f80216b (patch)
tree	d51284ba079a53c824cdd3bf6a434dda2fa61584
parent	fa7c1238796da94fff794d865e501622301a5d85 (diff)
parent	a1af90f3e900e5fd93fdedf74bafd2269f92ec45 (diff)
download	meta-boot2qt-74d228d7fd5b6c533852a6856b01d4d21f80216b.tar.gz