From 119c32c43cd29c782971094ad0ed351acc4efb85 Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Mon, 12 May 2014 12:29:11 +0200 Subject: Remove irda, pcmcia, pci, 3g, nfc, zeroconf features from distro irda is support for infra-red communication pcmcia and pci are not relevant for any of the reference devices 3g adds Ofono to the stack and since we are not making phones, this is completely unnecessary waste of resources. zeroconf adds the Avahi daemon that is a rarely necessary zero-configuration networking manager. nfc is something we support, but none of the reference devices comes with this hardware, and would require an external device that has not been tested by us at all. It's likely that an end user that wants to use custom hardware will need to rebuild the stack anyway so they can just add any of these additional features back to their distro as necessary when they build their own stack. Change-Id: If3951a4170d94ed8db1d40c2bb2d47cf569dc36a Reviewed-by: Samuli Piippo --- conf/distro/b2qt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 66ddcf1..14ee4ce 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -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" -- cgit v1.2.3-54-g00ecf From c646d169017decabe4280dbece71425d982e4411 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 09:07:07 +0300 Subject: Move to version 1.6 Change-Id: Ide554381076519287e874d5c6bb0b5b9de7060c6 Reviewed-by: Andy Nichols --- conf/distro/b2qt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'conf') diff --git a/conf/distro/b2qt.conf b/conf/distro/b2qt.conf index 14ee4ce..8819c93 100644 --- a/conf/distro/b2qt.conf +++ b/conf/distro/b2qt.conf @@ -24,7 +24,7 @@ include conf/distro/poky.conf DISTRO = "b2qt" DISTRO_NAME = "Boot to Qt for Embedded Linux" -DISTRO_VERSION = "1.5" +DISTRO_VERSION = "1.6" SDK_VERSION := "${DISTRO_VERSION}" MAINTAINER = "B2Qt " -- cgit v1.2.3-54-g00ecf From 0c8417be83c71907f223a1666f0a2269942c9c1a Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 09:14:22 +0300 Subject: nitrogen6x: use preferred version for kernel Need to change the preferred kernel version until it's done correctly in upstream. Change-Id: Ib75eb4731eb8f30c73353261e045d6fe5056a77a Reviewed-by: Andy Nichols --- conf/distro/include/nitrogen6x.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 2a64026..3dddcc1 100644 --- a/conf/distro/include/nitrogen6x.conf +++ b/conf/distro/include/nitrogen6x.conf @@ -31,6 +31,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 \ -- cgit v1.2.3-54-g00ecf From 7c9a43aa044ab46279f2ec33c92fcb91fc1b7202 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 8 May 2014 11:34:21 +0300 Subject: Include support for Freescale SABRE SD (iMX6Q) Change-Id: Iaa6004f4c9e3d0ec1948d18561bcf0ead81cb7c4 Reviewed-by: Andy Nichols --- conf/distro/include/imx6qsabresd.conf | 49 +++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 conf/distro/include/imx6qsabresd.conf (limited to 'conf') diff --git a/conf/distro/include/imx6qsabresd.conf b/conf/distro/include/imx6qsabresd.conf new file mode 100644 index 0000000..1298ee4 --- /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" -- cgit v1.2.3-54-g00ecf From b20a3f58ee264318fa351e449821ce76035df5ef Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 9 May 2014 09:16:26 +0300 Subject: mesa: remove from emulator image Mesa is no longer needed in emulator image since we are using qtglesstreaming Change-Id: I1b16cc11b73e58f7c489db77ed161aabff5b1061 Reviewed-by: Andy Nichols --- conf/distro/include/emulator.conf | 4 - ...void-use-of-AC_CHECK_FILE-for-cross-compi.patch | 65 ---- ...0001-fix-xlib-dependency-from-pipe-loader.patch | 26 -- ...move-the-power-of-two-sizeof-struct-cmd_b.patch | 42 --- ...ate-NativeDisplayType-depending-on-config.patch | 358 --------------------- recipes/mesa/mesa/fix-glsl-cross.patch | 43 --- recipes/mesa/mesa/glapi.patch | 109 ------- recipes/mesa/mesa_9.1.6.bbappend | 26 -- 8 files changed, 673 deletions(-) delete mode 100644 recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch delete mode 100644 recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch delete mode 100644 recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch delete mode 100644 recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch delete mode 100644 recipes/mesa/mesa/fix-glsl-cross.patch delete mode 100644 recipes/mesa/mesa/glapi.patch delete mode 100644 recipes/mesa/mesa_9.1.6.bbappend (limited to 'conf') diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index dee1df3..9b22383 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -32,12 +32,8 @@ MACHINE_EXTRA_RRECOMMENDS += "\ kernel_autoload_snd-intel8x0 = "snd-intel8x0" MACHINE_EXTRA_INSTALL = "\ - libegl-mesa \ - libgles2-mesa \ mount-vboxsf \ " MACHINE_EXTRA_INSTALL_SDK = "\ - libegl-mesa-dev \ - libgles2-mesa-dev \ " diff --git a/recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch b/recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch deleted file mode 100644 index 9f7002a..0000000 --- a/recipes/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch +++ /dev/null @@ -1,65 +0,0 @@ -From 877b8ea9a79d1d51f8e6b032801731538590d39e Mon Sep 17 00:00:00 2001 -From: Jonathan Liu -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 -Signed-off-by: Martin Jansa ---- - configure.ac | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 36065f1..2b4a374 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1694,8 +1694,8 @@ if test "x$enable_gallium_llvm" = xyes; then - CLANG_LIBDIR=${LLVM_LIBDIR} - fi - CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION} -- AC_CHECK_FILE("$CLANG_RESOURCE_DIR/include/stddef.h",, -- AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])) -+ AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"], -+ [AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])]) - fi - else - MESA_LLVM=0 -@@ -1912,7 +1912,7 @@ if test "x$MESA_LLVM" != x0; then - if test "x$with_llvm_shared_libs" = xyes; then - dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, - LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` -- AC_CHECK_FILE("$LLVM_LIBDIR/lib$LLVM_SO_NAME.so", llvm_have_one_so=yes,) -+ AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.so"], [llvm_have_one_so=yes]) - - if test "x$llvm_have_one_so" = xyes; then - dnl LLVM was built using auto*, so there is only one shared object. -@@ -1920,8 +1920,8 @@ if test "x$MESA_LLVM" != x0; then - else - dnl If LLVM was built with CMake, there will be one shared object per - dnl component. -- AC_CHECK_FILE("$LLVM_LIBDIR/libLLVMTarget.so",, -- AC_MSG_ERROR([Could not find llvm shared libraries: -+ AS_IF([test ! -f "$LLVM_LIBDIR/libLLVMTarget.so"], -+ [AC_MSG_ERROR([Could not find llvm shared libraries: - Please make sure you have built llvm with the --enable-shared option - and that your llvm libraries are installed in $LLVM_LIBDIR - If you have installed your llvm libraries to a different directory you -@@ -1932,7 +1932,7 @@ if test "x$MESA_LLVM" != x0; then - --enable-opencl - If you do not want to build with llvm shared libraries and instead want to - use llvm static libraries then remove these options from your configure -- invocation and reconfigure.])) -+ invocation and reconfigure.])]) - - dnl We don't need to update LLVM_LIBS in this case because the LLVM - dnl install uses a shared object for each compoenent and we have --- -1.8.2.1 - diff --git a/recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch b/recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch deleted file mode 100644 index a9f2394..0000000 --- a/recipes/mesa/mesa/0001-fix-xlib-dependency-from-pipe-loader.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 17d94fa96f095571651f0260378785c2a801ff16 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Thu, 27 Jun 2013 14:49:54 +0300 -Subject: [PATCH] fix xlib dependency from pipe-loader - ---- - src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c -index c2b78c6..8c59c83 100644 ---- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c -+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c -@@ -31,7 +31,9 @@ - #include "util/u_dl.h" - #include "sw/null/null_sw_winsys.h" - #include "target-helpers/inline_sw_helper.h" -+#ifdef X11 - #include "state_tracker/xlib_sw_winsys.h" -+#endif - - struct pipe_loader_sw_device { - struct pipe_loader_device base; --- -1.7.10.4 - diff --git a/recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch b/recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch deleted file mode 100644 index b74fddc..0000000 --- a/recipes/mesa/mesa/0001-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 9915636fb8afe75ee2e8e013e4f495a4cb937afb Mon Sep 17 00:00:00 2001 -From: Brian Paul -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 - -Upstream-Status: Backport -http://cgit.freedesktop.org/mesa/mesa/commit/?id=9915636fb8afe75ee2e8e013e4f495a4cb937afb - ---- - src/gallium/drivers/llvmpipe/lp_scene.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/src/gallium/drivers/llvmpipe/lp_scene.c b/src/gallium/drivers/llvmpipe/lp_scene.c -index dd0943e..a0912eb 100644 ---- a/src/gallium/drivers/llvmpipe/lp_scene.c -+++ b/src/gallium/drivers/llvmpipe/lp_scene.c -@@ -76,13 +76,6 @@ lp_scene_create( struct pipe_context *pipe ) - assert(maxCommandBytes < LP_SCENE_MAX_SIZE); - /* We'll also need space for at least one other data block */ - assert(maxCommandPlusData <= LP_SCENE_MAX_SIZE); -- -- /* Ideally, the size of a cmd_block object will be a power of two -- * in order to avoid wasting space when we allocation them from -- * data blocks (which are power of two also). -- */ -- assert(sizeof(struct cmd_block) == -- util_next_power_of_two(sizeof(struct cmd_block))); - } - #endif - --- -1.8.3 - diff --git a/recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch b/recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch deleted file mode 100644 index 47ba167..0000000 --- a/recipes/mesa/mesa/EGL-Mutate-NativeDisplayType-depending-on-config.patch +++ /dev/null @@ -1,358 +0,0 @@ -From d52a7ec5dcdf3936bd727b854831efb90acfd2ba Mon Sep 17 00:00:00 2001 -From: Daniel Stone -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 ---- - 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 -- --/* 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 -- --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 --#include -- --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 -+ -+/* 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 -+ -+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 -+#include -+ -+typedef Display *EGLNativeDisplayType; -+typedef Pixmap EGLNativePixmapType; -+typedef Window EGLNativeWindowType; -+ -+#endif /* MESA_EGL_NO_X11_HEADERS */ -+ -+#else -+#error "Platform not recognized" -+#endif -+ -+/* EGL 1.2 types, renamed for consistency in EGL 1.3 */ -+typedef EGLNativeDisplayType NativeDisplayType; -+typedef EGLNativePixmapType NativePixmapType; -+typedef EGLNativeWindowType NativeWindowType; -+ -+ -+/* Define EGLint. This must be a signed integral type large enough to contain -+ * all legal attribute names and values passed into and out of EGL, whether -+ * their type is boolean, bitmask, enumerant (symbolic constant), integer, -+ * handle, or other. While in general a 32-bit integer will suffice, if -+ * handles are 64 bit types, then EGLint should be defined as a signed 64-bit -+ * integer type. -+ */ -+typedef khronos_int32_t EGLint; -+ -+#endif /* __eglplatform_h */ --- -1.7.10.4 - diff --git a/recipes/mesa/mesa/fix-glsl-cross.patch b/recipes/mesa/mesa/fix-glsl-cross.patch deleted file mode 100644 index 34226ea..0000000 --- a/recipes/mesa/mesa/fix-glsl-cross.patch +++ /dev/null @@ -1,43 +0,0 @@ -The target libtool is used when building host binaries, which predictably -doesn't work. - -Upstream-Status: Submitted (https://bugs.freedesktop.org/show_bug.cgi?id=44618) -Signed-off-by: Jonathan Liu -Signed-off-by: Ross Burton - -diff --git a/src/glsl/builtin_compiler/Makefile.am b/src/glsl/builtin_compiler/Makefile.am -index e11a17f..8ebe0a2 100644 ---- a/src/glsl/builtin_compiler/Makefile.am -+++ b/src/glsl/builtin_compiler/Makefile.am -@@ -64,6 +64,8 @@ AM_CXXFLAGS = $(AM_CFLAGS) - include ../Makefile.sources - - noinst_PROGRAMS = builtin_compiler -+ -+if !CROSS_COMPILING - noinst_LTLIBRARIES = libglslcore.la libglcpp.la - - libglcpp_la_SOURCES = \ -@@ -73,6 +75,7 @@ libglcpp_la_SOURCES = \ - libglslcore_la_SOURCES = \ - $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ - $(LIBGLSL_FILES) -+endif - - builtin_compiler_SOURCES = \ - $(top_srcdir)/src/mesa/main/hash_table.c \ -@@ -81,4 +84,14 @@ builtin_compiler_SOURCES = \ - $(top_srcdir)/src/mesa/program/symbol_table.c \ - $(BUILTIN_COMPILER_CXX_FILES) \ - $(GLSL_COMPILER_CXX_FILES) -+ -+if CROSS_COMPILING -+builtin_compiler_SOURCES += \ -+ $(LIBGLCPP_GENERATED_FILES) \ -+ $(LIBGLCPP_FILES) \ -+ $(BUILTIN_COMPILER_GENERATED_CXX_FILES) \ -+ $(LIBGLSL_FILES) -+builtin_compiler_CPPFLAGS = $(AM_CPPFLAGS) -+else - builtin_compiler_LDADD = libglslcore.la libglcpp.la -+endif diff --git a/recipes/mesa/mesa/glapi.patch b/recipes/mesa/mesa/glapi.patch deleted file mode 100644 index 74cac0b..0000000 --- a/recipes/mesa/mesa/glapi.patch +++ /dev/null @@ -1,109 +0,0 @@ -From 5ea43e65498505fc5d11d63668cda165146eb55b Mon Sep 17 00:00:00 2001 -From: Andreas Boll -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 -Reviewed-by: Brian Paul ---- -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 @@ - - - -- -+ - - - - -+ static_dispatch="false" es2="2.0"> - - - - -- -+ - - - - -- -+ - - - -@@ -779,7 +782,8 @@ - - - -- -+ - - - -@@ -787,7 +791,8 @@ - - - -- -+ - - - -@@ -815,8 +820,8 @@ - - - -- -+ - - - -@@ -825,7 +830,7 @@ - - - -+ static_dispatch="false" es1="1.0" es2="2.0"> - - - --- -cgit v0.9.0.2-2-gbebe - diff --git a/recipes/mesa/mesa_9.1.6.bbappend b/recipes/mesa/mesa_9.1.6.bbappend deleted file mode 100644 index 627f70b..0000000 --- a/recipes/mesa/mesa_9.1.6.bbappend +++ /dev/null @@ -1,26 +0,0 @@ -############################################################################# -## -## 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$ -## -############################################################################# - -EGL_PLATFORMS = "fbdev" -DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915" -DRIDRIVERS_append += "swrast" -EXTRA_OECONF += "--with-dri-drivers=""" -- cgit v1.2.3-54-g00ecf From f64f1f26dfad731f4506107ba62eb745831d323d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Wed, 14 May 2014 11:42:00 +0300 Subject: imx6: kernel update for nitrogen6x Correctly append new kernel configs for the updated kernel version and include device tree files in the boot image. Change-Id: I3d7c826e3e96338048e82b23a6723212e4adbd03 Reviewed-by: Kalle Viironen Reviewed-by: Andy Nichols --- conf/distro/include/nitrogen6x.conf | 3 +++ recipes/linux/linux-boundary_3.0.35.bbappend | 37 --------------------------- recipes/linux/linux-boundary_3.10.17.bbappend | 37 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 37 deletions(-) delete mode 100644 recipes/linux/linux-boundary_3.0.35.bbappend create mode 100644 recipes/linux/linux-boundary_3.10.17.bbappend (limited to 'conf') diff --git a/conf/distro/include/nitrogen6x.conf b/conf/distro/include/nitrogen6x.conf index 3dddcc1..8066936 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 \ " diff --git a/recipes/linux/linux-boundary_3.0.35.bbappend b/recipes/linux/linux-boundary_3.0.35.bbappend deleted file mode 100644 index dd9420e..0000000 --- a/recipes/linux/linux-boundary_3.0.35.bbappend +++ /dev/null @@ -1,37 +0,0 @@ -############################################################################# -## -## 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() { - # Use multitouch protocol for touchscreen that support it - echo "CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=n" >> ${WORKDIR}/defconfig - echo "CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=n" >> ${WORKDIR}/defconfig - - # FunctionFS for adb - echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig - - # Enable USB serial support - echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig - echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig -} diff --git a/recipes/linux/linux-boundary_3.10.17.bbappend b/recipes/linux/linux-boundary_3.10.17.bbappend new file mode 100644 index 0000000..dd9420e --- /dev/null +++ b/recipes/linux/linux-boundary_3.10.17.bbappend @@ -0,0 +1,37 @@ +############################################################################# +## +## 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() { + # Use multitouch protocol for touchscreen that support it + echo "CONFIG_TOUCHSCREEN_EGALAX_SINGLE_TOUCH=n" >> ${WORKDIR}/defconfig + echo "CONFIG_TOUCHSCREEN_FT5X06_SINGLE_TOUCH=n" >> ${WORKDIR}/defconfig + + # FunctionFS for adb + echo "CONFIG_USB_FUNCTIONFS=m" >> ${WORKDIR}/defconfig + + # Enable USB serial support + echo "CONFIG_USB_SERIAL=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_GENERIC=y" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_FTDI_SIO=m" >> ${WORKDIR}/defconfig + echo "CONFIG_USB_SERIAL_PL2303=m" >> ${WORKDIR}/defconfig +} -- cgit v1.2.3-54-g00ecf From 52b5016e0c35bd1e6459eb31f5502c6817c04367 Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Thu, 15 May 2014 10:21:09 +0300 Subject: mesa: include gles development files in sdk The sdk still needs to have gles development files, since the qtqlesstream is not there yet. Change-Id: I5a078171b28542ead2e96a9942b781a93f4b697e Reviewed-by: Andy Nichols --- conf/distro/include/emulator.conf | 2 ++ recipes/mesa/mesa_9.2.5.bbappend | 26 ++++++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 recipes/mesa/mesa_9.2.5.bbappend (limited to 'conf') diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index 9b22383..3d85b6a 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -36,4 +36,6 @@ MACHINE_EXTRA_INSTALL = "\ " MACHINE_EXTRA_INSTALL_SDK = "\ + libegl-mesa-dev \ + libgles2-mesa-dev \ " diff --git a/recipes/mesa/mesa_9.2.5.bbappend b/recipes/mesa/mesa_9.2.5.bbappend new file mode 100644 index 0000000..627f70b --- /dev/null +++ b/recipes/mesa/mesa_9.2.5.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$ +## +############################################################################# + +EGL_PLATFORMS = "fbdev" +DRIDRIVERS_remove = "swrast,radeon,r200,nouveau,i965,i915" +DRIDRIVERS_append += "swrast" +EXTRA_OECONF += "--with-dri-drivers=""" -- cgit v1.2.3-54-g00ecf From 506533ebc0e592b34d68bb1fa944866edf3e389d Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Fri, 16 May 2014 10:20:54 +0300 Subject: emulator: include mesa back to the image Qt gets dependency to libEGL.so which need to be in the image as well. Change-Id: I414198d06e42432cb03a58d70ce622a1eb8890a1 Reviewed-by: Laszlo Agocs Reviewed-by: Andy Nichols --- conf/distro/include/emulator.conf | 2 ++ 1 file changed, 2 insertions(+) (limited to 'conf') diff --git a/conf/distro/include/emulator.conf b/conf/distro/include/emulator.conf index 3d85b6a..dee1df3 100644 --- a/conf/distro/include/emulator.conf +++ b/conf/distro/include/emulator.conf @@ -32,6 +32,8 @@ MACHINE_EXTRA_RRECOMMENDS += "\ kernel_autoload_snd-intel8x0 = "snd-intel8x0" MACHINE_EXTRA_INSTALL = "\ + libegl-mesa \ + libgles2-mesa \ mount-vboxsf \ " -- cgit v1.2.3-54-g00ecf