summaryrefslogtreecommitdiffstats
path: root/recipes
diff options
context:
space:
mode:
Diffstat (limited to 'recipes')
-rw-r--r--recipes/base-files/base-files/blacklist.conf1
-rw-r--r--recipes/base-files/base-files_3.0.14.bbappend12
-rw-r--r--recipes/busybox/busybox_1.22.1.bbappend (renamed from recipes/busybox/busybox_1.21.1.bbappend)0
-rw-r--r--recipes/ca-certificates/ca-certificates_20130610.bbappend23
-rw-r--r--recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.17-1.0.0-hfp.bbappend (renamed from recipes/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend)0
-rw-r--r--recipes/libgles/libgles-omap3_4.09.00.01.bbappend2
-rw-r--r--recipes/libgles/libgles-omap3_5.00.00.01.bbappend2
-rw-r--r--recipes/libgles/libgles-omap3_5.01.00.01.bbappend2
-rw-r--r--recipes/libsdl/libsdl_1.2.15.bbappend2
-rw-r--r--recipes/linux/linux-am335x-psp_3.2.bbappend6
-rw-r--r--recipes/linux/linux-boundary_3.10.17.bbappend (renamed from recipes/linux/linux-boundary_3.0.35.bbappend)6
-rw-r--r--recipes/linux/linux-imx_3.10.17.bbappend32
-rw-r--r--recipes/linux/linux-mainline_3.2.bbappend6
-rw-r--r--recipes/linux/linux-yocto_3.14.bbappend (renamed from recipes/linux/linux-yocto_3.10.bbappend)0
-rw-r--r--recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch65
-rw-r--r--recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch26
-rw-r--r--recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch42
-rw-r--r--recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch358
-rw-r--r--recipes/mesa/mesa/fix-glsl-cross.patch43
-rw-r--r--recipes/mesa/mesa/glapi.patch109
-rw-r--r--recipes/mesa/mesa_9.2.5.bbappend (renamed from recipes/mesa/mesa_9.1.6.bbappend)0
-rw-r--r--recipes/openssl/openssl_1.0.1g.bbappend28
-rw-r--r--recipes/packagegroup/nativesdk-packagegroup-b2qt-embedded-toolchain-host.bb4
-rw-r--r--recipes/packagegroup/packagegroup-b2qt-embedded-base.bb2
-rw-r--r--recipes/packagegroup/packagegroup-b2qt-embedded-gstreamer.bb1
-rw-r--r--recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch133
-rw-r--r--recipes/u-boot/u-boot-fslc_2014.01.bbappend26
-rw-r--r--recipes/wpa-supplicant/wpa-supplicant_2.1.bbappend (renamed from recipes/wpa-supplicant/wpa-supplicant_2.0.bbappend)0
28 files changed, 282 insertions, 649 deletions
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 @@
20## 20##
21############################################################################# 21#############################################################################
22 22
23FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
24SRC_URI += "\
25 file://blacklist.conf \
26 "
27
23do_install_append() { 28do_install_append() {
24 ln -s /home/root ${D}/root 29 ln -s /home/root ${D}/root
25 echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname 30 echo ${MACHINE_HOSTNAME} > ${D}${sysconfdir}/hostname
31
32 install -m 0755 -d ${D}${sysconfdir}/modprobe.d
33 install -m 0644 ${WORKDIR}/blacklist.conf ${D}${sysconfdir}/modprobe.d
26} 34}
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..0964c85
--- /dev/null
+++ b/recipes/ca-certificates/ca-certificates_20130610.bbappend
@@ -0,0 +1,23 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://qt.digia.com/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23SRC_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 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/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() {
29} 29}
30 30
31# Inhibit warnings about files being stripped. 31# Inhibit warnings about files being stripped.
32INHIBIT_PACKAGE_DEBUG_SPLIT = "1" 32INHIBIT_PACKAGE_STRIP = "1"
33 33
34pkg_postinst_${PN}_append() { 34pkg_postinst_${PN}_append() {
35ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' ) 35ESREV=$(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 5446ffa..f0b5754 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() {
32} 32}
33 33
34# Inhibit warnings about files being stripped. 34# Inhibit warnings about files being stripped.
35INHIBIT_PACKAGE_DEBUG_SPLIT = "1" 35INHIBIT_PACKAGE_SPLIT = "1"
36 36
37pkg_postinst_${PN}_append() { 37pkg_postinst_${PN}_append() {
38ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' ) 38ESREV=$(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 82bfdb2..9a90577 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"
28LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1" 28LIBGLESWINDOWSYSTEM = "libpvrPVR2D_FLIPWSEGL.so.1"
29 29
30# Inhibit warnings about files being stripped. 30# Inhibit warnings about files being stripped.
31INHIBIT_PACKAGE_DEBUG_SPLIT = "1" 31INHIBIT_PACKAGE_STRIP = "1"
32 32
33pkg_postinst_${PN}_append() { 33pkg_postinst_${PN}_append() {
34ESREV=$(echo ${BINLOCATION} | grep -Po '(\d+)(?!.*\d)' ) 34ESREV=$(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() {
30 30
31 echo "CONFIG_DEVTMPFS=y" >> ${S}/.config 31 echo "CONFIG_DEVTMPFS=y" >> ${S}/.config
32 32
33 # Enable USB serial support
34 echo "CONFIG_USB_SERIAL=m" >> ${S}/.config
35 echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${S}/.config
36 echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${S}/.config
37 echo "CONFIG_USB_SERIAL_PL2303=m" >> ${S}/.config
38
33 yes '' | oe_runmake oldconfig 39 yes '' | oe_runmake oldconfig
34} 40}
diff --git a/recipes/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-boundary_3.10.17.bbappend
index 610dc4d..dd9420e 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() {
28 28
29 # FunctionFS for adb 29 # FunctionFS for adb
30 echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig 30 echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig
31
32 # Enable USB serial support
33 echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig
34 echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig
35 echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig
36 echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig
31} 37}
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 0000000..082c431
--- /dev/null
+++ b/recipes/linux/linux-imx_3.10.17.bbappend
@@ -0,0 +1,32 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://qt.digia.com/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23do_configure_prepend() {
24 # FunctionFS for adb
25 echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig
26
27 # Enable USB serial support
28 echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig
29 echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig
30 echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig
31 echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig
32}
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() {
29 echo "CONFIG_USB_FUNCTIONFS_RNDIS=n" >> ${WORKDIR}/defconfig 29 echo "CONFIG_USB_FUNCTIONFS_RNDIS=n" >> ${WORKDIR}/defconfig
30 echo "CONFIG_USB_FUNCTIONFS_GENERIC=y" >> ${WORKDIR}/defconfig 30 echo "CONFIG_USB_FUNCTIONFS_GENERIC=y" >> ${WORKDIR}/defconfig
31 31
32 # Enable USB serial support
33 echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig
34 echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig
35 echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig
36 echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig
37
32 # Remove beagleboard logo 38 # Remove beagleboard logo
33 if [ -e ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm ]; then 39 if [ -e ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm ]; then
34 rm ${WORKDIR}/${LOGO_SIZE}/logo_linux_clut224.ppm 40 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 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 @@
1From 877b8ea9a79d1d51f8e6b032801731538590d39e Mon Sep 17 00:00:00 2001
2From: Jonathan Liu <net147@gmail.com>
3Date: Tue, 4 Jun 2013 06:04:44 -0700
4Subject: [PATCH] configure: Avoid use of AC_CHECK_FILE for cross compiling
5
6The AC_CHECK_FILE macro can't be used for cross compiling as it will
7result in "error: cannot check for file existence when cross compiling".
8Replace it with the AS_IF macro.
9
10Upstream-Status: Submitted
11http://lists.freedesktop.org/archives/mesa-dev/2013-June/040168.html
12
13Signed-off-by: Jonathan Liu <net147@gmail.com>
14Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
15---
16 configure.ac | 12 ++++++------
17 1 file changed, 6 insertions(+), 6 deletions(-)
18
19diff --git a/configure.ac b/configure.ac
20index 36065f1..2b4a374 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -1694,8 +1694,8 @@ if test "x$enable_gallium_llvm" = xyes; then
24 CLANG_LIBDIR=${LLVM_LIBDIR}
25 fi
26 CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
27- AC_CHECK_FILE("$CLANG_RESOURCE_DIR/include/stddef.h",,
28- 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.]))
29+ AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"],
30+ [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.])])
31 fi
32 else
33 MESA_LLVM=0
34@@ -1912,7 +1912,7 @@ if test "x$MESA_LLVM" != x0; then
35 if test "x$with_llvm_shared_libs" = xyes; then
36 dnl We can't use $LLVM_VERSION because it has 'svn' stripped out,
37 LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version`
38- AC_CHECK_FILE("$LLVM_LIBDIR/lib$LLVM_SO_NAME.so", llvm_have_one_so=yes,)
39+ AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.so"], [llvm_have_one_so=yes])
40
41 if test "x$llvm_have_one_so" = xyes; then
42 dnl LLVM was built using auto*, so there is only one shared object.
43@@ -1920,8 +1920,8 @@ if test "x$MESA_LLVM" != x0; then
44 else
45 dnl If LLVM was built with CMake, there will be one shared object per
46 dnl component.
47- AC_CHECK_FILE("$LLVM_LIBDIR/libLLVMTarget.so",,
48- AC_MSG_ERROR([Could not find llvm shared libraries:
49+ AS_IF([test ! -f "$LLVM_LIBDIR/libLLVMTarget.so"],
50+ [AC_MSG_ERROR([Could not find llvm shared libraries:
51 Please make sure you have built llvm with the --enable-shared option
52 and that your llvm libraries are installed in $LLVM_LIBDIR
53 If you have installed your llvm libraries to a different directory you
54@@ -1932,7 +1932,7 @@ if test "x$MESA_LLVM" != x0; then
55 --enable-opencl
56 If you do not want to build with llvm shared libraries and instead want to
57 use llvm static libraries then remove these options from your configure
58- invocation and reconfigure.]))
59+ invocation and reconfigure.])])
60
61 dnl We don't need to update LLVM_LIBS in this case because the LLVM
62 dnl install uses a shared object for each compoenent and we have
63--
641.8.2.1
65
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 @@
1From 17d94fa96f095571651f0260378785c2a801ff16 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@digia.com>
3Date: Thu, 27 Jun 2013 14:49:54 +0300
4Subject: [PATCH] fix xlib dependency from pipe-loader
5
6---
7 src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 2 ++
8 1 file changed, 2 insertions(+)
9
10diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
11index c2b78c6..8c59c83 100644
12--- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
13+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c
14@@ -31,7 +31,9 @@
15 #include "util/u_dl.h"
16 #include "sw/null/null_sw_winsys.h"
17 #include "target-helpers/inline_sw_helper.h"
18+#ifdef X11
19 #include "state_tracker/xlib_sw_winsys.h"
20+#endif
21
22 struct pipe_loader_sw_device {
23 struct pipe_loader_device base;
24--
251.7.10.4
26
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 @@
1From 9915636fb8afe75ee2e8e013e4f495a4cb937afb Mon Sep 17 00:00:00 2001
2From: Brian Paul <brianp@vmware.com>
3Date: Wed, 6 Mar 2013 16:57:20 -0700
4Subject: [PATCH] llvmpipe: remove the power of two sizeof(struct cmd_block)
5 assertion
6MIME-Version: 1.0
7Content-Type: text/plain; charset=UTF-8
8Content-Transfer-Encoding: 8bit
9
10It fails on 32-bit systems (I only tested on 64-bit). Power of two
11size isn't required, so just remove the assertion.
12
13Reviewed-by: José Fonseca <jfonseca@vmware.com>
14
15Upstream-Status: Backport
16http://cgit.freedesktop.org/mesa/mesa/commit/?id=9915636fb8afe75ee2e8e013e4f495a4cb937afb
17
18---
19 src/gallium/drivers/llvmpipe/lp_scene.c | 7 -------
20 1 file changed, 7 deletions(-)
21
22diff --git a/src/gallium/drivers/llvmpipe/lp_scene.c b/src/gallium/drivers/llvmpipe/lp_scene.c
23index dd0943e..a0912eb 100644
24--- a/src/gallium/drivers/llvmpipe/lp_scene.c
25+++ b/src/gallium/drivers/llvmpipe/lp_scene.c
26@@ -76,13 +76,6 @@ lp_scene_create( struct pipe_context *pipe )
27 assert(maxCommandBytes < LP_SCENE_MAX_SIZE);
28 /* We'll also need space for at least one other data block */
29 assert(maxCommandPlusData <= LP_SCENE_MAX_SIZE);
30-
31- /* Ideally, the size of a cmd_block object will be a power of two
32- * in order to avoid wasting space when we allocation them from
33- * data blocks (which are power of two also).
34- */
35- assert(sizeof(struct cmd_block) ==
36- util_next_power_of_two(sizeof(struct cmd_block)));
37 }
38 #endif
39
40--
411.8.3
42
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 @@
1From d52a7ec5dcdf3936bd727b854831efb90acfd2ba Mon Sep 17 00:00:00 2001
2From: Daniel Stone <daniel@fooishbar.org>
3Date: Fri, 24 May 2013 17:20:27 +0100
4Subject: [PATCH] EGL: Mutate NativeDisplayType depending on config
5
6If we go through ./configure without enabling X11 anywhere, then set the
7fallback types for EGL NativeDisplay and friends, rather than assuming
8X11/Xlib.
9
10Signed-off-by: Daniel Stone <daniel@fooishbar.org>
11---
12 configure.ac | 9 +++
13 include/EGL/eglplatform.h | 146 ------------------------------------------
14 include/EGL/eglplatform.h.in | 146 ++++++++++++++++++++++++++++++++++++++++++
15 3 files changed, 155 insertions(+), 146 deletions(-)
16 delete mode 100644 include/EGL/eglplatform.h
17 create mode 100644 include/EGL/eglplatform.h.in
18
19diff --git a/configure.ac b/configure.ac
20index 4a98996..6fa77da 100644
21--- a/configure.ac
22+++ b/configure.ac
23@@ -1576,12 +1576,20 @@ fi
24
25 EGL_PLATFORMS="$egl_platforms"
26
27+if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then
28+ MESA_EGL_NO_X11_HEADERS=0
29+else
30+ MESA_EGL_NO_X11_HEADERS=1
31+fi
32+
33 AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1)
34 AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep 'wayland' >/dev/null 2>&1)
35 AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep 'drm' >/dev/null 2>&1)
36 AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep 'fbdev' >/dev/null 2>&1)
37 AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep 'null' >/dev/null 2>&1)
38
39+AC_SUBST([MESA_EGL_NO_X11_HEADERS])
40+
41 AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x")
42 AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x")
43
44@@ -2053,6 +2061,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS"
45
46 dnl Substitute the config
47 AC_CONFIG_FILES([Makefile
48+ include/EGL/eglplatform.h
49 src/Makefile
50 src/egl/Makefile
51 src/egl/drivers/Makefile
52diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h
53deleted file mode 100644
54index 17fdc61..0000000
55--- a/include/EGL/eglplatform.h
56+++ /dev/null
57@@ -1,146 +0,0 @@
58-#ifndef __eglplatform_h_
59-#define __eglplatform_h_
60-
61-/*
62-** Copyright (c) 2007-2009 The Khronos Group Inc.
63-**
64-** Permission is hereby granted, free of charge, to any person obtaining a
65-** copy of this software and/or associated documentation files (the
66-** "Materials"), to deal in the Materials without restriction, including
67-** without limitation the rights to use, copy, modify, merge, publish,
68-** distribute, sublicense, and/or sell copies of the Materials, and to
69-** permit persons to whom the Materials are furnished to do so, subject to
70-** the following conditions:
71-**
72-** The above copyright notice and this permission notice shall be included
73-** in all copies or substantial portions of the Materials.
74-**
75-** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
76-** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
77-** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
78-** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
79-** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
80-** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
81-** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
82-*/
83-
84-/* Platform-specific types and definitions for egl.h
85- * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $
86- *
87- * Adopters may modify khrplatform.h and this file to suit their platform.
88- * You are encouraged to submit all modifications to the Khronos group so that
89- * they can be included in future versions of this file. Please submit changes
90- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
91- * by filing a bug against product "EGL" component "Registry".
92- */
93-
94-#include <KHR/khrplatform.h>
95-
96-/* Macros used in EGL function prototype declarations.
97- *
98- * EGL functions should be prototyped as:
99- *
100- * EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
101- * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
102- *
103- * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
104- */
105-
106-#ifndef EGLAPI
107-#define EGLAPI KHRONOS_APICALL
108-#endif
109-
110-#ifndef EGLAPIENTRY
111-#define EGLAPIENTRY KHRONOS_APIENTRY
112-#endif
113-#define EGLAPIENTRYP EGLAPIENTRY*
114-
115-/* The types NativeDisplayType, NativeWindowType, and NativePixmapType
116- * are aliases of window-system-dependent types, such as X Display * or
117- * Windows Device Context. They must be defined in platform-specific
118- * code below. The EGL-prefixed versions of Native*Type are the same
119- * types, renamed in EGL 1.3 so all types in the API start with "EGL".
120- *
121- * Khronos STRONGLY RECOMMENDS that you use the default definitions
122- * provided below, since these changes affect both binary and source
123- * portability of applications using EGL running on different EGL
124- * implementations.
125- */
126-
127-#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
128-#ifndef WIN32_LEAN_AND_MEAN
129-#define WIN32_LEAN_AND_MEAN 1
130-#endif
131-#include <windows.h>
132-
133-typedef HDC EGLNativeDisplayType;
134-typedef HBITMAP EGLNativePixmapType;
135-typedef HWND EGLNativeWindowType;
136-
137-#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */
138-
139-typedef int EGLNativeDisplayType;
140-typedef void *EGLNativeWindowType;
141-typedef void *EGLNativePixmapType;
142-
143-#elif defined(WL_EGL_PLATFORM)
144-
145-typedef struct wl_display *EGLNativeDisplayType;
146-typedef struct wl_egl_pixmap *EGLNativePixmapType;
147-typedef struct wl_egl_window *EGLNativeWindowType;
148-
149-#elif defined(__GBM__)
150-
151-typedef struct gbm_device *EGLNativeDisplayType;
152-typedef struct gbm_bo *EGLNativePixmapType;
153-typedef void *EGLNativeWindowType;
154-
155-#elif defined(ANDROID) /* Android */
156-
157-struct ANativeWindow;
158-struct egl_native_pixmap_t;
159-
160-typedef struct ANativeWindow *EGLNativeWindowType;
161-typedef struct egl_native_pixmap_t *EGLNativePixmapType;
162-typedef void *EGLNativeDisplayType;
163-
164-#elif defined(__unix__)
165-
166-#ifdef MESA_EGL_NO_X11_HEADERS
167-
168-typedef void *EGLNativeDisplayType;
169-typedef khronos_uint32_t EGLNativePixmapType;
170-typedef khronos_uint32_t EGLNativeWindowType;
171-
172-#else
173-
174-/* X11 (tentative) */
175-#include <X11/Xlib.h>
176-#include <X11/Xutil.h>
177-
178-typedef Display *EGLNativeDisplayType;
179-typedef Pixmap EGLNativePixmapType;
180-typedef Window EGLNativeWindowType;
181-
182-#endif /* MESA_EGL_NO_X11_HEADERS */
183-
184-#else
185-#error "Platform not recognized"
186-#endif
187-
188-/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
189-typedef EGLNativeDisplayType NativeDisplayType;
190-typedef EGLNativePixmapType NativePixmapType;
191-typedef EGLNativeWindowType NativeWindowType;
192-
193-
194-/* Define EGLint. This must be a signed integral type large enough to contain
195- * all legal attribute names and values passed into and out of EGL, whether
196- * their type is boolean, bitmask, enumerant (symbolic constant), integer,
197- * handle, or other. While in general a 32-bit integer will suffice, if
198- * handles are 64 bit types, then EGLint should be defined as a signed 64-bit
199- * integer type.
200- */
201-typedef khronos_int32_t EGLint;
202-
203-#endif /* __eglplatform_h */
204diff --git a/include/EGL/eglplatform.h.in b/include/EGL/eglplatform.h.in
205new file mode 100644
206index 0000000..5126c92
207--- /dev/null
208+++ b/include/EGL/eglplatform.h.in
209@@ -0,0 +1,146 @@
210+#ifndef __eglplatform_h_
211+#define __eglplatform_h_
212+
213+/*
214+** Copyright (c) 2007-2009 The Khronos Group Inc.
215+**
216+** Permission is hereby granted, free of charge, to any person obtaining a
217+** copy of this software and/or associated documentation files (the
218+** "Materials"), to deal in the Materials without restriction, including
219+** without limitation the rights to use, copy, modify, merge, publish,
220+** distribute, sublicense, and/or sell copies of the Materials, and to
221+** permit persons to whom the Materials are furnished to do so, subject to
222+** the following conditions:
223+**
224+** The above copyright notice and this permission notice shall be included
225+** in all copies or substantial portions of the Materials.
226+**
227+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
228+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
229+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
230+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
231+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
232+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
233+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
234+*/
235+
236+/* Platform-specific types and definitions for egl.h
237+ * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $
238+ *
239+ * Adopters may modify khrplatform.h and this file to suit their platform.
240+ * You are encouraged to submit all modifications to the Khronos group so that
241+ * they can be included in future versions of this file. Please submit changes
242+ * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla)
243+ * by filing a bug against product "EGL" component "Registry".
244+ */
245+
246+#include <KHR/khrplatform.h>
247+
248+/* Macros used in EGL function prototype declarations.
249+ *
250+ * EGL functions should be prototyped as:
251+ *
252+ * EGLAPI return-type EGLAPIENTRY eglFunction(arguments);
253+ * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments);
254+ *
255+ * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h
256+ */
257+
258+#ifndef EGLAPI
259+#define EGLAPI KHRONOS_APICALL
260+#endif
261+
262+#ifndef EGLAPIENTRY
263+#define EGLAPIENTRY KHRONOS_APIENTRY
264+#endif
265+#define EGLAPIENTRYP EGLAPIENTRY*
266+
267+/* The types NativeDisplayType, NativeWindowType, and NativePixmapType
268+ * are aliases of window-system-dependent types, such as X Display * or
269+ * Windows Device Context. They must be defined in platform-specific
270+ * code below. The EGL-prefixed versions of Native*Type are the same
271+ * types, renamed in EGL 1.3 so all types in the API start with "EGL".
272+ *
273+ * Khronos STRONGLY RECOMMENDS that you use the default definitions
274+ * provided below, since these changes affect both binary and source
275+ * portability of applications using EGL running on different EGL
276+ * implementations.
277+ */
278+
279+#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */
280+#ifndef WIN32_LEAN_AND_MEAN
281+#define WIN32_LEAN_AND_MEAN 1
282+#endif
283+#include <windows.h>
284+
285+typedef HDC EGLNativeDisplayType;
286+typedef HBITMAP EGLNativePixmapType;
287+typedef HWND EGLNativeWindowType;
288+
289+#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */
290+
291+typedef int EGLNativeDisplayType;
292+typedef void *EGLNativeWindowType;
293+typedef void *EGLNativePixmapType;
294+
295+#elif defined(WL_EGL_PLATFORM)
296+
297+typedef struct wl_display *EGLNativeDisplayType;
298+typedef struct wl_egl_pixmap *EGLNativePixmapType;
299+typedef struct wl_egl_window *EGLNativeWindowType;
300+
301+#elif defined(__GBM__)
302+
303+typedef struct gbm_device *EGLNativeDisplayType;
304+typedef struct gbm_bo *EGLNativePixmapType;
305+typedef void *EGLNativeWindowType;
306+
307+#elif defined(ANDROID) /* Android */
308+
309+struct ANativeWindow;
310+struct egl_native_pixmap_t;
311+
312+typedef struct ANativeWindow *EGLNativeWindowType;
313+typedef struct egl_native_pixmap_t *EGLNativePixmapType;
314+typedef void *EGLNativeDisplayType;
315+
316+#elif defined(__unix__)
317+
318+#if @MESA_EGL_NO_X11_HEADERS@
319+
320+typedef void *EGLNativeDisplayType;
321+typedef khronos_uint32_t EGLNativePixmapType;
322+typedef khronos_uint32_t EGLNativeWindowType;
323+
324+#else
325+
326+/* X11 (tentative) */
327+#include <X11/Xlib.h>
328+#include <X11/Xutil.h>
329+
330+typedef Display *EGLNativeDisplayType;
331+typedef Pixmap EGLNativePixmapType;
332+typedef Window EGLNativeWindowType;
333+
334+#endif /* MESA_EGL_NO_X11_HEADERS */
335+
336+#else
337+#error "Platform not recognized"
338+#endif
339+
340+/* EGL 1.2 types, renamed for consistency in EGL 1.3 */
341+typedef EGLNativeDisplayType NativeDisplayType;
342+typedef EGLNativePixmapType NativePixmapType;
343+typedef EGLNativeWindowType NativeWindowType;
344+
345+
346+/* Define EGLint. This must be a signed integral type large enough to contain
347+ * all legal attribute names and values passed into and out of EGL, whether
348+ * their type is boolean, bitmask, enumerant (symbolic constant), integer,
349+ * handle, or other. While in general a 32-bit integer will suffice, if
350+ * handles are 64 bit types, then EGLint should be defined as a signed 64-bit
351+ * integer type.
352+ */
353+typedef khronos_int32_t EGLint;
354+
355+#endif /* __eglplatform_h */
356--
3571.7.10.4
358
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 @@
1The target libtool is used when building host binaries, which predictably
2doesn't work.
3
4Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=44618)
5Signed-off-by: Jonathan Liu <net147@gmail.com>
6Signed-off-by: Ross Burton <ross.burton@intel.com>
7
8diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am
9index e11a17f..8ebe0a2 100644
10--- a/src/glsl/builtin_compiler/Makefile.am
11+++ b/src/glsl/builtin_compiler/Makefile.am
12@@ -64,6 +64,8 @@ AM_CXXFLAGS = $(AM_CFLAGS)
13 include ../Makefile.sources
14
15 noinst_PROGRAMS = builtin_compiler
16+
17+if !CROSS_COMPILING
18 noinst_LTLIBRARIES = libglslcore.la libglcpp.la
19
20 libglcpp_la_SOURCES = \
21@@ -73,6 +75,7 @@ libglcpp_la_SOURCES = \
22 libglslcore_la_SOURCES = \
23 $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
24 $(LIBGLSL_FILES)
25+endif
26
27 builtin_compiler_SOURCES = \
28 $(top_srcdir)/src/mesa/main/hash_table.c \
29@@ -81,4 +84,14 @@ builtin_compiler_SOURCES = \
30 $(top_srcdir)/src/mesa/program/symbol_table.c \
31 $(BUILTIN_COMPILER_CXX_FILES) \
32 $(GLSL_COMPILER_CXX_FILES)
33+
34+if CROSS_COMPILING
35+builtin_compiler_SOURCES += \
36+ $(LIBGLCPP_GENERATED_FILES) \
37+ $(LIBGLCPP_FILES) \
38+ $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \
39+ $(LIBGLSL_FILES)
40+builtin_compiler_CPPFLAGS = $(AM_CPPFLAGS)
41+else
42 builtin_compiler_LDADD = libglslcore.la libglcpp.la
43+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 @@
1From 5ea43e65498505fc5d11d63668cda165146eb55b Mon Sep 17 00:00:00 2001
2From: Andreas Boll <andreas.boll.dev@gmail.com>
3Date: Thu, 30 May 2013 11:32:43 +0000
4Subject: glapi: Add some missing static_dispatch="false" annotations to es_EXT.xml
5
6This fixes the following build errors on powerpc:
7
8 CC glapi_dispatch.lo
9 In file included from glapi_dispatch.c:90:0:
10 ../../../../../src/mapi/glapi/glapitemp.h:1640:1: error: no previous
11 prototype for 'glReadBufferNV' [-Werror=missing-prototypes]
12 ../../../../../src/mapi/glapi/glapitemp.h:4198:1: error: no previous
13 prototype for 'glDrawBuffersNV' [-Werror=missing-prototypes]
14 ../../../../../src/mapi/glapi/glapitemp.h:6377:1: error: no previous
15 prototype for 'glFlushMappedBufferRangeEXT'
16 [-Werror=missing-prototypes]
17 ../../../../../src/mapi/glapi/glapitemp.h:6389:1: error: no previous
18 prototype for 'glMapBufferRangeEXT' [-Werror=missing-prototypes]
19 ../../../../../src/mapi/glapi/glapitemp.h:6401:1: error: no previous
20 prototype for 'glBindVertexArrayOES' [-Werror=missing-prototypes]
21 ../../../../../src/mapi/glapi/glapitemp.h:6413:1: error: no previous
22 prototype for 'glDeleteVertexArraysOES' [-Werror=missing-prototypes]
23 ../../../../../src/mapi/glapi/glapitemp.h:6433:1: error: no previous
24 prototype for 'glGenVertexArraysOES' [-Werror=missing-prototypes]
25 ../../../../../src/mapi/glapi/glapitemp.h:6445:1: error: no previous
26 prototype for 'glIsVertexArrayOES' [-Werror=missing-prototypes]
27
28NOTE: This is a candidate for the 9.0 and 9.1 branches.
29
30Reviewed-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
31Reviewed-by: Brian Paul <brianp@vmware.com>
32---
33diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
34index ff378ac..f412333 100644
35--- a/src/mapi/glapi/gen/es_EXT.xml
36+++ b/src/mapi/glapi/gen/es_EXT.xml
37@@ -689,22 +689,25 @@
38
39 <!-- 71. GL_OES_vertex_array_object -->
40 <category name="GL_OES_vertex_array_object" number="71">
41- <function name="BindVertexArrayOES" alias="BindVertexArray" es2="2.0">
42+ <function name="BindVertexArrayOES" alias="BindVertexArray"
43+ static_dispatch="false" es2="2.0">
44 <param name="array" type="GLuint"/>
45 </function>
46
47 <function name="DeleteVertexArraysOES" alias="DeleteVertexArrays"
48- es2="2.0">
49+ static_dispatch="false" es2="2.0">
50 <param name="n" type="GLsizei"/>
51 <param name="arrays" type="const GLuint *" count="n"/>
52 </function>
53
54- <function name="GenVertexArraysOES" alias="GenVertexArrays" es2="2.0">
55+ <function name="GenVertexArraysOES" alias="GenVertexArrays"
56+ static_dispatch="false" es2="2.0">
57 <param name="n" type="GLsizei"/>
58 <param name="arrays" type="GLuint *" output="true" count="n"/>
59 </function>
60
61- <function name="IsVertexArrayOES" alias="IsVertexArray" es2="2.0">
62+ <function name="IsVertexArrayOES" alias="IsVertexArray"
63+ static_dispatch="false" es2="2.0">
64 <param name="array" type="GLuint"/>
65 <return type="GLboolean"/>
66 </function>
67@@ -779,7 +782,8 @@
68 <size name="Get" mode="get"/>
69 </enum>
70
71- <function name="DrawBuffersNV" alias="DrawBuffers" es2="2.0">
72+ <function name="DrawBuffersNV" alias="DrawBuffers"
73+ static_dispatch="false" es2="2.0">
74 <param name="n" type="GLsizei" counter="true"/>
75 <param name="bufs" type="const GLenum *" count="n"/>
76 </function>
77@@ -787,7 +791,8 @@
78
79 <!-- 93. GL_NV_read_buffer -->
80 <category name="GL_NV_read_buffer">
81- <function name="ReadBufferNV" alias="ReadBuffer" es2="2.0">
82+ <function name="ReadBufferNV" alias="ReadBuffer"
83+ static_dispatch="false" es2="2.0">
84 <param name="mode" type="GLenum"/>
85 </function>
86 </category>
87@@ -815,8 +820,8 @@
88 <enum name="MAP_FLUSH_EXPLICIT_BIT_EXT" value="0x0010"/>
89 <enum name="MAP_UNSYNCHRONIZED_BIT_EXT" value="0x0020"/>
90
91- <function name="MapBufferRangeEXT" alias="MapBufferRange" es1="1.0"
92- es2="2.0">
93+ <function name="MapBufferRangeEXT" alias="MapBufferRange"
94+ static_dispatch="false" es1="1.0" es2="2.0">
95 <param name="target" type="GLenum"/>
96 <param name="offset" type="GLintptr"/>
97 <param name="size" type="GLsizeiptr"/>
98@@ -825,7 +830,7 @@
99 </function>
100
101 <function name="FlushMappedBufferRangeEXT" alias="FlushMappedBufferRange"
102- es1="1.0" es2="2.0">
103+ static_dispatch="false" es1="1.0" es2="2.0">
104 <param name="target" type="GLenum"/>
105 <param name="offset" type="GLintptr"/>
106 <param name="length" type="GLsizeiptr"/>
107--
108cgit v0.9.0.2-2-gbebe
109
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/openssl/openssl_1.0.1g.bbappend b/recipes/openssl/openssl_1.0.1g.bbappend
new file mode 100644
index 0000000..1ba0a2e
--- /dev/null
+++ b/recipes/openssl/openssl_1.0.1g.bbappend
@@ -0,0 +1,28 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://qt.digia.com/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23PACKAGECONFIG += "perl"
24
25do_install_append () {
26 rmdir ${D}${libdir}/ssl/certs
27 ln -s ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/
28}
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
30RDEPENDS_${PN} = "\ 30RDEPENDS_${PN} = "\
31 python-nativesdk \ 31 python-nativesdk \
32 python-subprocess-nativesdk \ 32 python-subprocess-nativesdk \
33 python-compiler-nativesdk \
34 python-multiprocessing-nativesdk \
35 python-shell-nativesdk \
36 python-threading-nativesdk \
33 " 37 "
34 38
35 39
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} = "\
32 psplash \ 32 psplash \
33 openssh-sftp-server \ 33 openssh-sftp-server \
34 openssl \ 34 openssl \
35 openssl-misc \
35 libpng \ 36 libpng \
36 jpeg \ 37 jpeg \
37 tiff \ 38 tiff \
@@ -45,5 +46,6 @@ RDEPENDS_${PN} = "\
45 alsa-utils-amixer \ 46 alsa-utils-amixer \
46 hunspell \ 47 hunspell \
47 ca-certificates \ 48 ca-certificates \
49 linux-firmware \
48 ${MACHINE_EXTRA_INSTALL} \ 50 ${MACHINE_EXTRA_INSTALL} \
49 " 51 "
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} = "\
35 gst-plugins-good-id3demux \ 35 gst-plugins-good-id3demux \
36 gst-plugins-good-auparse \ 36 gst-plugins-good-auparse \
37 gst-plugins-good-isomp4 \ 37 gst-plugins-good-isomp4 \
38 gst-plugins-good-icydemux \
38 gst-plugins-ugly-rmdemux \ 39 gst-plugins-ugly-rmdemux \
39 gst-plugins-ugly-asf \ 40 gst-plugins-ugly-asf \
40 gst-plugins-ugly-a52dec \ 41 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 0000000..59a4505
--- /dev/null
+++ b/recipes/u-boot/u-boot-fslc/0001-Updated-kernel-arguments-for-sabre-sd.patch
@@ -0,0 +1,133 @@
1From 2288d6475ba3ab9a7fb3cd4aa0aa3a7c60dbfac6 Mon Sep 17 00:00:00 2001
2From: Samuli Piippo <samuli.piippo@digia.com>
3Date: Fri, 9 May 2014 10:23:50 +0300
4Subject: [PATCH] Updated kernel arguments for sabre sd
5
6- Enable I2C
7- detect if hdmi is used and change video arguments accordingly
8- disable blanking and cursor blinking
9
10---
11 board/freescale/mx6sabresd/mx6sabresd.c | 23 +++++++++++++++++++++++
12 include/configs/mx6sabre_common.h | 21 +++++++++++++++++++++
13 2 files changed, 44 insertions(+)
14
15diff --git a/board/freescale/mx6sabresd/mx6sabresd.c b/board/freescale/mx6sabresd/mx6sabresd.c
16index 12d8c56..303b774 100644
17--- a/board/freescale/mx6sabresd/mx6sabresd.c
18+++ b/board/freescale/mx6sabresd/mx6sabresd.c
19@@ -12,6 +12,7 @@
20 #include <asm/arch/mx6-pins.h>
21 #include <asm/errno.h>
22 #include <asm/gpio.h>
23+#include <asm/imx-common/mxc_i2c.h>
24 #include <asm/imx-common/iomux-v3.h>
25 #include <asm/imx-common/boot_mode.h>
26 #include <mmc.h>
27@@ -24,6 +25,7 @@
28 #include <ipu_pixfmt.h>
29 #include <asm/io.h>
30 #include <asm/arch/sys_proto.h>
31+#include <i2c.h>
32 DECLARE_GLOBAL_DATA_PTR;
33
34 #define UART_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
35@@ -40,6 +42,12 @@ DECLARE_GLOBAL_DATA_PTR;
36 #define SPI_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_SPEED_MED | \
37 PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST)
38
39+#define I2C_PAD_CTRL (PAD_CTL_PUS_100K_UP | \
40+ PAD_CTL_SPEED_MED | PAD_CTL_DSE_40ohm | PAD_CTL_HYS | \
41+ PAD_CTL_ODE | PAD_CTL_SRE_FAST)
42+
43+#define I2C_PAD MUX_PAD_CTRL(I2C_PAD_CTRL)
44+
45 int dram_init(void)
46 {
47 gd->ram_size = get_ram_size((void *)PHYS_SDRAM, PHYS_SDRAM_SIZE);
48@@ -130,6 +138,19 @@ iomux_v3_cfg_t const ecspi1_pads[] = {
49 MX6_PAD_KEY_ROW1__GPIO4_IO09 | MUX_PAD_CTRL(NO_PAD_CTRL),
50 };
51
52+static struct i2c_pads_info i2c_pad_info1 = {
53+ .scl = {
54+ .i2c_mode = MX6_PAD_KEY_COL3__I2C2_SCL | I2C_PAD,
55+ .gpio_mode = MX6_PAD_KEY_COL3__GPIO4_IO12 | I2C_PAD,
56+ .gp = IMX_GPIO_NR(4, 12)
57+ },
58+ .sda = {
59+ .i2c_mode = MX6_PAD_KEY_ROW3__I2C2_SDA | I2C_PAD,
60+ .gpio_mode = MX6_PAD_KEY_ROW3__GPIO4_IO13 | I2C_PAD,
61+ .gp = IMX_GPIO_NR(4, 13)
62+ }
63+};
64+
65 static void setup_spi(void)
66 {
67 imx_iomux_v3_setup_multiple_pads(ecspi1_pads, ARRAY_SIZE(ecspi1_pads));
68@@ -477,6 +498,8 @@ int board_init(void)
69 setup_spi();
70 #endif
71
72+ setup_i2c(1, CONFIG_SYS_I2C_SPEED, 0x7f, &i2c_pad_info1);
73+
74 return 0;
75 }
76
77diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h
78index 5ee7fa5..b83bf74 100644
79--- a/include/configs/mx6sabre_common.h
80+++ b/include/configs/mx6sabre_common.h
81@@ -85,6 +85,13 @@
82 /* Command definition */
83 #include <config_cmd_default.h>
84
85+/* I2C Configs */
86+#define CONFIG_CMD_I2C
87+#define CONFIG_SYS_I2C
88+#define CONFIG_SYS_I2C_MXC
89+#define CONFIG_SYS_I2C_SPEED 100000
90+#define CONFIG_I2C_EDID
91+
92 #define CONFIG_CMD_BMODE
93 #define CONFIG_CMD_BOOTZ
94 #define CONFIG_CMD_SETEXPR
95@@ -117,6 +124,15 @@
96 #define EMMC_ENV ""
97 #endif
98
99+#define VIDEOARGS \
100+ "videoargs=" \
101+ "i2c dev 1 ; " \
102+ "if i2c probe 0x50 ; then " \
103+ "setenv video mxcfb0:dev=hdmi,1280x720M@60,if=RGB24 ; " \
104+ "else " \
105+ "setenv video mxcfb0:dev=ldb,LDB-XGA,if=RGB666 ldb=sin1 ; " \
106+ "fi\0"
107+
108 #define CONFIG_EXTRA_ENV_SETTINGS \
109 "script=boot.scr\0" \
110 "uimage=uImage\0" \
111@@ -144,7 +160,11 @@
112 "fi; " \
113 "fi\0" \
114 EMMC_ENV \
115+ VIDEOARGS \
116 "mmcargs=setenv bootargs console=${console},${baudrate} " \
117+ "video=${video} "\
118+ "consoleblank=0 " \
119+ "vt.global_cursor_default=0 " \
120 "root=${mmcroot}\0" \
121 "loadbootscript=" \
122 "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \
123@@ -153,6 +173,7 @@
124 "loaduimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${uimage}\0" \
125 "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \
126 "mmcboot=echo Booting from mmc ...; " \
127+ "run videoargs; " \
128 "run mmcargs; " \
129 "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \
130 "if run loadfdt; then " \
131--
1321.8.3.2
133
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 0000000..b4ff56f
--- /dev/null
+++ b/recipes/u-boot/u-boot-fslc_2014.01.bbappend
@@ -0,0 +1,26 @@
1#############################################################################
2##
3## Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
4##
5## This file is part of the Qt Enterprise Embedded Scripts of the Qt
6## framework.
7##
8## $QT_BEGIN_LICENSE$
9## Commercial License Usage Only
10## Licensees holding valid commercial Qt license agreements with Digia
11## with an appropriate addendum covering the Qt Enterprise Embedded Scripts,
12## may use this file in accordance with the terms contained in said license
13## agreement.
14##
15## For further information use the contact form at
16## http://qt.digia.com/contact-us.
17##
18##
19## $QT_END_LICENSE$
20##
21#############################################################################
22
23FILESEXTRAPATHS_append := "${THISDIR}/${PN}:"
24SRC_URI += " \
25 file://0001-Updated-kernel-arguments-for-sabre-sd.patch \
26 "
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
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-05-12 21:49:52 +0000