From 8d8668a3a229d7268ae50812c41696b342623156 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 8 Nov 2017 11:17:13 -0200 Subject: mesa: Upgrade to 17.2.4 release Upgrade to a new stable release and drop patches applied on upstream. For a full release notes, please see: https://mesa3d.org/relnotes/17.2.0.html https://mesa3d.org/relnotes/17.2.1.html https://mesa3d.org/relnotes/17.2.2.html https://mesa3d.org/relnotes/17.2.3.html https://mesa3d.org/relnotes/17.2.4.html (From OE-Core rev: 77e79af4234ac0e96473d4691fd0f1ca759f3447) Signed-off-by: Fabio Berton Signed-off-by: Otavio Salvador Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- ...1-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch | 40 ------------------ ...allivm-Fix-build-against-LLVM-SVN-r302589.patch | 49 ---------------------- meta/recipes-graphics/mesa/mesa-gl_17.1.7.bb | 9 ---- meta/recipes-graphics/mesa/mesa-gl_17.2.4.bb | 9 ++++ meta/recipes-graphics/mesa/mesa.inc | 2 +- meta/recipes-graphics/mesa/mesa_17.1.7.bb | 25 ----------- meta/recipes-graphics/mesa/mesa_17.2.4.bb | 24 +++++++++++ 7 files changed, 34 insertions(+), 124 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.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/mesa-gl_17.1.7.bb create mode 100644 meta/recipes-graphics/mesa/mesa-gl_17.2.4.bb delete mode 100644 meta/recipes-graphics/mesa/mesa_17.1.7.bb create mode 100644 meta/recipes-graphics/mesa/mesa_17.2.4.bb (limited to 'meta/recipes-graphics') 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/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/mesa-gl_17.1.7.bb b/meta/recipes-graphics/mesa/mesa-gl_17.1.7.bb deleted file mode 100644 index 73267eb4f0..0000000000 --- a/meta/recipes-graphics/mesa/mesa-gl_17.1.7.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_17.2.4.bb b/meta/recipes-graphics/mesa/mesa-gl_17.2.4.bb new file mode 100644 index 0000000000..73267eb4f0 --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa-gl_17.2.4.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.inc b/meta/recipes-graphics/mesa/mesa.inc index 4f31ed255c..cab8e4bfe7 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" diff --git a/meta/recipes-graphics/mesa/mesa_17.1.7.bb b/meta/recipes-graphics/mesa/mesa_17.1.7.bb deleted file mode 100644 index 39cfce992f..0000000000 --- a/meta/recipes-graphics/mesa/mesa_17.1.7.bb +++ /dev/null @@ -1,25 +0,0 @@ -require ${BPN}.inc - -SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ - file://replace_glibc_check_with_linux.patch \ - 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 \ - " -SRC_URI[md5sum] = "e40bb428a263bd28cbf6478dae45b207" -SRC_URI[sha256sum] = "69f472a874b1122404fa0bd13e2d6bf87eb3b9ad9c21d2f39872a96d83d9e5f5" - -#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_17.2.4.bb b/meta/recipes-graphics/mesa/mesa_17.2.4.bb new file mode 100644 index 0000000000..928cb920af --- /dev/null +++ b/meta/recipes-graphics/mesa/mesa_17.2.4.bb @@ -0,0 +1,24 @@ +require ${BPN}.inc + +SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ + file://replace_glibc_check_with_linux.patch \ + 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-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 \ + " + +SRC_URI[md5sum] = "cf0b7a297eedd0549cda5ba071d7561f" +SRC_URI[sha256sum] = "5ba408fecd6e1132e5490eec1a2f04466214e4c65c8b89b331be844768c2e550" + +#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 v1.2.3-54-g00ecf