From b7b3e6d3c2e04aefba4b127fcc337d0530bc1694 Mon Sep 17 00:00:00 2001 From: Fabio Berton Date: Tue, 6 Feb 2018 10:33:24 -0200 Subject: [PATCH] mesa: Upgrade to version 17.3.3 Add recipe from OE-Core master branch to get latest mesa version. This commit add the following changes: - c97acbd034 meta: don't use deprecated functions from utils.bbclass - f878741d22 mesa: link mesautil with pthreads - 4e3e181dbe mesa: Upgrade 17.3.2 -> 17.3.3 release - 287446f5c0 mesa: improve build reproducibility - aabb3bc2e1 mesa: Upgrade to 17.3.2 release - 75ec119eab mesa: Upgrade to 17.3.1 release - 7e924e1607 mesa: Upgrade to 17.2.6 stable release - 23bc53b689 mesa/screen: change patch status - 638b4ac527 mesa: Upgrade to 17.2.5 - 77e79af423 mesa: Upgrade to 17.2.4 release The patch Use-Python-3-to-execute-the-scripts.patch was removed to avoid build failure. Change-Id: I757ad77b6ed0c0bde2263c9d653b7324ae72b85a Signed-off-by: Fabio Berton --- ...am-explictly-add-lib-expat-to-intel-.patch | 3 +- ...fix-build-after-LLVM-5.0-SVN-r300718.patch | 40 -------------- ...v_icd.py-improve-reproducible-builds.patch | 27 ++++++++++ ...-configure.ac-Always-check-for-expat.patch | 51 ------------------ .../0001-link-mesautil-with-pthreads.patch | 54 +++++++++++++++++++ ...m-Fix-build-against-LLVM-SVN-r302589.patch | 49 ----------------- .../mesa/files/llvm-config-version.patch | 39 ++++++++------ .../replace_glibc_check_with_linux.patch | 12 +++-- .../mesa/files/vulkan-mkdir.patch | 37 ------------- .../{mesa-gl_17.1.7.bb => mesa-gl_17.3.3.bb} | 0 meta/recipes-graphics/mesa/mesa.inc | 6 +-- .../mesa/{mesa_17.1.7.bb => mesa_17.3.3.bb} | 11 ++-- 12 files changed, 122 insertions(+), 207 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch create mode 100644 meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch delete mode 100644 meta/recipes-graphics/mesa/files/0001-configure.ac-Always-check-for-expat.patch create mode 100644 meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch delete mode 100644 meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch delete mode 100644 meta/recipes-graphics/mesa/files/vulkan-mkdir.patch rename meta/recipes-graphics/mesa/{mesa-gl_17.1.7.bb => mesa-gl_17.3.3.bb} (100%) rename meta/recipes-graphics/mesa/{mesa_17.1.7.bb => mesa_17.3.3.bb} (70%) 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 bd1e863491..ff8eda458c 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 @@ -20,7 +20,8 @@ undefined reference to `XML_GetCurrentLineNumber' explictly add EXPAT_LIBS to intel's VULKAN_LIB_DEPS -Upstream-Status: Submitted [mesa-dev@lists.freedesktop.org] +Upstream-Status: Accepted +https://cgit.freedesktop.org/mesa/mesa/commit/?id=05fc62d89f59ce19a18bfd4e63a09624910d6caf Signed-off-by: Hongxu Jia --- diff --git a/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch b/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch deleted file mode 100644 index b27a3bc8e4..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9861437e58fdd0de01193a102608d34e5952953f Mon Sep 17 00:00:00 2001 -From: Christoph Haag -Date: Thu, 20 Apr 2017 10:34:18 +0200 -Subject: [PATCH 1/2] ac: fix build after LLVM 5.0 SVN r300718 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -v2: previously getWithDereferenceableBytes() exists, but addAttr() doesn't take that type - -Signed-off-by: Christoph Haag -Reviewed-by: Nicolai Hähnle -Tested-and-reviewed-by: Mike Lothian ---- -Upstream-Status: Backport - - src/amd/common/ac_llvm_helper.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/amd/common/ac_llvm_helper.cpp b/src/amd/common/ac_llvm_helper.cpp -index d9ea4b1..11fa809 100644 ---- a/src/amd/common/ac_llvm_helper.cpp -+++ b/src/amd/common/ac_llvm_helper.cpp -@@ -44,9 +44,13 @@ typedef AttributeSet AttributeList; - void ac_add_attr_dereferenceable(LLVMValueRef val, uint64_t bytes) - { - llvm::Argument *A = llvm::unwrap(val); -+#if HAVE_LLVM < 0x0500 - llvm::AttrBuilder B; - B.addDereferenceableAttr(bytes); - A->addAttr(llvm::AttributeList::get(A->getContext(), A->getArgNo() + 1, B)); -+#else -+ A->addAttr(llvm::Attribute::getWithDereferenceableBytes(A->getContext(), bytes)); -+#endif - } - - bool ac_is_sgpr_param(LLVMValueRef arg) --- -2.13.3 - diff --git a/meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch b/meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch new file mode 100644 index 0000000000..da7a81f253 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-anv_icd.py-improve-reproducible-builds.patch @@ -0,0 +1,27 @@ +From b474abdd91158a52821c34865277d7de38880529 Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" +Date: Wed, 17 Jan 2018 15:53:29 +0200 +Subject: [PATCH] anv_icd.py: improve reproducible builds + +Sort the output to ensure reproducibility + +Upstream-Status: Pending + +Signed-off-by: Maxin B. John +--- + src/intel/vulkan/anv_icd.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/intel/vulkan/anv_icd.py b/src/intel/vulkan/anv_icd.py +index 4ed01fa..31bb068 100644 +--- a/src/intel/vulkan/anv_icd.py ++++ b/src/intel/vulkan/anv_icd.py +@@ -44,4 +44,4 @@ if __name__ == '__main__': + } + + with open(args.out, 'w') as f: +- json.dump(json_data, f, indent = 4) ++ json.dump(json_data, f, indent = 4, sort_keys=True) +-- +2.4.0 + diff --git a/meta/recipes-graphics/mesa/files/0001-configure.ac-Always-check-for-expat.patch b/meta/recipes-graphics/mesa/files/0001-configure.ac-Always-check-for-expat.patch deleted file mode 100644 index 4753c49d22..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-configure.ac-Always-check-for-expat.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1f7d752193f02d15d5923cee992e8f46d4c6df1b Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Mon, 28 Aug 2017 13:51:49 +0300 -Subject: [PATCH] configure.ac: Always check for expat - -expat was not checked if dri was not built leading to build failure -in vulkan driver: backport a fix (a combination of multiple commits -that should end up in 17.3). - -Upstream-Status: Backport -Signed-off-by: Jussi Kukkonen ---- - configure.ac | 15 ++++++--------- - 1 file changed, 6 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fd346c8aa2..662faecefa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1777,6 +1777,12 @@ if test "x$with_dri_drivers" = xno; then - with_dri_drivers='' - fi - -+# Check for expat -+PKG_CHECK_MODULES([EXPAT], [expat]) -+PKG_CHECK_MODULES([EXPAT], [expat],, -+ [PKG_CHECK_MODULES([EXPAT], [expat21])] -+) -+ - dnl If $with_dri_drivers is yes, drivers will be added through - dnl platform checks. Set DEFINES and LIB_DEPS - if test "x$enable_dri" = xyes; then -@@ -1810,15 +1816,6 @@ if test "x$enable_dri" = xyes; then - with_dri_drivers="i915 i965 nouveau r200 radeon swrast" - fi - -- # Check for expat -- PKG_CHECK_MODULES([EXPAT], [expat], [], -- # expat version 2.0 and earlier do not provide expat.pc -- [AC_CHECK_HEADER([expat.h],[], -- [AC_MSG_ERROR([Expat headers required for DRI not found])]) -- AC_CHECK_LIB([expat],[XML_ParserCreate],[], -- [AC_MSG_ERROR([Expat library required for DRI not found])]) -- EXPAT_LIBS="-lexpat"]) -- - # put all the necessary libs together - DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS" - fi --- -2.14.1 - diff --git a/meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch b/meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch new file mode 100644 index 0000000000..38ddf49af6 --- /dev/null +++ b/meta/recipes-graphics/mesa/files/0001-link-mesautil-with-pthreads.patch @@ -0,0 +1,54 @@ +Upstream-Status: Backport +Signed-off-by: Randy MacLeod + +From 23ce168048698eeea3df6bb8c9de5be3ca4784cd Mon Sep 17 00:00:00 2001 +From: Igor Gnatenko +Date: Mon, 1 Jan 2018 22:49:00 +0100 +Subject: [PATCH] link mesautil with pthreads + +../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_setname': +/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:66: undefined reference to `pthread_setname_np' +../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `thrd_join': +/builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:336: undefined reference to `pthread_join' +../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_create': +/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:48: undefined reference to `pthread_sigmask' +../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `thrd_create': +/builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:296: undefined reference to `pthread_create' +../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_create': +/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:50: undefined reference to `pthread_sigmask' +/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:50: undefined reference to `pthread_sigmask' +../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `call_once': +/builddir/build/BUILD/mesa-17.3.1/src/util/../../include/c11/threads_posix.h:96: undefined reference to `pthread_once' +../../src/util/.libs/libmesautil.a(libmesautil_la-u_queue.o): In function `u_thread_get_time_nano': +/builddir/build/BUILD/mesa-17.3.1/src/util/../../src/util/u_thread.h:84: undefined reference to `pthread_getcpuclockid' +collect2: error: ld returned 1 exit status + +Reviewed-by: Adam Jackson +Signed-off-by: Igor Gnatenko +--- + src/util/Makefile.am | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/util/Makefile.am b/src/util/Makefile.am +index a5241ad27b..633907b9fd 100644 +--- a/src/util/Makefile.am ++++ b/src/util/Makefile.am +@@ -31,6 +31,7 @@ noinst_LTLIBRARIES = \ + libxmlconfig.la + + AM_CPPFLAGS = \ ++ $(PTHREAD_CFLAGS) \ + -I$(top_srcdir)/include + + libmesautil_la_CPPFLAGS = \ +@@ -50,6 +51,7 @@ libmesautil_la_SOURCES = \ + $(MESA_UTIL_GENERATED_FILES) + + libmesautil_la_LIBADD = \ ++ $(PTHREAD_LIBS) \ + $(CLOCK_LIB) \ + $(ZLIB_LIBS) \ + $(LIBATOMIC_LIBS) +-- +2.14.3 + diff --git a/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch b/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch deleted file mode 100644 index ac8caec74d..0000000000 --- a/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a02a0dfda2712d30ad62b8f0421ec7b8244ba2cb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= -Date: Wed, 10 May 2017 17:26:07 +0900 -Subject: [PATCH 2/2] gallivm: Fix build against LLVM SVN >= r302589 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -deregisterEHFrames doesn't take any parameters anymore. - -Reviewed-by: Vedran Miletić -Reviewed-by: Marek Olšák ---- -Upstream-Status: Backport - - src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index 2a388cb..0e4a531 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -342,14 +342,20 @@ class DelegatingJITMemoryManager : public BaseMemoryManager { - virtual void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) { - mgr()->registerEHFrames(Addr, LoadAddr, Size); - } -- virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) { -- mgr()->deregisterEHFrames(Addr, LoadAddr, Size); -- } - #else - virtual void registerEHFrames(llvm::StringRef SectionData) { - mgr()->registerEHFrames(SectionData); - } - #endif -+#if HAVE_LLVM >= 0x0500 -+ virtual void deregisterEHFrames() { -+ mgr()->deregisterEHFrames(); -+ } -+#elif HAVE_LLVM >= 0x0304 -+ virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) { -+ mgr()->deregisterEHFrames(Addr, LoadAddr, Size); -+ } -+#endif - virtual void *getPointerToNamedFunction(const std::string &Name, - bool AbortOnFailure=true) { - return mgr()->getPointerToNamedFunction(Name, AbortOnFailure); --- -2.13.3 - diff --git a/meta/recipes-graphics/mesa/files/llvm-config-version.patch b/meta/recipes-graphics/mesa/files/llvm-config-version.patch index aa33a1e915..fd79991aab 100644 --- a/meta/recipes-graphics/mesa/files/llvm-config-version.patch +++ b/meta/recipes-graphics/mesa/files/llvm-config-version.patch @@ -1,18 +1,24 @@ -When building llvm from git or svn it embeds the svn/git revision into internal version string +From: Otavio Salvador +Subject: [PATCH] Properly get LLVM version when using LLVM Git releases -$ /mnt/a/oe/build/tmp/work/corei7-64-bec-linux/mesa/2_17.1.5-r0/recipe-sysroot/usr/lib/llvm5.0/llvm-config-host --version +$ 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 +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(-) -Index: mesa-17.1.5/configure.ac -=================================================================== ---- mesa-17.1.5.orig/configure.ac -+++ mesa-17.1.5/configure.ac -@@ -967,7 +967,7 @@ strip_unwanted_llvm_flags() { +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 @@ -21,12 +27,15 @@ Index: mesa-17.1.5/configure.ac LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` LLVM_LIBDIR=`$LLVM_CONFIG --libdir` -@@ -2560,7 +2560,7 @@ if test "x$enable_llvm" = xyes; then +@@ -2644,7 +2644,7 @@ detect_old_buggy_llvm() { + dnl ourselves. dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) - if test "x$enable_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` -+ 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]) + 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 + if test "x$llvm_have_one_so" = xyes; then +-- +2.15.1 + diff --git a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch index 0280ee8599..98f910f89f 100644 --- a/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch +++ b/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch @@ -1,26 +1,28 @@ -endianness check is OS wide and not specific to libc +From: Otavio Salvador +Subject: [PATCH] endianness check is OS wide and not specific to libc -Signed-off-by: Khem Raj Upstream-Status: Pending +Signed-off-by: Khem Raj Signed-off-by: Jussi Kukkonen +Signed-off-by: Otavio Salvador --- src/util/u_endian.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/util/u_endian.h b/src/util/u_endian.h -index b9d563d..2d5eab9 100644 +index 9e09f80181..3148033fae 100644 --- a/src/util/u_endian.h +++ b/src/util/u_endian.h @@ -27,7 +27,7 @@ #ifndef U_ENDIAN_H #define U_ENDIAN_H --#if defined(__GLIBC__) || defined(ANDROID) +-#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__) +#if defined(__linux__) #include #if __BYTE_ORDER == __LITTLE_ENDIAN -- -2.1.4 +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 15ee5eeb14..0000000000 --- a/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status: Submitted -Signed-off-by: Ross Burton - -From c78979fd95a1c4f732f7e6edf0f32c524e5955b8 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Wed, 12 Jul 2017 17:10:07 +0100 -Subject: [PATCH] src/intel/Makefile.vulkan.am: create target directories when - required - -In out-of-tree builds src/intel/vulkan won't exist, so always create it before -writing into it. - -Signed-off-by: Ross Burton ---- - 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 3857a5dc62..26e9cd410c 100644 ---- a/src/intel/Makefile.vulkan.am -+++ b/src/intel/Makefile.vulkan.am -@@ -44,11 +44,13 @@ EXTRA_DIST += \ - vulkan/TODO - - vulkan/dev_icd.json : vulkan/dev_icd.json.in -+ $(MKDIR_GEN) - $(AM_V_GEN) $(SED) \ - -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \ - < $(srcdir)/vulkan/dev_icd.json.in > $@ - - vulkan/intel_icd.@host_cpu@.json : vulkan/intel_icd.json.in -+ $(MKDIR_GEN) - $(AM_V_GEN) $(SED) \ - -e "s#@install_libdir@#${libdir}#" \ - < $(srcdir)/vulkan/intel_icd.json.in > $@ --- -2.11.0 diff --git a/meta/recipes-graphics/mesa/mesa-gl_17.1.7.bb b/meta/recipes-graphics/mesa/mesa-gl_17.3.3.bb similarity index 100% rename from meta/recipes-graphics/mesa/mesa-gl_17.1.7.bb rename to meta/recipes-graphics/mesa/mesa-gl_17.3.3.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 4f31ed255c..c6a25dc59b 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -45,7 +45,7 @@ X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage li # "x11" requires "opengl" PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" -PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm" +PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" DRIDRIVERS = "swrast" DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" @@ -59,7 +59,7 @@ PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto lib VULKAN_DRIVERS = "" VULKAN_DRIVERS_append_x86 = ",intel" VULKAN_DRIVERS_append_x86-64 = ",intel" -PACKAGECONFIG[vulkan] = "--with-vulkan-drivers=${VULKAN_DRIVERS}, --without-vulkan-drivers" +PACKAGECONFIG[vulkan] = "--with-vulkan-drivers=${VULKAN_DRIVERS}, --without-vulkan-drivers, python3-mako-native" PACKAGECONFIG[opengl] = "--enable-opengl, --disable-opengl" @@ -77,7 +77,7 @@ GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnav GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'imx', ',imx', '', d)}" GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" PACKAGECONFIG[r600] = "" -GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" +GALLIUMDRIVERS_LLVM33_ENABLED = "${@oe.utils.version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" diff --git a/meta/recipes-graphics/mesa/mesa_17.1.7.bb b/meta/recipes-graphics/mesa/mesa_17.3.3.bb similarity index 70% rename from meta/recipes-graphics/mesa/mesa_17.1.7.bb rename to meta/recipes-graphics/mesa/mesa_17.3.3.bb index 39cfce992f..9aef0e4385 100644 --- a/meta/recipes-graphics/mesa/mesa_17.1.7.bb +++ b/meta/recipes-graphics/mesa/mesa_17.3.3.bb @@ -5,16 +5,15 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://disable-asm-on-non-gcc.patch \ file://0001-Use-wayland-scanner-in-the-path.patch \ file://0002-hardware-gloat.patch \ - file://vulkan-mkdir.patch \ file://llvm-config-version.patch \ - file://0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch \ - file://0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch \ file://0001-winsys-svga-drm-Include-sys-types.h.patch \ - file://0001-configure.ac-Always-check-for-expat.patch \ file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ + file://0001-anv_icd.py-improve-reproducible-builds.patch \ + file://0001-link-mesautil-with-pthreads.patch \ " -SRC_URI[md5sum] = "e40bb428a263bd28cbf6478dae45b207" -SRC_URI[sha256sum] = "69f472a874b1122404fa0bd13e2d6bf87eb3b9ad9c21d2f39872a96d83d9e5f5" + +SRC_URI[md5sum] = "139b5f608b371c0d4395596162f88791" +SRC_URI[sha256sum] = "41bac5de0ef6adc1f41a1ec0f80c19e361298ce02fa81b5f9ba4fdca33a9379b" #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -- 2.40.1