* [PATCH] Mesa: upgrade to 9.2.2
@ 2013-10-24 10:32 Valentin Popa
2013-10-24 10:32 ` Valentin Popa
2013-10-29 17:30 ` Saul Wold
0 siblings, 2 replies; 16+ messages in thread
From: Valentin Popa @ 2013-10-24 10:32 UTC (permalink / raw)
To: openembedded-core
* License is still MIT
* removed patches were already merged or
another solution was used upstream.
Signed-off-by: Valentin Popa <valentin.popa@intel.com>
---
...ate-NativeDisplayType-depending-on-config.patch | 0
...move-the-power-of-two-sizeof-struct-cmd_b.patch | 0
.../mesa/{mesa-gl_9.1.6.bb => mesa-gl_9.2.2.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 2 +-
...void-use-of-AC_CHECK_FILE-for-cross-compi.patch | 65 ----
...ate-NativeDisplayType-depending-on-config.patch | 359 ---------------------
...sl-fix-builtin_compiler-cross-compilation.patch | 54 ----
.../mesa/0005-fix-out-of-tree-builds-gallium.patch | 42 ---
.../mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb} | 9 +-
9 files changed, 3 insertions(+), 528 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-9.1.6 => mesa-9.2.2}/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch (100%)
rename meta/recipes-graphics/mesa/{mesa-9.1.6 => mesa-9.2.2}/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch (100%)
rename meta/recipes-graphics/mesa/{mesa-gl_9.1.6.bb => mesa-gl_9.2.2.bb} (100%)
delete mode 100644 meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
rename meta/recipes-graphics/mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb} (34%)
diff --git a/meta/recipes-graphics/mesa/mesa-9.1.6/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch b/meta/recipes-graphics/mesa/mesa-9.2.2/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-9.1.6/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
rename to meta/recipes-graphics/mesa/mesa-9.2.2/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
diff --git a/meta/recipes-graphics/mesa/mesa-9.1.6/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch b/meta/recipes-graphics/mesa/mesa-9.2.2/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-9.1.6/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
rename to meta/recipes-graphics/mesa/mesa-9.2.2/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb b/meta/recipes-graphics/mesa/mesa-gl_9.2.2.bb
similarity index 100%
rename from meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb
rename to meta/recipes-graphics/mesa/mesa-gl_9.2.2.bb
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index afc795c..5cbf56d 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -10,7 +10,7 @@ HOMEPAGE = "http://mesa3d.org"
BUGTRACKER = "https://bugs.freedesktop.org"
SECTION = "x11"
LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555d"
+LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf"
INC_PR = "r9"
PE = "2"
diff --git a/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch b/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
deleted file mode 100644
index 76b5a18..0000000
--- a/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From e21ce89f7ae6964f196086ff325d79e4a3b5acd8 Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Tue, 4 Jun 2013 06:04:44 -0700
-Subject: [PATCH 1/4] 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 70c598e..67b8c40 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1630,8 +1630,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
-@@ -1861,7 +1861,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.
-@@ -1869,8 +1869,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
-@@ -1881,7 +1881,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/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch b/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
deleted file mode 100644
index 8a83f4b..0000000
--- a/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
+++ /dev/null
@@ -1,359 +0,0 @@
-From 8d31ae23683394617c49301b039b3a069b9ea436 Mon Sep 17 00:00:00 2001
-From: Daniel Stone <daniel@fooishbar.org>
-Date: Fri, 24 May 2013 17:20:27 +0100
-Subject: [PATCH 3/4] 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.
-
-Upstream-Status: Backport (slightly different solution was applied in master
-https://bugs.freedesktop.org/show_bug.cgi?id=64959)
-
-Signed-off-by: Daniel Stone <daniel@fooishbar.org>
-Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
----
- configure.ac | 5 ++
- include/EGL/eglplatform.h | 146 -------------------------------------------
- include/EGL/eglplatform.h.in | 146 +++++++++++++++++++++++++++++++++++++++++++
- 3 files changed, 151 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 67b8c40..afc3217 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -1499,6 +1499,9 @@ EGL_PLATFORMS="$egl_platforms"
-
- if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then
- NEED_WINSYS_XLIB=yes
-+ 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)
-@@ -1512,6 +1515,7 @@ AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x")
- AC_SUBST([EGL_NATIVE_PLATFORM])
- AC_SUBST([EGL_PLATFORMS])
- AC_SUBST([EGL_CFLAGS])
-+AC_SUBST([MESA_EGL_NO_X11_HEADERS])
-
- AC_ARG_WITH([egl-driver-dir],
- [AS_HELP_STRING([--with-egl-driver-dir=DIR],
-@@ -1991,6 +1995,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.8.2.1
-
diff --git a/meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch b/meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch
deleted file mode 100644
index 460a274..0000000
--- a/meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From ab38c97f057f739533a4e1fc9de51ea5f4e6242d Mon Sep 17 00:00:00 2001
-From: Jonathan Liu <net147@gmail.com>
-Date: Sat, 29 Jun 2013 11:37:20 +0200
-Subject: [PATCH 4/4] glsl: fix builtin_compiler cross-compilation
-
-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>
----
- src/glsl/builtin_compiler/Makefile.am | 13 +++++++++++++
- 1 file changed, 13 insertions(+)
-
-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
---
-1.8.2.1
-
diff --git a/meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch b/meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
deleted file mode 100644
index 8c5984f..0000000
--- a/meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Upstream-Status: Submitted
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 9e31e15ebb0adbf3cc0394c30cbc1ccd2b35a27f Mon Sep 17 00:00:00 2001
-From: Ross Burton <ross.burton@intel.com>
-Date: Fri, 28 Jun 2013 11:44:58 +0100
-Subject: [PATCH] build: fix out-of-tree builds in gallium/auxiliary
-
-The rules were writing files to e.g. util/u_indices_gen.py, but in an
-out-of-tree build this directory doesn't exist in the build directory. So,
-create the directories just in case.
-
-Signed-off-by: Ross Burton <ross.burton@intel.com>
----
- src/gallium/auxiliary/Makefile.am | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
-index f14279b..0c3e7ba 100644
---- a/src/gallium/auxiliary/Makefile.am
-+++ b/src/gallium/auxiliary/Makefile.am
-@@ -38,13 +38,17 @@ libgallium_la_SOURCES += \
- endif
-
- indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py
-+ mkdir --parents indices
- $(AM_V_GEN) $(PYTHON2) $< > $@
-
- indices/u_unfilled_gen.c: $(srcdir)/indices/u_unfilled_gen.py
-+ mkdir --parents indices
- $(AM_V_GEN) $(PYTHON2) $< > $@
-
- util/u_format_srgb.c: $(srcdir)/util/u_format_srgb.py
-+ mkdir --parents util
- $(AM_V_GEN) $(PYTHON2) $< > $@
-
- util/u_format_table.c: $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format_pack.py $(srcdir)/util/u_format_parse.py $(srcdir)/util/u_format.csv
-+ mkdir --parents util
- $(AM_V_GEN) $(PYTHON2) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@
---
-1.7.10.4
-
diff --git a/meta/recipes-graphics/mesa/mesa_9.1.6.bb b/meta/recipes-graphics/mesa/mesa_9.2.2.bb
similarity index 34%
rename from meta/recipes-graphics/mesa/mesa_9.1.6.bb
rename to meta/recipes-graphics/mesa/mesa_9.2.2.bb
index b55fa02..60eba01 100644
--- a/meta/recipes-graphics/mesa/mesa_9.1.6.bb
+++ b/meta/recipes-graphics/mesa/mesa_9.2.2.bb
@@ -1,16 +1,11 @@
require ${BPN}.inc
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
- file://0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch \
file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
- file://0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch \
- file://0004-glsl-fix-builtin_compiler-cross-compilation.patch \
- file://0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \
- file://0005-fix-out-of-tree-builds-gallium.patch \
file://0006-fix-out-of-tree-egl.patch \
"
-SRC_URI[md5sum] = "443a2a352667294b53d56cb1a74114e9"
-SRC_URI[sha256sum] = "e632dff0acafad0a59dc208d16dedb37f7bd58f94c5d58c4b51912e41d005e3d"
+SRC_URI[md5sum] = "20887f8020db7d1736a01ae9cd5d8c38"
+SRC_URI[sha256sum] = "c78a5035233672844cf2492fe82dc10877e12026be227d04469d6ca6ac656a3d"
S = "${WORKDIR}/Mesa-${PV}"
--
1.8.3.2
^ permalink raw reply related [flat|nested] 16+ messages in thread* [PATCH] Mesa: upgrade to 9.2.2
2013-10-24 10:32 [PATCH] Mesa: upgrade to 9.2.2 Valentin Popa
@ 2013-10-24 10:32 ` Valentin Popa
2013-10-24 13:11 ` Burton, Ross
2013-10-29 17:30 ` Saul Wold
1 sibling, 1 reply; 16+ messages in thread
From: Valentin Popa @ 2013-10-24 10:32 UTC (permalink / raw)
To: openembedded-core
Tested with core-image-sato core-image-weston core-image-clutter;
All cogl and weston examples run successfully.
Valentin Popa (1):
Mesa: upgrade to 9.2.2
...ate-NativeDisplayType-depending-on-config.patch | 0
...move-the-power-of-two-sizeof-struct-cmd_b.patch | 0
.../mesa/{mesa-gl_9.1.6.bb => mesa-gl_9.2.2.bb} | 0
meta/recipes-graphics/mesa/mesa.inc | 2 +-
...void-use-of-AC_CHECK_FILE-for-cross-compi.patch | 65 ----
...ate-NativeDisplayType-depending-on-config.patch | 359 ---------------------
...sl-fix-builtin_compiler-cross-compilation.patch | 54 ----
.../mesa/0005-fix-out-of-tree-builds-gallium.patch | 42 ---
.../mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb} | 9 +-
9 files changed, 3 insertions(+), 528 deletions(-)
rename meta/recipes-graphics/mesa/{mesa-9.1.6 => mesa-9.2.2}/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch (100%)
rename meta/recipes-graphics/mesa/{mesa-9.1.6 => mesa-9.2.2}/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch (100%)
rename meta/recipes-graphics/mesa/{mesa-gl_9.1.6.bb => mesa-gl_9.2.2.bb} (100%)
delete mode 100644 meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch
delete mode 100644 meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
rename meta/recipes-graphics/mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb} (34%)
--
1.8.3.2
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH] Mesa: upgrade to 9.2.2
2013-10-24 10:32 ` Valentin Popa
@ 2013-10-24 13:11 ` Burton, Ross
2013-10-24 13:28 ` Valentin Popa
0 siblings, 1 reply; 16+ messages in thread
From: Burton, Ross @ 2013-10-24 13:11 UTC (permalink / raw)
To: Valentin Popa; +Cc: OE-core
Hi Valentin,
Did you try a weston build without X11, i.e. core-image-weston with
DISTRO_FEATURES_remove="x11"?
Ross
On 24 October 2013 11:32, Valentin Popa <valentin.popa@intel.com> wrote:
> Tested with core-image-sato core-image-weston core-image-clutter;
> All cogl and weston examples run successfully.
>
> Valentin Popa (1):
> Mesa: upgrade to 9.2.2
>
> ...ate-NativeDisplayType-depending-on-config.patch | 0
> ...move-the-power-of-two-sizeof-struct-cmd_b.patch | 0
> .../mesa/{mesa-gl_9.1.6.bb => mesa-gl_9.2.2.bb} | 0
> meta/recipes-graphics/mesa/mesa.inc | 2 +-
> ...void-use-of-AC_CHECK_FILE-for-cross-compi.patch | 65 ----
> ...ate-NativeDisplayType-depending-on-config.patch | 359 ---------------------
> ...sl-fix-builtin_compiler-cross-compilation.patch | 54 ----
> .../mesa/0005-fix-out-of-tree-builds-gallium.patch | 42 ---
> .../mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb} | 9 +-
> 9 files changed, 3 insertions(+), 528 deletions(-)
> rename meta/recipes-graphics/mesa/{mesa-9.1.6 => mesa-9.2.2}/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch (100%)
> rename meta/recipes-graphics/mesa/{mesa-9.1.6 => mesa-9.2.2}/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch (100%)
> rename meta/recipes-graphics/mesa/{mesa-gl_9.1.6.bb => mesa-gl_9.2.2.bb} (100%)
> delete mode 100644 meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
> delete mode 100644 meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
> delete mode 100644 meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch
> delete mode 100644 meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
> rename meta/recipes-graphics/mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb} (34%)
>
> --
> 1.8.3.2
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH] Mesa: upgrade to 9.2.2
2013-10-24 13:11 ` Burton, Ross
@ 2013-10-24 13:28 ` Valentin Popa
2013-10-24 13:30 ` Burton, Ross
0 siblings, 1 reply; 16+ messages in thread
From: Valentin Popa @ 2013-10-24 13:28 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
I thought that if I don't specify DISTRO_FEATURES_append = " x11"
it will not include it. I will try with DISTRO_FEATURES_remove="x11"
end see what's happening.
On 10/24/2013 04:11 PM, Burton, Ross wrote:
> Hi Valentin,
>
> Did you try a weston build without X11, i.e. core-image-weston with
> DISTRO_FEATURES_remove="x11"?
>
> Ross
>
> On 24 October 2013 11:32, Valentin Popa <valentin.popa@intel.com> wrote:
>> Tested with core-image-sato core-image-weston core-image-clutter;
>> All cogl and weston examples run successfully.
>>
>> Valentin Popa (1):
>> Mesa: upgrade to 9.2.2
>>
>> ...ate-NativeDisplayType-depending-on-config.patch | 0
>> ...move-the-power-of-two-sizeof-struct-cmd_b.patch | 0
>> .../mesa/{mesa-gl_9.1.6.bb => mesa-gl_9.2.2.bb} | 0
>> meta/recipes-graphics/mesa/mesa.inc | 2 +-
>> ...void-use-of-AC_CHECK_FILE-for-cross-compi.patch | 65 ----
>> ...ate-NativeDisplayType-depending-on-config.patch | 359 ---------------------
>> ...sl-fix-builtin_compiler-cross-compilation.patch | 54 ----
>> .../mesa/0005-fix-out-of-tree-builds-gallium.patch | 42 ---
>> .../mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb} | 9 +-
>> 9 files changed, 3 insertions(+), 528 deletions(-)
>> rename meta/recipes-graphics/mesa/{mesa-9.1.6 => mesa-9.2.2}/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch (100%)
>> rename meta/recipes-graphics/mesa/{mesa-9.1.6 => mesa-9.2.2}/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch (100%)
>> rename meta/recipes-graphics/mesa/{mesa-gl_9.1.6.bb => mesa-gl_9.2.2.bb} (100%)
>> delete mode 100644 meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
>> delete mode 100644 meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
>> delete mode 100644 meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch
>> delete mode 100644 meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
>> rename meta/recipes-graphics/mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb} (34%)
>>
>> --
>> 1.8.3.2
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH] Mesa: upgrade to 9.2.2
2013-10-24 13:28 ` Valentin Popa
@ 2013-10-24 13:30 ` Burton, Ross
2013-10-24 13:35 ` Valentin Popa
2013-10-25 12:00 ` Valentin Popa
0 siblings, 2 replies; 16+ messages in thread
From: Burton, Ross @ 2013-10-24 13:30 UTC (permalink / raw)
To: Valentin Popa; +Cc: OE-core
Hi,
x11 is a default DISTRO_FEATURE in oe-core (as otherwise sato won't
build...), so you'll have to remove it to test builds without X.
Ross
On 24 October 2013 14:28, Valentin Popa <valentin.popa@intel.com> wrote:
> I thought that if I don't specify DISTRO_FEATURES_append = " x11"
> it will not include it. I will try with DISTRO_FEATURES_remove="x11"
> end see what's happening.
>
>
>
> On 10/24/2013 04:11 PM, Burton, Ross wrote:
>>
>> Hi Valentin,
>>
>> Did you try a weston build without X11, i.e. core-image-weston with
>> DISTRO_FEATURES_remove="x11"?
>>
>> Ross
>>
>> On 24 October 2013 11:32, Valentin Popa <valentin.popa@intel.com> wrote:
>>>
>>> Tested with core-image-sato core-image-weston core-image-clutter;
>>> All cogl and weston examples run successfully.
>>>
>>> Valentin Popa (1):
>>> Mesa: upgrade to 9.2.2
>>>
>>> ...ate-NativeDisplayType-depending-on-config.patch | 0
>>> ...move-the-power-of-two-sizeof-struct-cmd_b.patch | 0
>>> .../mesa/{mesa-gl_9.1.6.bb => mesa-gl_9.2.2.bb} | 0
>>> meta/recipes-graphics/mesa/mesa.inc | 2 +-
>>> ...void-use-of-AC_CHECK_FILE-for-cross-compi.patch | 65 ----
>>> ...ate-NativeDisplayType-depending-on-config.patch | 359
>>> ---------------------
>>> ...sl-fix-builtin_compiler-cross-compilation.patch | 54 ----
>>> .../mesa/0005-fix-out-of-tree-builds-gallium.patch | 42 ---
>>> .../mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb} | 9 +-
>>> 9 files changed, 3 insertions(+), 528 deletions(-)
>>> rename meta/recipes-graphics/mesa/{mesa-9.1.6 =>
>>> mesa-9.2.2}/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
>>> (100%)
>>> rename meta/recipes-graphics/mesa/{mesa-9.1.6 =>
>>> mesa-9.2.2}/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
>>> (100%)
>>> rename meta/recipes-graphics/mesa/{mesa-gl_9.1.6.bb =>
>>> mesa-gl_9.2.2.bb} (100%)
>>> delete mode 100644
>>> meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
>>> delete mode 100644
>>> meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
>>> delete mode 100644
>>> meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch
>>> delete mode 100644
>>> meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
>>> rename meta/recipes-graphics/mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb}
>>> (34%)
>>>
>>> --
>>> 1.8.3.2
>>>
>>> _______________________________________________
>>> Openembedded-core mailing list
>>> Openembedded-core@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>
>
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH] Mesa: upgrade to 9.2.2
2013-10-24 13:30 ` Burton, Ross
@ 2013-10-24 13:35 ` Valentin Popa
2013-10-25 12:00 ` Valentin Popa
1 sibling, 0 replies; 16+ messages in thread
From: Valentin Popa @ 2013-10-24 13:35 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
Good to know,
Thanks Ross!
On 10/24/2013 04:30 PM, Burton, Ross wrote:
> Hi,
>
> x11 is a default DISTRO_FEATURE in oe-core (as otherwise sato won't
> build...), so you'll have to remove it to test builds without X.
>
> Ross
>
> On 24 October 2013 14:28, Valentin Popa <valentin.popa@intel.com> wrote:
>> I thought that if I don't specify DISTRO_FEATURES_append = " x11"
>> it will not include it. I will try with DISTRO_FEATURES_remove="x11"
>> end see what's happening.
>>
>>
>>
>> On 10/24/2013 04:11 PM, Burton, Ross wrote:
>>> Hi Valentin,
>>>
>>> Did you try a weston build without X11, i.e. core-image-weston with
>>> DISTRO_FEATURES_remove="x11"?
>>>
>>> Ross
>>>
>>> On 24 October 2013 11:32, Valentin Popa <valentin.popa@intel.com> wrote:
>>>> Tested with core-image-sato core-image-weston core-image-clutter;
>>>> All cogl and weston examples run successfully.
>>>>
>>>> Valentin Popa (1):
>>>> Mesa: upgrade to 9.2.2
>>>>
>>>> ...ate-NativeDisplayType-depending-on-config.patch | 0
>>>> ...move-the-power-of-two-sizeof-struct-cmd_b.patch | 0
>>>> .../mesa/{mesa-gl_9.1.6.bb => mesa-gl_9.2.2.bb} | 0
>>>> meta/recipes-graphics/mesa/mesa.inc | 2 +-
>>>> ...void-use-of-AC_CHECK_FILE-for-cross-compi.patch | 65 ----
>>>> ...ate-NativeDisplayType-depending-on-config.patch | 359
>>>> ---------------------
>>>> ...sl-fix-builtin_compiler-cross-compilation.patch | 54 ----
>>>> .../mesa/0005-fix-out-of-tree-builds-gallium.patch | 42 ---
>>>> .../mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb} | 9 +-
>>>> 9 files changed, 3 insertions(+), 528 deletions(-)
>>>> rename meta/recipes-graphics/mesa/{mesa-9.1.6 =>
>>>> mesa-9.2.2}/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
>>>> (100%)
>>>> rename meta/recipes-graphics/mesa/{mesa-9.1.6 =>
>>>> mesa-9.2.2}/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
>>>> (100%)
>>>> rename meta/recipes-graphics/mesa/{mesa-gl_9.1.6.bb =>
>>>> mesa-gl_9.2.2.bb} (100%)
>>>> delete mode 100644
>>>> meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
>>>> delete mode 100644
>>>> meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
>>>> delete mode 100644
>>>> meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch
>>>> delete mode 100644
>>>> meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
>>>> rename meta/recipes-graphics/mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb}
>>>> (34%)
>>>>
>>>> --
>>>> 1.8.3.2
>>>>
>>>> _______________________________________________
>>>> Openembedded-core mailing list
>>>> Openembedded-core@lists.openembedded.org
>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH] Mesa: upgrade to 9.2.2
2013-10-24 13:30 ` Burton, Ross
2013-10-24 13:35 ` Valentin Popa
@ 2013-10-25 12:00 ` Valentin Popa
1 sibling, 0 replies; 16+ messages in thread
From: Valentin Popa @ 2013-10-25 12:00 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core
Tested without X on core-image-weston (+ libGLESv2)
and works great.
On 10/24/2013 04:30 PM, Burton, Ross wrote:
> Hi,
>
> x11 is a default DISTRO_FEATURE in oe-core (as otherwise sato won't
> build...), so you'll have to remove it to test builds without X.
>
> Ross
>
> On 24 October 2013 14:28, Valentin Popa <valentin.popa@intel.com> wrote:
>> I thought that if I don't specify DISTRO_FEATURES_append = " x11"
>> it will not include it. I will try with DISTRO_FEATURES_remove="x11"
>> end see what's happening.
>>
>>
>>
>> On 10/24/2013 04:11 PM, Burton, Ross wrote:
>>> Hi Valentin,
>>>
>>> Did you try a weston build without X11, i.e. core-image-weston with
>>> DISTRO_FEATURES_remove="x11"?
>>>
>>> Ross
>>>
>>> On 24 October 2013 11:32, Valentin Popa <valentin.popa@intel.com> wrote:
>>>> Tested with core-image-sato core-image-weston core-image-clutter;
>>>> All cogl and weston examples run successfully.
>>>>
>>>> Valentin Popa (1):
>>>> Mesa: upgrade to 9.2.2
>>>>
>>>> ...ate-NativeDisplayType-depending-on-config.patch | 0
>>>> ...move-the-power-of-two-sizeof-struct-cmd_b.patch | 0
>>>> .../mesa/{mesa-gl_9.1.6.bb => mesa-gl_9.2.2.bb} | 0
>>>> meta/recipes-graphics/mesa/mesa.inc | 2 +-
>>>> ...void-use-of-AC_CHECK_FILE-for-cross-compi.patch | 65 ----
>>>> ...ate-NativeDisplayType-depending-on-config.patch | 359
>>>> ---------------------
>>>> ...sl-fix-builtin_compiler-cross-compilation.patch | 54 ----
>>>> .../mesa/0005-fix-out-of-tree-builds-gallium.patch | 42 ---
>>>> .../mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb} | 9 +-
>>>> 9 files changed, 3 insertions(+), 528 deletions(-)
>>>> rename meta/recipes-graphics/mesa/{mesa-9.1.6 =>
>>>> mesa-9.2.2}/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
>>>> (100%)
>>>> rename meta/recipes-graphics/mesa/{mesa-9.1.6 =>
>>>> mesa-9.2.2}/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
>>>> (100%)
>>>> rename meta/recipes-graphics/mesa/{mesa-gl_9.1.6.bb =>
>>>> mesa-gl_9.2.2.bb} (100%)
>>>> delete mode 100644
>>>> meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
>>>> delete mode 100644
>>>> meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
>>>> delete mode 100644
>>>> meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch
>>>> delete mode 100644
>>>> meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
>>>> rename meta/recipes-graphics/mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb}
>>>> (34%)
>>>>
>>>> --
>>>> 1.8.3.2
>>>>
>>>> _______________________________________________
>>>> Openembedded-core mailing list
>>>> Openembedded-core@lists.openembedded.org
>>>> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>>
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Mesa: upgrade to 9.2.2
2013-10-24 10:32 [PATCH] Mesa: upgrade to 9.2.2 Valentin Popa
2013-10-24 10:32 ` Valentin Popa
@ 2013-10-29 17:30 ` Saul Wold
2013-11-01 11:56 ` Burton, Ross
1 sibling, 1 reply; 16+ messages in thread
From: Saul Wold @ 2013-10-29 17:30 UTC (permalink / raw)
To: Valentin Popa, openembedded-core
On 10/24/2013 03:32 AM, Valentin Popa wrote:
> * License is still MIT
> * removed patches were already merged or
> another solution was used upstream.
>
> Signed-off-by: Valentin Popa <valentin.popa@intel.com>
> ---
> ...ate-NativeDisplayType-depending-on-config.patch | 0
> ...move-the-power-of-two-sizeof-struct-cmd_b.patch | 0
> .../mesa/{mesa-gl_9.1.6.bb => mesa-gl_9.2.2.bb} | 0
> meta/recipes-graphics/mesa/mesa.inc | 2 +-
> ...void-use-of-AC_CHECK_FILE-for-cross-compi.patch | 65 ----
> ...ate-NativeDisplayType-depending-on-config.patch | 359 ---------------------
> ...sl-fix-builtin_compiler-cross-compilation.patch | 54 ----
> .../mesa/0005-fix-out-of-tree-builds-gallium.patch | 42 ---
> .../mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb} | 9 +-
> 9 files changed, 3 insertions(+), 528 deletions(-)
> rename meta/recipes-graphics/mesa/{mesa-9.1.6 => mesa-9.2.2}/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch (100%)
> rename meta/recipes-graphics/mesa/{mesa-9.1.6 => mesa-9.2.2}/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch (100%)
> rename meta/recipes-graphics/mesa/{mesa-gl_9.1.6.bb => mesa-gl_9.2.2.bb} (100%)
> delete mode 100644 meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
> delete mode 100644 meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
> delete mode 100644 meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch
> delete mode 100644 meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
> rename meta/recipes-graphics/mesa/{mesa_9.1.6.bb => mesa_9.2.2.bb} (34%)
>
I am seeing the following warnings:
WARNING: Unable to get checksum for mesa SRC_URI entry
0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch: file
could not be found
WARNING: Unable to get checksum for mesa SRC_URI entry
0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch: file could
not be found
WARNING: Unable to get checksum for mesa SRC_URI entry
0004-glsl-fix-builtin_compiler-cross-compilation.patch: file could not
be found
WARNING: Unable to get checksum for mesa SRC_URI entry
0005-fix-out-of-tree-builds-gallium.patch: file could not be found
They are from the git recipe which was not updated, but should be when
removing patches.
Also since a resend is needed, please combine the mesa-9.2.2 and mesa
patches into a single mesa directory. I will be sending more email
about this in the next day or so as a clean across the board cleanup.
Thanks
Sau!
> diff --git a/meta/recipes-graphics/mesa/mesa-9.1.6/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch b/meta/recipes-graphics/mesa/mesa-9.2.2/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
> similarity index 100%
> rename from meta/recipes-graphics/mesa/mesa-9.1.6/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
> rename to meta/recipes-graphics/mesa/mesa-9.2.2/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
> diff --git a/meta/recipes-graphics/mesa/mesa-9.1.6/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch b/meta/recipes-graphics/mesa/mesa-9.2.2/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
> similarity index 100%
> rename from meta/recipes-graphics/mesa/mesa-9.1.6/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
> rename to meta/recipes-graphics/mesa/mesa-9.2.2/0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch
> diff --git a/meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb b/meta/recipes-graphics/mesa/mesa-gl_9.2.2.bb
> similarity index 100%
> rename from meta/recipes-graphics/mesa/mesa-gl_9.1.6.bb
> rename to meta/recipes-graphics/mesa/mesa-gl_9.2.2.bb
> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
> index afc795c..5cbf56d 100644
> --- a/meta/recipes-graphics/mesa/mesa.inc
> +++ b/meta/recipes-graphics/mesa/mesa.inc
> @@ -10,7 +10,7 @@ HOMEPAGE = "http://mesa3d.org"
> BUGTRACKER = "https://bugs.freedesktop.org"
> SECTION = "x11"
> LICENSE = "MIT"
> -LIC_FILES_CHKSUM = "file://docs/license.html;md5=42d77d95cba529a3637129be87d6555d"
> +LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf"
>
> INC_PR = "r9"
> PE = "2"
> diff --git a/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch b/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
> deleted file mode 100644
> index 76b5a18..0000000
> --- a/meta/recipes-graphics/mesa/mesa/0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch
> +++ /dev/null
> @@ -1,65 +0,0 @@
> -From e21ce89f7ae6964f196086ff325d79e4a3b5acd8 Mon Sep 17 00:00:00 2001
> -From: Jonathan Liu <net147@gmail.com>
> -Date: Tue, 4 Jun 2013 06:04:44 -0700
> -Subject: [PATCH 1/4] 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 70c598e..67b8c40 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -1630,8 +1630,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
> -@@ -1861,7 +1861,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.
> -@@ -1869,8 +1869,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
> -@@ -1881,7 +1881,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/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch b/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
> deleted file mode 100644
> index 8a83f4b..0000000
> --- a/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
> +++ /dev/null
> @@ -1,359 +0,0 @@
> -From 8d31ae23683394617c49301b039b3a069b9ea436 Mon Sep 17 00:00:00 2001
> -From: Daniel Stone <daniel@fooishbar.org>
> -Date: Fri, 24 May 2013 17:20:27 +0100
> -Subject: [PATCH 3/4] 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.
> -
> -Upstream-Status: Backport (slightly different solution was applied in master
> -https://bugs.freedesktop.org/show_bug.cgi?id=64959)
> -
> -Signed-off-by: Daniel Stone <daniel@fooishbar.org>
> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ----
> - configure.ac | 5 ++
> - include/EGL/eglplatform.h | 146 -------------------------------------------
> - include/EGL/eglplatform.h.in | 146 +++++++++++++++++++++++++++++++++++++++++++
> - 3 files changed, 151 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 67b8c40..afc3217 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -1499,6 +1499,9 @@ EGL_PLATFORMS="$egl_platforms"
> -
> - if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then
> - NEED_WINSYS_XLIB=yes
> -+ 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)
> -@@ -1512,6 +1515,7 @@ AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x")
> - AC_SUBST([EGL_NATIVE_PLATFORM])
> - AC_SUBST([EGL_PLATFORMS])
> - AC_SUBST([EGL_CFLAGS])
> -+AC_SUBST([MESA_EGL_NO_X11_HEADERS])
> -
> - AC_ARG_WITH([egl-driver-dir],
> - [AS_HELP_STRING([--with-egl-driver-dir=DIR],
> -@@ -1991,6 +1995,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.8.2.1
> -
> diff --git a/meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch b/meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch
> deleted file mode 100644
> index 460a274..0000000
> --- a/meta/recipes-graphics/mesa/mesa/0004-glsl-fix-builtin_compiler-cross-compilation.patch
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -From ab38c97f057f739533a4e1fc9de51ea5f4e6242d Mon Sep 17 00:00:00 2001
> -From: Jonathan Liu <net147@gmail.com>
> -Date: Sat, 29 Jun 2013 11:37:20 +0200
> -Subject: [PATCH 4/4] glsl: fix builtin_compiler cross-compilation
> -
> -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>
> ----
> - src/glsl/builtin_compiler/Makefile.am | 13 +++++++++++++
> - 1 file changed, 13 insertions(+)
> -
> -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
> ---
> -1.8.2.1
> -
> diff --git a/meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch b/meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
> deleted file mode 100644
> index 8c5984f..0000000
> --- a/meta/recipes-graphics/mesa/mesa/0005-fix-out-of-tree-builds-gallium.patch
> +++ /dev/null
> @@ -1,42 +0,0 @@
> -Upstream-Status: Submitted
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> -
> -From 9e31e15ebb0adbf3cc0394c30cbc1ccd2b35a27f Mon Sep 17 00:00:00 2001
> -From: Ross Burton <ross.burton@intel.com>
> -Date: Fri, 28 Jun 2013 11:44:58 +0100
> -Subject: [PATCH] build: fix out-of-tree builds in gallium/auxiliary
> -
> -The rules were writing files to e.g. util/u_indices_gen.py, but in an
> -out-of-tree build this directory doesn't exist in the build directory. So,
> -create the directories just in case.
> -
> -Signed-off-by: Ross Burton <ross.burton@intel.com>
> ----
> - src/gallium/auxiliary/Makefile.am | 4 ++++
> - 1 file changed, 4 insertions(+)
> -
> -diff --git a/src/gallium/auxiliary/Makefile.am b/src/gallium/auxiliary/Makefile.am
> -index f14279b..0c3e7ba 100644
> ---- a/src/gallium/auxiliary/Makefile.am
> -+++ b/src/gallium/auxiliary/Makefile.am
> -@@ -38,13 +38,17 @@ libgallium_la_SOURCES += \
> - endif
> -
> - indices/u_indices_gen.c: $(srcdir)/indices/u_indices_gen.py
> -+ mkdir --parents indices
> - $(AM_V_GEN) $(PYTHON2) $< > $@
> -
> - indices/u_unfilled_gen.c: $(srcdir)/indices/u_unfilled_gen.py
> -+ mkdir --parents indices
> - $(AM_V_GEN) $(PYTHON2) $< > $@
> -
> - util/u_format_srgb.c: $(srcdir)/util/u_format_srgb.py
> -+ mkdir --parents util
> - $(AM_V_GEN) $(PYTHON2) $< > $@
> -
> - util/u_format_table.c: $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format_pack.py $(srcdir)/util/u_format_parse.py $(srcdir)/util/u_format.csv
> -+ mkdir --parents util
> - $(AM_V_GEN) $(PYTHON2) $(srcdir)/util/u_format_table.py $(srcdir)/util/u_format.csv > $@
> ---
> -1.7.10.4
> -
> diff --git a/meta/recipes-graphics/mesa/mesa_9.1.6.bb b/meta/recipes-graphics/mesa/mesa_9.2.2.bb
> similarity index 34%
> rename from meta/recipes-graphics/mesa/mesa_9.1.6.bb
> rename to meta/recipes-graphics/mesa/mesa_9.2.2.bb
> index b55fa02..60eba01 100644
> --- a/meta/recipes-graphics/mesa/mesa_9.1.6.bb
> +++ b/meta/recipes-graphics/mesa/mesa_9.2.2.bb
> @@ -1,16 +1,11 @@
> require ${BPN}.inc
>
> SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
> - file://0001-configure-Avoid-use-of-AC_CHECK_FILE-for-cross-compi.patch \
> file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \
> - file://0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch \
> - file://0004-glsl-fix-builtin_compiler-cross-compilation.patch \
> - file://0005-llvmpipe-remove-the-power-of-two-sizeof-struct-cmd_b.patch \
> - file://0005-fix-out-of-tree-builds-gallium.patch \
> file://0006-fix-out-of-tree-egl.patch \
> "
>
> -SRC_URI[md5sum] = "443a2a352667294b53d56cb1a74114e9"
> -SRC_URI[sha256sum] = "e632dff0acafad0a59dc208d16dedb37f7bd58f94c5d58c4b51912e41d005e3d"
> +SRC_URI[md5sum] = "20887f8020db7d1736a01ae9cd5d8c38"
> +SRC_URI[sha256sum] = "c78a5035233672844cf2492fe82dc10877e12026be227d04469d6ca6ac656a3d"
>
> S = "${WORKDIR}/Mesa-${PV}"
>
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH] Mesa: upgrade to 9.2.2
2013-10-29 17:30 ` Saul Wold
@ 2013-11-01 11:56 ` Burton, Ross
0 siblings, 0 replies; 16+ messages in thread
From: Burton, Ross @ 2013-11-01 11:56 UTC (permalink / raw)
To: Saul Wold; +Cc: OE-core
On 29 October 2013 17:30, Saul Wold <sgw@linux.intel.com> wrote:
> Also since a resend is needed, please combine the mesa-9.2.2 and mesa
> patches into a single mesa directory. I will be sending more email about
> this in the next day or so as a clean across the board cleanup.
In the Mesa case there were previously two directories because some
patches were common and some were version-specific.
Ross
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Mesa: upgrade to 9.2.2
@ 2014-01-08 17:38 Martin Jansa
2014-01-22 12:28 ` Valentin Popa
0 siblings, 1 reply; 16+ messages in thread
From: Martin Jansa @ 2014-01-08 17:38 UTC (permalink / raw)
To: Valentin Popa; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 624 bytes --]
Hi,
since this patch:
commit 263e654e5d28fa7f6b0c8cc23f57a31448e88a40
Author: Valentin Popa <valentin.popa@intel.com>
Date: Wed Oct 30 12:27:39 2013 +0200
Mesa: upgrade to 9.2.2
* License is still MIT
* removed patches were already merged or
another solution was backported.
I have to define MESA_EGL_NO_X11_HEADERS in qtbase and qtwebkit again to
build them without xlib.h available (DISTRO without x11 in
DISTRO_FEATURES).
Are you sure that
meta/recipes-graphics/mesa/mesa-9.1.6/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
was resolved in upstream?
Regards,
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread* Re: [PATCH] Mesa: upgrade to 9.2.2
2014-01-08 17:38 Martin Jansa
@ 2014-01-22 12:28 ` Valentin Popa
2014-01-22 12:48 ` Valentin Popa
0 siblings, 1 reply; 16+ messages in thread
From: Valentin Popa @ 2014-01-22 12:28 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 01/08/2014 07:38 PM, Martin Jansa wrote:
> Hi,
>
> since this patch:
> commit 263e654e5d28fa7f6b0c8cc23f57a31448e88a40
> Author: Valentin Popa <valentin.popa@intel.com>
> Date: Wed Oct 30 12:27:39 2013 +0200
>
> Mesa: upgrade to 9.2.2
>
> * License is still MIT
> * removed patches were already merged or
> another solution was backported.
>
> I have to define MESA_EGL_NO_X11_HEADERS in qtbase and qtwebkit again to
> build them without xlib.h available (DISTRO without x11 in
> DISTRO_FEATURES).
>
> Are you sure that
> meta/recipes-graphics/mesa/mesa-9.1.6/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
> was resolved in upstream?
>
> Regards,
Hi,
Sorry for this late response,
I removed that patch after testing wayland without X and worked.
I've tried yesterday to build qtbase (meta-qt5) to see exactly what's
the problem and determine if indeed part of that patch has to be
upstream, but it was failing for not finding libGL (which of course, we
don't build with mesa when DISTRO_FEATURES_remove="x11". Just not having
X11 in DISTRO_FEATURES doesn't mean you'll not have it).
Can you please give me some info about your config vars or your
environment so I find out what's the problem!? (I'm trying to reproduce
the issue).
Thanks for rising the issue!
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Mesa: upgrade to 9.2.2
2014-01-22 12:28 ` Valentin Popa
@ 2014-01-22 12:48 ` Valentin Popa
2014-01-22 12:57 ` Martin Jansa
0 siblings, 1 reply; 16+ messages in thread
From: Valentin Popa @ 2014-01-22 12:48 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 01/22/2014 02:28 PM, Valentin Popa wrote:
> On 01/08/2014 07:38 PM, Martin Jansa wrote:
>> Hi,
>>
>> since this patch:
>> commit 263e654e5d28fa7f6b0c8cc23f57a31448e88a40
>> Author: Valentin Popa <valentin.popa@intel.com>
>> Date: Wed Oct 30 12:27:39 2013 +0200
>>
>> Mesa: upgrade to 9.2.2
>>
>> * License is still MIT
>> * removed patches were already merged or
>> another solution was backported.
>>
>> I have to define MESA_EGL_NO_X11_HEADERS in qtbase and qtwebkit again to
>> build them without xlib.h available (DISTRO without x11 in
>> DISTRO_FEATURES).
>>
>> Are you sure that
>> meta/recipes-graphics/mesa/mesa-9.1.6/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
>>
>> was resolved in upstream?
>>
>> Regards,
> Hi,
> Sorry for this late response,
> I removed that patch after testing wayland without X and worked.
> I've tried yesterday to build qtbase (meta-qt5) to see exactly what's
> the problem and determine if indeed part of that patch has to be
> upstream, but it was failing for not finding libGL (which of course,
> we don't build with mesa when
I meant: libGL is not built together with the other mesa libraries when
DISTRO_FEATURES_remove="x11" .
> DISTRO_FEATURES_remove="x11". Just not having X11 in DISTRO_FEATURES
> doesn't mean you'll not have it).
> Can you please give me some info about your config vars or your
> environment so I find out what's the problem!? (I'm trying to
> reproduce the issue).
>
> Thanks for rising the issue!
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Mesa: upgrade to 9.2.2
2014-01-22 12:48 ` Valentin Popa
@ 2014-01-22 12:57 ` Martin Jansa
2014-01-22 14:52 ` Otavio Salvador
2014-01-22 15:06 ` Valentin Popa
0 siblings, 2 replies; 16+ messages in thread
From: Martin Jansa @ 2014-01-22 12:57 UTC (permalink / raw)
To: Valentin Popa; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 3892 bytes --]
On Wed, Jan 22, 2014 at 02:48:44PM +0200, Valentin Popa wrote:
> On 01/22/2014 02:28 PM, Valentin Popa wrote:
> > On 01/08/2014 07:38 PM, Martin Jansa wrote:
> >> Hi,
> >>
> >> since this patch:
> >> commit 263e654e5d28fa7f6b0c8cc23f57a31448e88a40
> >> Author: Valentin Popa <valentin.popa@intel.com>
> >> Date: Wed Oct 30 12:27:39 2013 +0200
> >>
> >> Mesa: upgrade to 9.2.2
> >>
> >> * License is still MIT
> >> * removed patches were already merged or
> >> another solution was backported.
> >>
> >> I have to define MESA_EGL_NO_X11_HEADERS in qtbase and qtwebkit again to
> >> build them without xlib.h available (DISTRO without x11 in
> >> DISTRO_FEATURES).
> >>
> >> Are you sure that
> >> meta/recipes-graphics/mesa/mesa-9.1.6/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
> >>
> >> was resolved in upstream?
> >>
> >> Regards,
> > Hi,
> > Sorry for this late response,
> > I removed that patch after testing wayland without X and worked.
> > I've tried yesterday to build qtbase (meta-qt5) to see exactly what's
> > the problem and determine if indeed part of that patch has to be
> > upstream, but it was failing for not finding libGL (which of course,
> > we don't build with mesa when
> I meant: libGL is not built together with the other mesa libraries when
> DISTRO_FEATURES_remove="x11" .
> > DISTRO_FEATURES_remove="x11". Just not having X11 in DISTRO_FEATURES
> > doesn't mean you'll not have it).
> > Can you please give me some info about your config vars or your
> > environment so I find out what's the problem!? (I'm trying to
> > reproduce the issue).
Hi,
I don't see how building libGL relates to this problem, which is more
about mesa headers trying to include xlib.h which isn't available in
sysroot for DISTRO without x11 DISTRO_FEATURE.
Here is part of my discussion with Ross about this problem, let me know
if it's enough for you to see what the problem is:
18:33 < JaMa> rburton: do you still maintain mesa in oe-core?
18:47 < rburton> JaMa: i guess :)
18:47 < JaMa> rburton: http://lists.openembedded.org/pipermail/openembedded-core/2014-January/088072.html
18:48 < JaMa> rburton: I know you were working with upstream on this, so maybe you have better info than Valentin
18:54 < RP> JaMa: you'd be better addressing your email to ross as valentin is away for a few weeks
18:55 < JaMa> ah OK, I've used valentin as author of that commit
20:43 < rburton> JaMa: oh, *that*. noted, will re-open that can of worms tomorrow.
20:43 < rburton> the upstream solution was effectively "use pkgconfig"
20:59 < JaMa> hmm checking if .pc really has that flag :)
21:00 < JaMa> rburton: it's there for gl.pc, but not in gles*.pc, but that doesn't mean it has to be there
21:01 < JaMa> I need to check what that failing build was using in qtbase/qtwebkit
21:04 < rburton> JaMa: if you can mail the build log of what failed, that would be great
21:05 < JaMa> I'll have to simulate that with public layers first :)
21:05 < rburton> heh, yes :)
21:07 < JaMa> looking at qtbase/config.tests/x11/opengl/opengl.pro it just doesn't use pkg-config at all to read gl.pc
21:08 < JaMa> so as soon as -DMESA_EGL_NO_X11_HEADERS was removed from mesa header it can try to load xlib.h
21:09 < rburton> that entire platform thing is mostly arse
21:10 < JaMa> somewhere in ./src/platformsupport/glxconvenience it loads some mesa header which in turn loads xlib.h and fails
21:10 < JaMa> http://patchwork.openembedded.org/patch/60673/ this is basically the same
The conclusion is that if we cannot fix all apps to use pkgconfig when
searching for mesa, can we restore rebased
meta/recipes-graphics/mesa/mesa-9.1.6/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
to fix them automatically?
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Mesa: upgrade to 9.2.2
2014-01-22 12:57 ` Martin Jansa
@ 2014-01-22 14:52 ` Otavio Salvador
2014-01-22 15:06 ` Valentin Popa
1 sibling, 0 replies; 16+ messages in thread
From: Otavio Salvador @ 2014-01-22 14:52 UTC (permalink / raw)
To: Martin Jansa; +Cc: Patches and discussions about the oe-core layer
On Wed, Jan 22, 2014 at 10:57 AM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Jan 22, 2014 at 02:48:44PM +0200, Valentin Popa wrote:
>> On 01/22/2014 02:28 PM, Valentin Popa wrote:
>> > On 01/08/2014 07:38 PM, Martin Jansa wrote:
>> >> Hi,
>> >>
>> >> since this patch:
>> >> commit 263e654e5d28fa7f6b0c8cc23f57a31448e88a40
>> >> Author: Valentin Popa <valentin.popa@intel.com>
>> >> Date: Wed Oct 30 12:27:39 2013 +0200
>> >>
>> >> Mesa: upgrade to 9.2.2
>> >>
>> >> * License is still MIT
>> >> * removed patches were already merged or
>> >> another solution was backported.
>> >>
>> >> I have to define MESA_EGL_NO_X11_HEADERS in qtbase and qtwebkit again to
>> >> build them without xlib.h available (DISTRO without x11 in
>> >> DISTRO_FEATURES).
>> >>
>> >> Are you sure that
>> >> meta/recipes-graphics/mesa/mesa-9.1.6/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
>> >>
>> >> was resolved in upstream?
>> >>
>> >> Regards,
>> > Hi,
>> > Sorry for this late response,
>> > I removed that patch after testing wayland without X and worked.
>> > I've tried yesterday to build qtbase (meta-qt5) to see exactly what's
>> > the problem and determine if indeed part of that patch has to be
>> > upstream, but it was failing for not finding libGL (which of course,
>> > we don't build with mesa when
>> I meant: libGL is not built together with the other mesa libraries when
>> DISTRO_FEATURES_remove="x11" .
>> > DISTRO_FEATURES_remove="x11". Just not having X11 in DISTRO_FEATURES
>> > doesn't mean you'll not have it).
>> > Can you please give me some info about your config vars or your
>> > environment so I find out what's the problem!? (I'm trying to
>> > reproduce the issue).
>
> Hi,
>
> I don't see how building libGL relates to this problem, which is more
> about mesa headers trying to include xlib.h which isn't available in
> sysroot for DISTRO without x11 DISTRO_FEATURE.
>
> Here is part of my discussion with Ross about this problem, let me know
> if it's enough for you to see what the problem is:
>
> 18:33 < JaMa> rburton: do you still maintain mesa in oe-core?
> 18:47 < rburton> JaMa: i guess :)
> 18:47 < JaMa> rburton: http://lists.openembedded.org/pipermail/openembedded-core/2014-January/088072.html
> 18:48 < JaMa> rburton: I know you were working with upstream on this, so maybe you have better info than Valentin
> 18:54 < RP> JaMa: you'd be better addressing your email to ross as valentin is away for a few weeks
> 18:55 < JaMa> ah OK, I've used valentin as author of that commit
> 20:43 < rburton> JaMa: oh, *that*. noted, will re-open that can of worms tomorrow.
> 20:43 < rburton> the upstream solution was effectively "use pkgconfig"
> 20:59 < JaMa> hmm checking if .pc really has that flag :)
> 21:00 < JaMa> rburton: it's there for gl.pc, but not in gles*.pc, but that doesn't mean it has to be there
> 21:01 < JaMa> I need to check what that failing build was using in qtbase/qtwebkit
> 21:04 < rburton> JaMa: if you can mail the build log of what failed, that would be great
> 21:05 < JaMa> I'll have to simulate that with public layers first :)
> 21:05 < rburton> heh, yes :)
> 21:07 < JaMa> looking at qtbase/config.tests/x11/opengl/opengl.pro it just doesn't use pkg-config at all to read gl.pc
> 21:08 < JaMa> so as soon as -DMESA_EGL_NO_X11_HEADERS was removed from mesa header it can try to load xlib.h
> 21:09 < rburton> that entire platform thing is mostly arse
> 21:10 < JaMa> somewhere in ./src/platformsupport/glxconvenience it loads some mesa header which in turn loads xlib.h and fails
> 21:10 < JaMa> http://patchwork.openembedded.org/patch/60673/ this is basically the same
>
> The conclusion is that if we cannot fix all apps to use pkgconfig when
> searching for mesa, can we restore rebased
> meta/recipes-graphics/mesa/mesa-9.1.6/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
> to fix them automatically?
This looks like a plan :-)
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Mesa: upgrade to 9.2.2
2014-01-22 12:57 ` Martin Jansa
2014-01-22 14:52 ` Otavio Salvador
@ 2014-01-22 15:06 ` Valentin Popa
2014-01-22 15:29 ` Burton, Ross
1 sibling, 1 reply; 16+ messages in thread
From: Valentin Popa @ 2014-01-22 15:06 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 01/22/2014 02:57 PM, Martin Jansa wrote:
> On Wed, Jan 22, 2014 at 02:48:44PM +0200, Valentin Popa wrote:
>> On 01/22/2014 02:28 PM, Valentin Popa wrote:
>>> On 01/08/2014 07:38 PM, Martin Jansa wrote:
>>>> Hi,
>>>>
>>>> since this patch:
>>>> commit 263e654e5d28fa7f6b0c8cc23f57a31448e88a40
>>>> Author: Valentin Popa <valentin.popa@intel.com>
>>>> Date: Wed Oct 30 12:27:39 2013 +0200
>>>>
>>>> Mesa: upgrade to 9.2.2
>>>>
>>>> * License is still MIT
>>>> * removed patches were already merged or
>>>> another solution was backported.
>>>>
>>>> I have to define MESA_EGL_NO_X11_HEADERS in qtbase and qtwebkit again to
>>>> build them without xlib.h available (DISTRO without x11 in
>>>> DISTRO_FEATURES).
>>>>
>>>> Are you sure that
>>>> meta/recipes-graphics/mesa/mesa-9.1.6/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
>>>>
>>>> was resolved in upstream?
>>>>
>>>> Regards,
>>> Hi,
>>> Sorry for this late response,
>>> I removed that patch after testing wayland without X and worked.
>>> I've tried yesterday to build qtbase (meta-qt5) to see exactly what's
>>> the problem and determine if indeed part of that patch has to be
>>> upstream, but it was failing for not finding libGL (which of course,
>>> we don't build with mesa when
>> I meant: libGL is not built together with the other mesa libraries when
>> DISTRO_FEATURES_remove="x11" .
>>> DISTRO_FEATURES_remove="x11". Just not having X11 in DISTRO_FEATURES
>>> doesn't mean you'll not have it).
>>> Can you please give me some info about your config vars or your
>>> environment so I find out what's the problem!? (I'm trying to
>>> reproduce the issue).
> Hi,
>
> I don't see how building libGL relates to this problem, which is more
that was my problem trying to build qtbase
> about mesa headers trying to include xlib.h which isn't available in
> sysroot for DISTRO without x11 DISTRO_FEATURE.
>
> Here is part of my discussion with Ross about this problem, let me know
> if it's enough for you to see what the problem is:
>
> 18:33 < JaMa> rburton: do you still maintain mesa in oe-core?
> 18:47 < rburton> JaMa: i guess :)
> 18:47 < JaMa> rburton: http://lists.openembedded.org/pipermail/openembedded-core/2014-January/088072.html
> 18:48 < JaMa> rburton: I know you were working with upstream on this, so maybe you have better info than Valentin
> 18:54 < RP> JaMa: you'd be better addressing your email to ross as valentin is away for a few weeks
> 18:55 < JaMa> ah OK, I've used valentin as author of that commit
> 20:43 < rburton> JaMa: oh, *that*. noted, will re-open that can of worms tomorrow.
> 20:43 < rburton> the upstream solution was effectively "use pkgconfig"
> 20:59 < JaMa> hmm checking if .pc really has that flag :)
> 21:00 < JaMa> rburton: it's there for gl.pc, but not in gles*.pc, but that doesn't mean it has to be there
> 21:01 < JaMa> I need to check what that failing build was using in qtbase/qtwebkit
> 21:04 < rburton> JaMa: if you can mail the build log of what failed, that would be great
> 21:05 < JaMa> I'll have to simulate that with public layers first :)
> 21:05 < rburton> heh, yes :)
> 21:07 < JaMa> looking at qtbase/config.tests/x11/opengl/opengl.pro it just doesn't use pkg-config at all to read gl.pc
> 21:08 < JaMa> so as soon as -DMESA_EGL_NO_X11_HEADERS was removed from mesa header it can try to load xlib.h
> 21:09 < rburton> that entire platform thing is mostly arse
> 21:10 < JaMa> somewhere in ./src/platformsupport/glxconvenience it loads some mesa header which in turn loads xlib.h and fails
> 21:10 < JaMa> http://patchwork.openembedded.org/patch/60673/ this is basically the same
>
> The conclusion is that if we cannot fix all apps to use pkgconfig when
> searching for mesa, can we restore rebased
> meta/recipes-graphics/mesa/mesa-9.1.6/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
> to fix them automatically?
>
Nice reply, now I know what's the problem!
You are right, for an app that doesn't use pkgconfig this patch is a must .
I'll put the patch back.
Thanks !
^ permalink raw reply [flat|nested] 16+ messages in thread
* Re: [PATCH] Mesa: upgrade to 9.2.2
2014-01-22 15:06 ` Valentin Popa
@ 2014-01-22 15:29 ` Burton, Ross
0 siblings, 0 replies; 16+ messages in thread
From: Burton, Ross @ 2014-01-22 15:29 UTC (permalink / raw)
To: Valentin Popa; +Cc: OE-core
On 22 January 2014 15:06, Valentin Popa <valentin.popa@intel.com> wrote:
>> The conclusion is that if we cannot fix all apps to use pkgconfig when
>> searching for mesa, can we restore rebased
>>
>> meta/recipes-graphics/mesa/mesa-9.1.6/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch
>> to fix them automatically?
>>
> Nice reply, now I know what's the problem!
> You are right, for an app that doesn't use pkgconfig this patch is a must .
> I'll put the patch back.
Please engage with upstream here as patches to the build system are
always a pain to work with going forwards. The problem is that
upstream doesn't really have a build system maintainer but if you
harass enough people you'll get somewhere. :) If you try in the mesa
IRC channel find daniels - he wrote that patch originally and should
have some more feedback or advice on how to get it integrated. Tell
him I sent you. :)
Ross
^ permalink raw reply [flat|nested] 16+ messages in thread
end of thread, other threads:[~2014-01-22 15:30 UTC | newest]
Thread overview: 16+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-24 10:32 [PATCH] Mesa: upgrade to 9.2.2 Valentin Popa
2013-10-24 10:32 ` Valentin Popa
2013-10-24 13:11 ` Burton, Ross
2013-10-24 13:28 ` Valentin Popa
2013-10-24 13:30 ` Burton, Ross
2013-10-24 13:35 ` Valentin Popa
2013-10-25 12:00 ` Valentin Popa
2013-10-29 17:30 ` Saul Wold
2013-11-01 11:56 ` Burton, Ross
-- strict thread matches above, loose matches on Subject: below --
2014-01-08 17:38 Martin Jansa
2014-01-22 12:28 ` Valentin Popa
2014-01-22 12:48 ` Valentin Popa
2014-01-22 12:57 ` Martin Jansa
2014-01-22 14:52 ` Otavio Salvador
2014-01-22 15:06 ` Valentin Popa
2014-01-22 15:29 ` Burton, Ross
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox