[arch-commits] Commit in mesa/trunk (4 files)

Laurent Carlier lcarlier at archlinux.org
Thu May 28 06:08:28 UTC 2020


    Date: Thursday, May 28, 2020 @ 06:08:28
  Author: lcarlier
Revision: 387747

upgpkg: mesa 20.1.0-1: upstream update 2.1.0

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch
  mesa/trunk/0001-omx-fix-build-with-gcc-10.patch
  mesa/trunk/0001-swr-Fix-build-with-GCC-10.patch

-----------------------------------------------------------------+
 0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch |   53 ---------
 0001-omx-fix-build-with-gcc-10.patch                            |   40 -------
 0001-swr-Fix-build-with-GCC-10.patch                            |   56 ----------
 PKGBUILD                                                        |   24 ----
 4 files changed, 4 insertions(+), 169 deletions(-)

Deleted: 0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch
===================================================================
--- 0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch	2020-05-28 00:31:57 UTC (rev 387746)
+++ 0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch	2020-05-28 06:08:28 UTC (rev 387747)
@@ -1,53 +0,0 @@
-From 979ae78318c3e37cc0e0579b8d1f05c46bb76e7d Mon Sep 17 00:00:00 2001
-From: Danylo Piliaiev <danylo.piliaiev at globallogic.com>
-Date: Tue, 19 May 2020 20:35:49 +0300
-Subject: [PATCH] meson: Disable GCC's dead store elimination for memory
- zeroing custom new
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Some classes use custom new operator which zeroes memory, however gcc does
-aggressive dead-store elimination which threats all writes to the memory
-before the constructor as "dead stores".
-
-For now we disable this optimization.
-
-The new operators in question are declared via:
- DECLARE_RZALLOC_CXX_OPERATORS
- DECLARE_LINEAR_ZALLOC_CXX_OPERATORS
-
-The issue was found with lto builds, however there is no guarantee that
-it didn't happen with ordinary ones.
-
-CC: <mesa-stable at lists.freedesktop.org>
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2977
-Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/1358
-Signed-off-by: Danylo Piliaiev <danylo.piliaiev at globallogic.com>
-Reviewed-by: Marek Olšák <marek.olsak at amd.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5104>
-(cherry picked from commit 5500a2b7fc558217bbd4c2a966ab6fcadaed8b3b)
-Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
----
- meson.build       | 5 +++++
- 1 files changed, 5 insertions(+), 0 deletion(-)
-
-diff --git a/meson.build b/meson.build
-index ba4fdb2a59f..434684c8bcc 100644
---- a/meson.build
-+++ b/meson.build
-@@ -980,6 +980,11 @@ else
-     '-fno-math-errno',
-     '-fno-trapping-math',
-     '-Qunused-arguments',
-+    # Some classes use custom new operator which zeroes memory, however
-+    # gcc does aggressive dead-store elimination which threats all writes
-+    # to the memory before the constructor as "dead stores".
-+    # For now we disable this optimization.
-+    '-flifetime-dse=1',
-   ]
-   # MinGW chokes on format specifiers and I can't get it all working
-   if not (cc.get_id() == 'gcc' and host_machine.system() == 'windows')
--- 
-2.26.2
-

Deleted: 0001-omx-fix-build-with-gcc-10.patch
===================================================================
--- 0001-omx-fix-build-with-gcc-10.patch	2020-05-28 00:31:57 UTC (rev 387746)
+++ 0001-omx-fix-build-with-gcc-10.patch	2020-05-28 06:08:28 UTC (rev 387747)
@@ -1,40 +0,0 @@
-From 283e815339a15fa99039c69f1e225269790ae955 Mon Sep 17 00:00:00 2001
-From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer at amd.com>
-Date: Thu, 5 Mar 2020 09:37:58 +0100
-Subject: [PATCH] omx: fix build with gcc 10
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-bellagio/omx header files reference a global variable without the
-extern keyworkd.
-Now that gcc-10 enables the '-fno-common' by default the build fails.
-Since these are external headers we can't easily fix them, so for
-now build the omx module with the '-fcommon' flag to keep the
-previous behavior.
-
-See https://gitlab.freedesktop.org/mesa/mesa/issues/2385
-
-Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4058>
-Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
----
- src/gallium/state_trackers/omx/meson.build | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gallium/state_trackers/omx/meson.build b/src/gallium/state_trackers/omx/meson.build
-index 3aa82090c91..987d3e23c84 100644
---- a/src/gallium/state_trackers/omx/meson.build
-+++ b/src/gallium/state_trackers/omx/meson.build
-@@ -65,7 +65,7 @@ endif
- libomx_st = static_library(
-   'omx_st',
-   files_omx,
--  c_args : [c_vis_args],
-+  c_args : [c_vis_args, '-fcommon'],
-   include_directories : inc_st_omx,
-   dependencies : dep_st_omx,
- )
--- 
-2.26.2
-

Deleted: 0001-swr-Fix-build-with-GCC-10.patch
===================================================================
--- 0001-swr-Fix-build-with-GCC-10.patch	2020-05-28 00:31:57 UTC (rev 387746)
+++ 0001-swr-Fix-build-with-GCC-10.patch	2020-05-28 06:08:28 UTC (rev 387747)
@@ -1,56 +0,0 @@
-From 8dacf5f9d1df95c768016a1b92465bbabed37b54 Mon Sep 17 00:00:00 2001
-From: Vinson Lee <vlee at freedesktop.org>
-Date: Thu, 30 Jan 2020 20:48:26 -0800
-Subject: [PATCH] swr: Fix build with GCC 10.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-GCC 10 added _mm256_storeu2_m128i.
-https://gcc.gnu.org/bugzilla/show_bug.cgi?id=91341
-
-This patch fixes this build error with GCC 10.
-
-In file included from src/gallium/drivers/swr/rasterizer/codegen/gen_knobs.cpp:39:
-../src/gallium/drivers/swr/rasterizer/common/os.h:178:20: error: ‘void _mm256_storeu2_m128i(__m128i*, __m128i*, __m256i)’ redeclared inline without ‘gnu_inline’ attribute
-  178 | static INLINE void _mm256_storeu2_m128i(__m128i* hi, __m128i* lo, __m256i a)
-      |                    ^~~~~~~~~~~~~~~~~~~~
-In file included from /usr/lib/gcc/x86_64-redhat-linux/10/include/immintrin.h:51,
-                 from /usr/lib/gcc/x86_64-redhat-linux/10/include/x86intrin.h:32,
-                 from ../src/gallium/drivers/swr/rasterizer/common/os.h:107,
-                 from src/gallium/drivers/swr/rasterizer/codegen/gen_knobs.cpp:39:
-/usr/lib/gcc/x86_64-redhat-linux/10/include/avxintrin.h:1580:1: note: ‘void _mm256_storeu2_m128i(__m128i_u*, __m128i_u*, __m256i)’ previously defined here
- 1580 | _mm256_storeu2_m128i (__m128i_u *__PH, __m128i_u *__PL, __m256i __A)
-      | ^~~~~~~~~~~~~~~~~~~~
-
-Signed-off-by: Vinson Lee <vlee at freedesktop.org>
-Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3650>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3650>
-Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
----
- src/gallium/drivers/swr/rasterizer/common/os.h | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h
-index e812da39851..c4ee00bc91d 100644
---- a/src/gallium/drivers/swr/rasterizer/common/os.h
-+++ b/src/gallium/drivers/swr/rasterizer/common/os.h
-@@ -174,12 +174,14 @@ inline uint64_t      __rdtsc()
- #endif
- 
- #if !defined(__clang__) && !defined(__INTEL_COMPILER)
--// Intrinsic not defined in gcc
-+// Intrinsic not defined in gcc < 10
-+#if (__GNUC__) && (GCC_VERSION < 100000)
- static INLINE void _mm256_storeu2_m128i(__m128i* hi, __m128i* lo, __m256i a)
- {
-     _mm_storeu_si128((__m128i*)lo, _mm256_castsi256_si128(a));
-     _mm_storeu_si128((__m128i*)hi, _mm256_extractf128_si256(a, 0x1));
- }
-+#endif
- 
- // gcc prior to 4.9 doesn't have _mm*_undefined_*
- #if (__GNUC__) && (GCC_VERSION < 409000)
--- 
-2.26.2
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-28 00:31:57 UTC (rev 387746)
+++ PKGBUILD	2020-05-28 06:08:28 UTC (rev 387747)
@@ -4,8 +4,8 @@
 pkgbase=mesa
 pkgname=('vulkan-mesa-layer' 'opencl-mesa' 'vulkan-intel' 'vulkan-radeon' 'libva-mesa-driver' 'mesa-vdpau' 'mesa')
 pkgdesc="An open-source implementation of the OpenGL specification"
-pkgver=20.0.7
-pkgrel=3
+pkgver=20.1.0
+pkgrel=1
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
              'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd'
@@ -14,15 +14,9 @@
 url="https://www.mesa3d.org/"
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
-	0001-swr-Fix-build-with-GCC-10.patch
-	0001-omx-fix-build-with-gcc-10.patch
-	0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch
         LICENSE)
-sha512sums=('00baae50f14bf2b08b5654dffb11cf67499dc1825e1700b137fb5719e767e0e78e789979df2c194f677ea9c5e531f34965d47b9e37c239944c38d0570c7a9685'
+sha512sums=('f49230d18febe1bfd7c6282ab95fc244530f5cef56df0f804d8bece8a70bafcb445b8b83df96ad1b4c5af022c4e39a71f19a8f7e47b1fb09ada2b1a1317ff3be'
             'SKIP'
-            '296a7502e959ccd2a6f1279878c0562a853ecdd78b5960196fc8f99ed8dd995c6e1106551aef7a53db891295235ca55676788e7cf78e336e2d5ee49e4e463be5'
-            'e1f0fa2a8802184580d9d95777f02a1c35bf71c3ab380d88e5b9268f84c2ac338fa517d20065094b7764490bbbfb290c1c5ad6dec6d27f3dbf737dfa0b6c7263'
-            '566ad6f4195124b4af05d4bba1e01cc5e9ac466f11ddd900a2f5bfd830aa19cdccb3f9625901340b5fe62e7d8ea50aa336ab5031a658fe90916d847b2e9946e0'
             'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov at gmail.com>
               '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty at igalia.com>
@@ -29,18 +23,8 @@
               'E3E8F480C52ADD73B278EE78E1ECBE07D7D70895'  # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at igalia.com>
               'A5CC9FEC93F2F837CB044912336909B6B25FADFA'  # Juan A. Suarez Romero <jasuarez at igalia.com>
               '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker <dylan at pnwbakers.com>
-              '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric at engestrom.ch>
+              'CC31EF29D32A6637889530F2481D0E9D964E5593') # Eric Engestrom <eric at engestrom.ch>
 
-prepare() {
-  cd mesa-$pkgver
-
-  # fix building with gcc 10
-  patch -Np1 -i ../0001-swr-Fix-build-with-GCC-10.patch
-  patch -Np1 -i ../0001-omx-fix-build-with-gcc-10.patch
-  # LTO fix
-  patch -Np1 -i ../0001-meson-Disable-GCC-s-dead-store-elimination-for-memor.patch
-}
-
 build() {
   arch-meson mesa-$pkgver build \
     -D b_lto=true \


More information about the arch-commits mailing list