diff options
| author | Kalle Viironen <kalle.viironen@digia.com> | 2014-05-26 13:54:08 +0300 |
|---|---|---|
| committer | Kalle Viironen <kalle.viironen@digia.com> | 2014-05-26 13:54:14 +0300 |
| commit | 24cb0946765e299d4553ab5fa2a37afcac1ea242 (patch) | |
| tree | 059b678bd52fb3c49841f585054517673ce4e288 | |
| parent | bfb97bc3cc517c42647f5f8b1308bb7b1f4c76f1 (diff) | |
| parent | 2ab3d7fc456ece32ab23e1909ea0d865955f29d9 (diff) | |
Merge branch 'stable' into releaseQtEE_v3.0.0
* stable: (25 commits)
blacklist evbug kernel module
ca-certificates: enable c_rehash in update-ca-certificates
openssl: make sure c_rehash is included in the image
emulator: include mesa back to the image
mesa: include gles development files in sdk
sabre: updated kernel arguments
imx6: kernel update for nitrogen6x
mesa: remove from emulator image
Include support for Freescale SABRE SD (iMX6Q)
sabresd: add function fs support to sabresd kernel
gstreamer: include icydemuxer needed for internet radios
libsdl: disable dependency to libglu
linux-yocto: upstream version has changed
wpa-supplicant: upstream version has changed
gpu-viv-bin-mx6q: upstream version has changed
busybox: upstream version has changed
nitrogen6x: use preferred version for kernel
libgles: inhibit QA error for files already being stripped
Update used branch to daisy
Move to version 1.6
...
Change-Id: Ie81ed17be1096dbb37b1e5f023aa4eba846ca0fe
34 files changed, 352 insertions, 665 deletions
@@ -29,26 +29,26 @@ OpenEmbedded and Yocto. This layer depends on: URI: git://git.openembedded.org/openembedded-core -branch: dora +branch: daisy revision: HEAD URI: git://git.openembedded.org/meta-openembedded layer: meta-oe -branch: dora +branch: daisy revision: HEAD URI: git://git.yoctoproject.org/meta-ti -branch: dora +branch: daisy revision: HEAD URI: git://git.yoctoproject.org/meta-fsl-arm -branch: dora +branch: daisy revision: HEAD -URI: git://github.com/Freescale/meta-fsl-arm-extra.git -branch: dora +URI: git://github.com/Freescale/meta-fsl-arm-extra +branch: daisy revision: HEAD URI: git://git.yoctoproject.org/meta-raspberrypi -branch: dora +branch: daisy revision: HEAD diff --git a/b2qt-init-build-env b/b2qt-init-build-env index 8c4da01b..952e4a3f 100755 --- a/b2qt-init-build-env +++ b/b2qt-init-build-env @@ -34,27 +34,27 @@ DIR=$(readlink -f $(dirname $0)) BUILDDIR=$(readlink -f $1) if [ ! -d ${BUILDDIR}/poky ]; then - git clone git://git.yoctoproject.org/poky ${BUILDDIR}/poky -b dora + git clone git://git.yoctoproject.org/poky ${BUILDDIR}/poky -b daisy fi if [ ! -d ${BUILDDIR}/poky/meta-openembedded ]; then - git clone git://git.openembedded.org/meta-openembedded ${BUILDDIR}/poky/meta-openembedded -b dora + git clone git://git.openembedded.org/meta-openembedded ${BUILDDIR}/poky/meta-openembedded -b daisy fi if [ ! -d ${BUILDDIR}/poky/meta-ti ]; then - git clone git://git.yoctoproject.org/meta-ti ${BUILDDIR}/poky/meta-ti -b dora + git clone git://git.yoctoproject.org/meta-ti ${BUILDDIR}/poky/meta-ti -b daisy fi if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm ]; then - git clone git://git.yoctoproject.org/meta-fsl-arm ${BUILDDIR}/poky/meta-fsl-arm -b dora + git clone git://git.yoctoproject.org/meta-fsl-arm ${BUILDDIR}/poky/meta-fsl-arm -b daisy fi if [ ! -d ${BUILDDIR}/poky/meta-fsl-arm-extra ]; then - git clone git://github.com/Freescale/meta-fsl-arm-extra.git ${BUILDDIR}/poky/meta-fsl-arm-extra -b dora + git clone git://github.com/Freescale/meta-fsl-arm-extra.git ${BUILDDIR}/poky/meta-fsl-arm-extra -b daisy fi if [ ! -d ${BUILDDIR}/poky/meta-raspberrypi ]; then - git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b dora + git clone git://git.yoctoproject.org/meta-raspberrypi ${BUILDDIR}/poky/meta-raspberrypi -b daisy fi if [ ! -d ${BUILDDIR}/poky/meta-b2qt ]; then diff --git a/classes/bootfs-image.bbclass b/classes/bootfs-image.bbclass index 5292965b..cbb6c4c7 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/distro/b2qt.conf b/conf/distro/b2qt.conf index 66ddcf1b..8819c93b 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/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf new file mode 100644 index 00000000..1298ee44 --- /dev/null +++ b/conf/distro/include/imx6qsabresd.conf @@ -0,0 +1,49 @@ +############################################################################# +## +## 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" + +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 2a640262..8066936d 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,8 @@ BOOTFS_DEPENDS = "u-boot:do_deploy virtual/kernel:do_deploy u-boot-script-bounda EXTRA_IMAGEDEPENDS += "u-boot-script-boundary" +PREFERRED_VERSION_linux-boundary = "3.10.17" + MACHINE_EXTRA_INSTALL = "\ libgal-mx6 \ libegl-mx6 \ diff --git a/recipes/base-files/base-files/blacklist.conf b/recipes/base-files/base-files/blacklist.conf new file mode 100644 index 00000000..a8b88854 --- /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 4b8908a3..6e083e2a 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 - echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname + ln -s /home/root ${D}/root + 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 fe5d5eaa..fe5d5eaa 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 00000000..0964c850 --- /dev/null +++ b/recipes/ca-certificates/ca-certificates_20130610.bbappend @@ -0,0 +1,23 @@ +############################################################################# +## +## 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" 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 bed361ef..bed361ef 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/libgles/libgles-omap3_4.09.00.01.bbappend b/recipes/libgles/libgles-omap3_4.09.00.01.bbappend index 6a37c89b..0646e730 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.00.00.01.bbappend b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend index 5446ffad..f0b57548 100644 --- a/recipes/libgles/libgles-omap3_5.00.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_5.00.00.01.bbappend @@ -32,7 +32,7 @@ do_install_append() { } # Inhibit warnings about files being stripped. -INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +INHIBIT_PACKAGE_SPLIT = "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.00.01.bbappend index 82bfdb23..9a90577e 100644 --- a/recipes/libgles/libgles-omap3_5.01.00.01.bbappend +++ b/recipes/libgles/libgles-omap3_5.01.00.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 36424fd0..3a08249c 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 313111b3..fd7dd316 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/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-boundary_3.10.17.bbappend index 610dc4d1..dd9420ed 100644 --- a/recipes/linux/linux-boundary_3.0.35.bbappend +++ b/recipes/linux/linux-boundary_3.10.17.bbappend @@ -28,4 +28,10 @@ do_configure_prepend() { # 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-imx_3.10.17.bbappend b/recipes/linux/linux-imx_3.10.17.bbappend new file mode 100644 index 00000000..082c4318 --- /dev/null +++ b/recipes/linux/linux-imx_3.10.17.bbappend @@ -0,0 +1,32 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +do_configure_prepend() { + # 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 4c2cb591..9e195dcd 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-yocto_3.10.bbappend b/recipes/linux/linux-yocto_3.14.bbappend index 2645cbc5..2645cbc5 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 9f7002a0..00000000 --- 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 a9f23945..00000000 --- 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 b74fddc5..00000000 --- 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 47ba1671..00000000 --- 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 34226ea5..00000000 --- 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 74cac0b6..00000000 --- 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 627f70b3..627f70b3 100644 --- a/recipes/mesa/mesa_9.1.6.bbappend +++ b/recipes/mesa/mesa_9.2.5.bbappend diff --git a/recipes/openssl/openssl_1.0.1g.bbappend b/recipes/openssl/openssl_1.0.1g.bbappend new file mode 100644 index 00000000..1ba0a2ec --- /dev/null +++ b/recipes/openssl/openssl_1.0.1g.bbappend @@ -0,0 +1,28 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +PACKAGECONFIG += "perl" + +do_install_append () { + rmdir ${D}${libdir}/ssl/certs + ln -s ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/ +} diff --git a/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb b/recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb index 9c92438a..281204cb 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 0942a7e7..bcc78685 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 f6a8a54f..5a076c16 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/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 00000000..59a45056 --- /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-fslc_2014.01.bbappend b/recipes/u-boot/u-boot-fslc_2014.01.bbappend new file mode 100644 index 00000000..b4ff56f5 --- /dev/null +++ b/recipes/u-boot/u-boot-fslc_2014.01.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$ +## +############################################################################# + +FILESEXTRAPATHS_append := "${THISDIR}/${PN}:" +SRC_URI += " \ + 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 9a200b20..9a200b20 100644 --- a/recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend +++ b/recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend |