[OE-core] [PATCH v7 1/4] mesa: Upgrade to 17.2.4 release
Nicolas Dechesne
nicolas.dechesne at linaro.org
Wed Nov 8 16:41:11 UTC 2017
On Wed, Nov 8, 2017 at 2:17 PM, Otavio Salvador <otavio at ossystems.com.br> wrote:
> 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
>
> Signed-off-by: Fabio Berton <fabio.berton at ossystems.com.br>
> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
thanks! I have tested on Dragonboard (freedreno) and the update looks
good to me. I have tested both the mesa and libdrm upgrade
simultaneously, and it's tested with X11 ad kmscube.
Tested-by: Nicolas Dechesne <nicolas.dechesne at linaro.org>
> ---
>
> Changes in v7:
> - fix commit log typo
>
> Changes in v6:
> - update to 17.2.4
>
> Changes in v5:
> - rebase on top of master
>
> Changes in v4:
> - update to 17.2.2
>
> Changes in v3:
> - fix build for wayland
>
> Changes in v2:
> - update to 17.2.1
>
> ...1-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch | 40 ------------------
> ...allivm-Fix-build-against-LLVM-SVN-r302589.patch | 49 ----------------------
> .../mesa/{mesa-gl_17.1.7.bb => mesa-gl_17.2.4.bb} | 0
> meta/recipes-graphics/mesa/mesa.inc | 2 +-
> .../mesa/{mesa_17.1.7.bb => mesa_17.2.4.bb} | 7 ++--
> 5 files changed, 4 insertions(+), 94 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
> rename meta/recipes-graphics/mesa/{mesa-gl_17.1.7.bb => mesa-gl_17.2.4.bb} (100%)
> rename meta/recipes-graphics/mesa/{mesa_17.1.7.bb => mesa_17.2.4.bb} (78%)
>
> 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 <haagch+mesadev at frickel.club>
> -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 <haagch+mesadev at frickel.club>
> -Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
> -Tested-and-reviewed-by: Mike Lothian <mike at fireburn.co.uk>
> ----
> -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<llvm::Argument>(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?= <michel.daenzer at amd.com>
> -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ć <vedran at miletic.net>
> -Reviewed-by: Marek Olšák <marek.olsak at amd.com>
> ----
> -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.2.4.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.2.4.bb
> 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.2.4.bb
> similarity index 78%
> rename from meta/recipes-graphics/mesa/mesa_17.1.7.bb
> rename to meta/recipes-graphics/mesa/mesa_17.2.4.bb
> index 39cfce992f..928cb920af 100644
> --- a/meta/recipes-graphics/mesa/mesa_17.1.7.bb
> +++ b/meta/recipes-graphics/mesa/mesa_17.2.4.bb
> @@ -7,14 +7,13 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \
> 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"
> +
> +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
> --
> 2.15.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
More information about the Openembedded-core
mailing list