From f7501d05196a81c6922495dad2fc6ccce46541c6 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 6 Jun 2018 10:45:48 -0300 Subject: mesa: Update 18.0.2 -> 18.1.1 This includes all bugfixes of 18.0.x series and major new features. For list of changes check: https://www.mesa3d.org/relnotes/18.1.0.html https://www.mesa3d.org/relnotes/18.1.1.html Signed-off-by: Otavio Salvador Signed-off-by: Richard Purdie --- ...lkan.am-explictly-add-lib-expat-to-intel-.patch | 18 +++++--- .../0001-Use-wayland-scanner-in-the-path.patch | 34 -------------- .../0001-winsys-svga-drm-Include-sys-types.h.patch | 34 -------------- .../0002-Simplify-wayland-scanner-lookup.patch | 38 ++++++++++++++++ .../mesa/files/0002-hardware-gloat.patch | 51 --------------------- .../0003-winsys-svga-drm-Include-sys-types.h.patch | 32 +++++++++++++ .../mesa/files/0004-hardware-gloat.patch | 52 ++++++++++++++++++++++ ...t-LLVM-version-when-using-LLVM-Git-releas.patch | 44 ++++++++++++++++++ .../0006-Use-Python-3-to-execute-the-scripts.patch | 32 +++++++++++++ .../0007-dri-i965-Add-missing-time.h-include.patch | 36 +++++++++++++++ .../Use-Python-3-to-execute-the-scripts.patch | 32 ------------- .../mesa/files/disable-asm-on-non-gcc.patch | 29 ------------ .../mesa/files/llvm-config-version.patch | 41 ----------------- .../recipes-graphics/mesa/files/vulkan-mkdir.patch | 41 ----------------- meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb | 9 ---- meta/recipes-graphics/mesa/mesa-gl_18.1.1.bb | 9 ++++ meta/recipes-graphics/mesa/mesa_18.0.2.bb | 23 ---------- meta/recipes-graphics/mesa/mesa_18.1.1.bb | 22 +++++++++ 18 files changed, 276 insertions(+), 301 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch delete mode 100644 meta/recipes-graphics/mesa/files/0001-winsys-svga-drm-Include-sys-types.h.patch create mode 100644 meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch delete mode 100644 meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch create mode 100644 meta/recipes-graphics/mesa/files/0003-winsys-svga-drm-Include-sys-types.h.patch create mode 100644 meta/recipes-graphics/mesa/files/0004-hardware-gloat.patch create mode 100644 meta/recipes-graphics/mesa/files/0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch create mode 100644 meta/recipes-graphics/mesa/files/0006-Use-Python-3-to-execute-the-scripts.patch create mode 100644 meta/recipes-graphics/mesa/files/0007-dri-i965-Add-missing-time.h-include.patch delete mode 100644 meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch delete mode 100644 meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch delete mode 100644 meta/recipes-graphics/mesa/files/llvm-config-version.patch delete mode 100644 meta/recipes-graphics/mesa/files/vulkan-mkdir.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_18.1.1.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_18.0.2.bb create mode 100644 meta/recipes-graphics/mesa/mesa_18.1.1.bb diff --git a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch index f908d46550..822066243b 100644 --- a/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch +++ b/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch @@ -1,8 +1,9 @@ -From 342311dbb190735b7b32ab20f81c1d8dbcfe717a Mon Sep 17 00:00:00 2001 +From 327c3dcbfa005f5d1b2fcda07ca1198d65bd23c5 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Wed, 11 Oct 2017 15:40:42 +0800 -Subject: [PATCH] Makefile.vulkan.am: explictly add lib expat to intel +Subject: [PATCH 1/7] Makefile.vulkan.am: explictly add lib expat to intel libvulkan's lib depends +Organization: O.S. Systems Software LTDA. While built with "-fvisibility=default" ... @@ -28,11 +29,11 @@ Signed-off-by: Hongxu Jia src/intel/Makefile.vulkan.am | 1 + 1 file changed, 1 insertion(+) -Index: mesa-17.3.6/src/intel/Makefile.vulkan.am -=================================================================== ---- mesa-17.3.6.orig/src/intel/Makefile.vulkan.am -+++ mesa-17.3.6/src/intel/Makefile.vulkan.am -@@ -144,6 +144,7 @@ VULKAN_LIB_DEPS = \ +diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am +index 4125cb205a..356c4f8452 100644 +--- a/src/intel/Makefile.vulkan.am ++++ b/src/intel/Makefile.vulkan.am +@@ -161,6 +161,7 @@ VULKAN_LIB_DEPS = \ $(LIBDRM_LIBS) \ $(PTHREAD_LIBS) \ $(DLOPEN_LIBS) \ @@ -40,3 +41,6 @@ Index: mesa-17.3.6/src/intel/Makefile.vulkan.am -lm if HAVE_PLATFORM_ANDROID +-- +2.17.1 + diff --git a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch deleted file mode 100644 index 2444b2846b..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -From c908f0c13ac81a3a52140f129a13b2bc997ff4ee Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Tue, 15 Nov 2016 15:20:49 +0200 -Subject: [PATCH] Simplify wayland-scanner lookup - -Don't use pkg-config to lookup the path of a binary that's in the path. - -Alternatively we'd have to prefix the path returned by pkg-config with -PKG_CONFIG_SYSROOT_DIR. - -Upstream-Status: Pending -Signed-off-by: Jussi Kukkonen ---- - configure.ac | 7 +------ - 1 file changed, 1 insertion(+), 6 deletions(-) - -Index: mesa-17.3.6/configure.ac -=================================================================== ---- mesa-17.3.6.orig/configure.ac -+++ mesa-17.3.6/configure.ac -@@ -1694,12 +1694,7 @@ if test "x$with_platforms" = xauto; then - with_platforms=$with_egl_platforms - fi - --PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], -- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, -- WAYLAND_SCANNER='') --if test "x$WAYLAND_SCANNER" = x; then -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) --fi -+AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) - - PKG_CHECK_EXISTS([wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], [have_wayland_protocols=yes], [have_wayland_protocols=no]) - if test "x$have_wayland_protocols" = xyes; then diff --git a/meta/recipes-graphics/mesa/files/0001-winsys-svga-drm-Include-sys-types.h.patch b/meta/recipes-graphics/mesa/files/0001-winsys-svga-drm-Include-sys-types.h.patch deleted file mode 100644 index 549b8671ab..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-winsys-svga-drm-Include-sys-types.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From d8750776404b1031d762966d0f551d13d2fe05a7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 16 Aug 2017 18:58:20 -0700 -Subject: [PATCH] winsys/svga/drm: Include sys/types.h - -vmw_screen.h uses dev_t which is defines in sys/types.h -this header is required to be included for getting dev_t -definition. This issue happens on musl C library, it is hidden -on glibc since sys/types.h is included through another -system headers - -Signed-off-by: Khem Raj ---- - -Upstream-Status: Submitted - - src/gallium/winsys/svga/drm/vmw_screen.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h -index 0ef8e84..2eda97e 100644 ---- a/src/gallium/winsys/svga/drm/vmw_screen.h -+++ b/src/gallium/winsys/svga/drm/vmw_screen.h -@@ -41,6 +41,7 @@ - #include "svga_winsys.h" - #include "pipebuffer/pb_buffer_fenced.h" - #include -+#include - - #define VMW_GMR_POOL_SIZE (16*1024*1024) - #define VMW_QUERY_POOL_SIZE (8192) --- -2.14.1 - diff --git a/meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch b/meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch new file mode 100644 index 0000000000..e7585060ac --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0002-Simplify-wayland-scanner-lookup.patch @@ -0,0 +1,38 @@ +From 135f6ae990df9abe3765ed339f76c55026c86fe5 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen +Date: Tue, 15 Nov 2016 15:20:49 +0200 +Subject: [PATCH 2/7] Simplify wayland-scanner lookup +Organization: O.S. Systems Software LTDA. + +Don't use pkg-config to lookup the path of a binary that's in the path. + +Alternatively we'd have to prefix the path returned by pkg-config with +PKG_CONFIG_SYSROOT_DIR. + +Upstream-Status: Pending +Signed-off-by: Jussi Kukkonen +--- + configure.ac | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) + +diff --git a/configure.ac b/configure.ac +index f1fbdcc6c7..7c95598afc 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1796,12 +1796,7 @@ for plat in $platforms; do + PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) + WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` + +- PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], +- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, +- WAYLAND_SCANNER='') +- if test "x$WAYLAND_SCANNER" = x; then +- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) +- fi ++ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) + + if test "x$WAYLAND_SCANNER" = "x:"; then + AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) +-- +2.17.1 + diff --git a/meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch b/meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch deleted file mode 100644 index 0e014dcc80..0000000000 --- a/meta/recipes-graphics/mesa/files/0002-hardware-gloat.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 00bcd599310dc7fce4fe336ffd85902429051a0c Mon Sep 17 00:00:00 2001 -From: Igor Gnatenko -Date: Sun, 20 Mar 2016 13:27:04 +0100 -Subject: [PATCH 2/4] hardware gloat - -Upstream-Status: Inappropriate [not author] -Signed-off-by: Igor Gnatenko ---- - src/gallium/drivers/llvmpipe/lp_screen.c | 7 +++++++ - src/gallium/drivers/softpipe/sp_screen.c | 7 +++++++ - 2 files changed, 14 insertions(+) - -diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c -index 4f61de8..3b0ec77 100644 ---- a/src/gallium/drivers/llvmpipe/lp_screen.c -+++ b/src/gallium/drivers/llvmpipe/lp_screen.c -@@ -411,6 +411,13 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen, - if (!format_desc) - return FALSE; - -+ if ((bind & PIPE_BIND_RENDER_TARGET) && -+ format != PIPE_FORMAT_R9G9B9E5_FLOAT && -+ format != PIPE_FORMAT_R11G11B10_FLOAT && -+ util_format_is_float(format)) { -+ return FALSE; -+ } -+ - assert(target == PIPE_BUFFER || - target == PIPE_TEXTURE_1D || - target == PIPE_TEXTURE_1D_ARRAY || -diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c -index 031602b..c279120 100644 ---- a/src/gallium/drivers/softpipe/sp_screen.c -+++ b/src/gallium/drivers/softpipe/sp_screen.c -@@ -358,6 +358,13 @@ softpipe_is_format_supported( struct pipe_screen *screen, - if (!format_desc) - return FALSE; - -+ if ((bind & PIPE_BIND_RENDER_TARGET) && -+ format != PIPE_FORMAT_R9G9B9E5_FLOAT && -+ format != PIPE_FORMAT_R11G11B10_FLOAT && -+ util_format_is_float(format)) { -+ return FALSE; -+ } -+ - if (sample_count > 1) - return FALSE; - --- -2.7.4 - diff --git a/meta/recipes-graphics/mesa/files/0003-winsys-svga-drm-Include-sys-types.h.patch b/meta/recipes-graphics/mesa/files/0003-winsys-svga-drm-Include-sys-types.h.patch new file mode 100644 index 0000000000..17368c88fa --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0003-winsys-svga-drm-Include-sys-types.h.patch @@ -0,0 +1,32 @@ +From edb22b2f4df8dab39559ace867c3c67bc12851ae Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 16 Aug 2017 18:58:20 -0700 +Subject: [PATCH 3/7] winsys/svga/drm: Include sys/types.h +Organization: O.S. Systems Software LTDA. + +vmw_screen.h uses dev_t which is defines in sys/types.h +this header is required to be included for getting dev_t +definition. This issue happens on musl C library, it is hidden +on glibc since sys/types.h is included through another +system headers + +Signed-off-by: Khem Raj +--- + src/gallium/winsys/svga/drm/vmw_screen.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h +index f21cabb51f..4c972fdaa9 100644 +--- a/src/gallium/winsys/svga/drm/vmw_screen.h ++++ b/src/gallium/winsys/svga/drm/vmw_screen.h +@@ -41,6 +41,7 @@ + #include "svga_winsys.h" + #include "pipebuffer/pb_buffer_fenced.h" + #include ++#include + + #define VMW_GMR_POOL_SIZE (16*1024*1024) + #define VMW_QUERY_POOL_SIZE (8192) +-- +2.17.1 + diff --git a/meta/recipes-graphics/mesa/files/0004-hardware-gloat.patch b/meta/recipes-graphics/mesa/files/0004-hardware-gloat.patch new file mode 100644 index 0000000000..f23b9875cd --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0004-hardware-gloat.patch @@ -0,0 +1,52 @@ +From 52468545daa0c2d205312e06304d8fb374e0bbf0 Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Sun, 20 Mar 2016 13:27:04 +0100 +Subject: [PATCH 4/7] hardware gloat +Organization: O.S. Systems Software LTDA. + +Upstream-Status: Inappropriate [not author] +Signed-off-by: Igor Gnatenko +--- + src/gallium/drivers/llvmpipe/lp_screen.c | 7 +++++++ + src/gallium/drivers/softpipe/sp_screen.c | 7 +++++++ + 2 files changed, 14 insertions(+) + +diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c +index 3f5d0327bf..86808e016b 100644 +--- a/src/gallium/drivers/llvmpipe/lp_screen.c ++++ b/src/gallium/drivers/llvmpipe/lp_screen.c +@@ -449,6 +449,13 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen, + if (!format_desc) + return FALSE; + ++ if ((bind & PIPE_BIND_RENDER_TARGET) && ++ format != PIPE_FORMAT_R9G9B9E5_FLOAT && ++ format != PIPE_FORMAT_R11G11B10_FLOAT && ++ util_format_is_float(format)) { ++ return FALSE; ++ } ++ + assert(target == PIPE_BUFFER || + target == PIPE_TEXTURE_1D || + target == PIPE_TEXTURE_1D_ARRAY || +diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c +index 25f6f74f36..61629ef2ff 100644 +--- a/src/gallium/drivers/softpipe/sp_screen.c ++++ b/src/gallium/drivers/softpipe/sp_screen.c +@@ -397,6 +397,13 @@ softpipe_is_format_supported( struct pipe_screen *screen, + if (!format_desc) + return FALSE; + ++ if ((bind & PIPE_BIND_RENDER_TARGET) && ++ format != PIPE_FORMAT_R9G9B9E5_FLOAT && ++ format != PIPE_FORMAT_R11G11B10_FLOAT && ++ util_format_is_float(format)) { ++ return FALSE; ++ } ++ + if (sample_count > 1) + return FALSE; + +-- +2.17.1 + diff --git a/meta/recipes-graphics/mesa/files/0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch b/meta/recipes-graphics/mesa/files/0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch new file mode 100644 index 0000000000..94189ac714 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch @@ -0,0 +1,44 @@ +From 33025fb1650768a0b923f3c824c270628eef83db Mon Sep 17 00:00:00 2001 +From: Otavio Salvador +Date: Tue, 5 Jun 2018 11:11:10 -0300 +Subject: [PATCH 5/7] Properly get LLVM version when using LLVM Git releases +Organization: O.S. Systems Software LTDA. + +$ llvm-config-host --version +5.0.0git-9a5c333388c + +We need to ignore everything after 5.0.0 which is what the cut cmd is +doing + +Upstream-Status: Pending +Signed-off-by: Khem Raj +Signed-off-by: Otavio Salvador +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 7c95598afc..c248248c6b 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1075,7 +1075,7 @@ strip_unwanted_llvm_flags() { + + llvm_set_environment_variables() { + if test "x$LLVM_CONFIG" != xno; then +- LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'` ++ LLVM_VERSION=`$LLVM_CONFIG --version | cut -c1-5` + LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` + LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` + LLVM_LIBDIR=`$LLVM_CONFIG --libdir` +@@ -2776,7 +2776,7 @@ detect_old_buggy_llvm() { + dnl ourselves. + dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) + dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, +- LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` ++ LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version | cut -c1-5` + AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) + + if test "x$llvm_have_one_so" = xyes; then +-- +2.17.1 + diff --git a/meta/recipes-graphics/mesa/files/0006-Use-Python-3-to-execute-the-scripts.patch b/meta/recipes-graphics/mesa/files/0006-Use-Python-3-to-execute-the-scripts.patch new file mode 100644 index 0000000000..72ce0a33a0 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0006-Use-Python-3-to-execute-the-scripts.patch @@ -0,0 +1,32 @@ +From 2c6f0c6f83d2012d2ffb64f1caff966497de8f72 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador +Date: Fri, 29 Dec 2017 10:27:59 -0200 +Subject: [PATCH 6/7] Use Python 3 to execute the scripts +Organization: O.S. Systems Software LTDA. + +The MESA build system uses Python 2 but as OE-Core has moved away from +it, we change it to use Python 3 instead. + +Upstream-Status: Inappropriate [ configuration ] + +Signed-off-by: Otavio Salvador +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index c248248c6b..10f199d63c 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -122,7 +122,7 @@ AM_PROG_CC_C_O + AC_PROG_NM + AM_PROG_AS + AX_CHECK_GNU_MAKE +-AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python]) ++AC_CHECK_PROGS([PYTHON2], [python3.5 python3 python]) + AC_PROG_SED + AC_PROG_MKDIR_P + +-- +2.17.1 + diff --git a/meta/recipes-graphics/mesa/files/0007-dri-i965-Add-missing-time.h-include.patch b/meta/recipes-graphics/mesa/files/0007-dri-i965-Add-missing-time.h-include.patch new file mode 100644 index 0000000000..e56d1588fd --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0007-dri-i965-Add-missing-time.h-include.patch @@ -0,0 +1,36 @@ +From 9a25f6e7a0eb8825ab089fdd166dbaee778a4c81 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador +Date: Wed, 6 Jun 2018 09:50:35 -0300 +Subject: [PATCH 7/7] dri: i965: Add missing time.h include +Organization: O.S. Systems Software LTDA. + +This fixes a build error when using musl: + +,---- +| In file included from .../src/mesa/drivers/dri/i965/intel_upload.c:33:0: +| .../src/mesa/drivers/dri/i965/brw_bufmgr.h:132:4: error: unknown type name 'time_t' +| time_t free_time; +| ^~~~~~ +`---- + +Upstream-Status: Pending +Signed-off-by: Otavio Salvador +--- + src/mesa/drivers/dri/i965/brw_bufmgr.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h +index 68f5e0c2c8..5b60a23763 100644 +--- a/src/mesa/drivers/dri/i965/brw_bufmgr.h ++++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h +@@ -37,6 +37,7 @@ + #include + #include + #include ++#include + #include "util/u_atomic.h" + #include "util/list.h" + +-- +2.17.1 + diff --git a/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch b/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch deleted file mode 100644 index 0b4aabf979..0000000000 --- a/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 18c3e684a8259a0644214f88c7ead7fa31573fd9 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador -Date: Fri, 29 Dec 2017 10:27:59 -0200 -Subject: [PATCH] Use Python 3 to execute the scripts -Organization: O.S. Systems Software LTDA. - -The MESA build system uses Python 2 but as OE-Core has moved away from -it, we change it to use Python 3 instead. - -Upstream-Status: Inappropriate [ configuration ] - -Signed-off-by: Otavio Salvador ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index b107f04c2e..055546142d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -114,7 +114,7 @@ AC_PROG_CXX - AM_PROG_CC_C_O - AM_PROG_AS - AX_CHECK_GNU_MAKE --AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python]) -+AC_CHECK_PROGS([PYTHON2], [python3.5 python3 python]) - AC_PROG_SED - AC_PROG_MKDIR_P - --- -2.15.1 - diff --git a/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch b/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch deleted file mode 100644 index d2d67558b6..0000000000 --- a/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch +++ /dev/null @@ -1,29 +0,0 @@ -Configure checks for compiler to be gcc and then it enables asm_offsets -generation. see - -https://cgit.freedesktop.org/mesa/mesa/commit/?id=73c9b4b0e05fc66629ba250846948dc55c0e7a0d - -However, we missed the check when enabling this on cross compilation -when architecture for both host and target is x86 - -Fixes errors like -./gen_matypes > matypes.h -/bin/bash: ./gen_matypes: No such file or directory - --Khem - -Upstream-Status: Submitted - -Index: mesa-12.0.1/configure.ac -=================================================================== ---- mesa-12.0.1.orig/configure.ac -+++ mesa-12.0.1/configure.ac -@@ -732,7 +732,7 @@ test "x$enable_asm" = xno && AC_MSG_RESU - if test "x$enable_asm" = xyes -a "x$cross_compiling" = xyes; then - case "$host_cpu" in - i?86 | x86_64 | amd64) -- if test "x$host_cpu" != "x$target_cpu"; then -+ if test "x$host_cpu" != "x$target_cpu" -o "x$acv_mesa_CLANG" = xyes; then - enable_asm=no - AC_MSG_RESULT([no, cross compiling]) - fi diff --git a/meta/recipes-graphics/mesa/files/llvm-config-version.patch b/meta/recipes-graphics/mesa/files/llvm-config-version.patch deleted file mode 100644 index fd79991aab..0000000000 --- a/meta/recipes-graphics/mesa/files/llvm-config-version.patch +++ /dev/null @@ -1,41 +0,0 @@ -From: Otavio Salvador -Subject: [PATCH] Properly get LLVM version when using LLVM Git releases - -$ llvm-config-host --version -5.0.0git-9a5c333388c - -We need to ignore everything after 5.0.0 which is what the cut cmd is -doing - -Upstream-Status: Pending -Signed-off-by: Khem Raj -Signed-off-by: Otavio Salvador ---- - configure.ac | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index a02173f244..b107f04c2e 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -995,7 +995,7 @@ strip_unwanted_llvm_flags() { - - llvm_set_environment_variables() { - if test "x$LLVM_CONFIG" != xno; then -- LLVM_VERSION=`$LLVM_CONFIG --version | egrep -o '^[[0-9.]]+'` -+ LLVM_VERSION=`$LLVM_CONFIG --version | cut -c1-5` - LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` - LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` - LLVM_LIBDIR=`$LLVM_CONFIG --libdir` -@@ -2644,7 +2644,7 @@ detect_old_buggy_llvm() { - dnl ourselves. - dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) - dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, -- LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` -+ LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version | cut -c1-5` - AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) - - if test "x$llvm_have_one_so" = xyes; then --- -2.15.1 - diff --git a/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch b/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch deleted file mode 100644 index 9922a55b40..0000000000 --- a/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream-Status: Submitted -Signed-off-by: Ross Burton - -From 4854c72bc21486f81712c8693588f7af6c64cf93 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Wed, 9 May 2018 20:41:36 +0100 -Subject: [PATCH] src/intel/Makefile.vulkan.am: add missing MKDIR_GEN - -Out of tree builds can try to write into a directory that doesn't exist yet: - -| Traceback (most recent call last): -| File "../../../mesa-18.0.2/src/intel/vulkan/anv_icd.py", line 46, in -| with open(args.out, 'w') as f: -| IOError: [Errno 2] No such file or directory: 'vulkan/intel_icd.x86_64.json' -| Makefile:4882: recipe for target 'vulkan/intel_icd.x86_64.json' failed - -Add missing MKDIR_GEN calls to solve this. ---- - src/intel/Makefile.vulkan.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am -index 0bcbf0419c..4125cb205a 100644 ---- a/src/intel/Makefile.vulkan.am -+++ b/src/intel/Makefile.vulkan.am -@@ -64,10 +64,12 @@ EXTRA_DIST += \ - vulkan/TODO - - vulkan/dev_icd.json : vulkan/anv_extensions.py vulkan/anv_icd.py -+ $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \ - --lib-path="${abs_top_builddir}/${LIB_DIR}" --out $@ - - vulkan/intel_icd.@host_cpu@.json : vulkan/anv_extensions.py vulkan/anv_icd.py -+ $(MKDIR_GEN) - $(AM_V_GEN)$(PYTHON2) $(srcdir)/vulkan/anv_icd.py \ - --lib-path="${libdir}" --out $@ - --- -2.11.0 - diff --git a/meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb b/meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb deleted file mode 100644 index 73267eb4f0..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_18.0.2.bb +++ /dev/null @@ -1,9 +0,0 @@ -require mesa_${PV}.bb - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -PACKAGECONFIG ??= "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/meta/recipes-graphics/mesa/mesa-gl_18.1.1.bb b/meta/recipes-graphics/mesa/mesa-gl_18.1.1.bb new file mode 100644 index 0000000000..73267eb4f0 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_18.1.1.bb @@ -0,0 +1,9 @@ +require mesa_${PV}.bb + +SUMMARY += " (OpenGL only, no EGL/GLES)" + +PROVIDES = "virtual/libgl virtual/mesa" + +S = "${WORKDIR}/mesa-${PV}" + +PACKAGECONFIG ??= "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/meta/recipes-graphics/mesa/mesa_18.0.2.bb b/meta/recipes-graphics/mesa/mesa_18.0.2.bb deleted file mode 100644 index f2ac38e919..0000000000 --- a/meta/recipes-graphics/mesa/mesa_18.0.2.bb +++ /dev/null @@ -1,23 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ - file://disable-asm-on-non-gcc.patch \ - file://Use-Python-3-to-execute-the-scripts.patch \ - file://0001-Use-wayland-scanner-in-the-path.patch \ - file://0002-hardware-gloat.patch \ - file://llvm-config-version.patch \ - file://0001-winsys-svga-drm-Include-sys-types.h.patch \ - file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ - file://vulkan-mkdir.patch \ - " - -SRC_URI[md5sum] = "3c303da98ec2ce37c795baeba5aee31e" -SRC_URI[sha256sum] = "98fa159768482dc568b9f8bf0f36c7acb823fa47428ffd650b40784f16b9e7b3" - -#because we cannot rely on the fact that all apps will use pkgconfig, -#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -do_install_append() { - if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then - sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} diff --git a/meta/recipes-graphics/mesa/mesa_18.1.1.bb b/meta/recipes-graphics/mesa/mesa_18.1.1.bb new file mode 100644 index 0000000000..aab4a19315 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_18.1.1.bb @@ -0,0 +1,22 @@ +require ${BPN}.inc + +SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ + file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ + file://0002-Simplify-wayland-scanner-lookup.patch \ + file://0003-winsys-svga-drm-Include-sys-types.h.patch \ + file://0004-hardware-gloat.patch \ + file://0005-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \ + file://0006-Use-Python-3-to-execute-the-scripts.patch \ + file://0007-dri-i965-Add-missing-time.h-include.patch \ +" + +SRC_URI[md5sum] = "063468c930ff61d211ece0191874fa95" +SRC_URI[sha256sum] = "d3312a2ede5aac14a47476b208b8e3a401367838330197c4588ab8ad420d7781" + +#because we cannot rely on the fact that all apps will use pkgconfig, +#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER +do_install_append() { + if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)}; then + sed -i -e 's/^#if defined(MESA_EGL_NO_X11_HEADERS)$/#if defined(MESA_EGL_NO_X11_HEADERS) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h + fi +} -- cgit 1.2.3-korg