[arch-commits] Commit in mesa/repos/extra-x86_64 (8 files)

Laurent Carlier lcarlier at archlinux.org
Fri May 15 16:50:42 UTC 2020


    Date: Friday, May 15, 2020 @ 16:50:41
  Author: lcarlier
Revision: 383702

archrelease: copy trunk to extra-x86_64

Added:
  mesa/repos/extra-x86_64/0001-omx-fix-build-with-gcc-10.patch
    (from rev 383701, mesa/trunk/0001-omx-fix-build-with-gcc-10.patch)
  mesa/repos/extra-x86_64/0001-swr-Fix-build-with-GCC-10.patch
    (from rev 383701, mesa/trunk/0001-swr-Fix-build-with-GCC-10.patch)
  mesa/repos/extra-x86_64/LICENSE
    (from rev 383701, mesa/trunk/LICENSE)
  mesa/repos/extra-x86_64/PKGBUILD
    (from rev 383701, mesa/trunk/PKGBUILD)
Deleted:
  mesa/repos/extra-x86_64/0001-egl-allow-INVALID-format-for-linux_dmabuf.patch
  mesa/repos/extra-x86_64/0002-egl-wayland-Fix-zwp_linux_dmabuf-usage.patch
  mesa/repos/extra-x86_64/LICENSE
  mesa/repos/extra-x86_64/PKGBUILD

------------------------------------------------------+
 0001-egl-allow-INVALID-format-for-linux_dmabuf.patch |   84 ---
 0001-omx-fix-build-with-gcc-10.patch                 |   40 +
 0001-swr-Fix-build-with-GCC-10.patch                 |   56 ++
 0002-egl-wayland-Fix-zwp_linux_dmabuf-usage.patch    |   71 ---
 LICENSE                                              |  166 +++----
 PKGBUILD                                             |  399 ++++++++---------
 6 files changed, 378 insertions(+), 438 deletions(-)

Deleted: 0001-egl-allow-INVALID-format-for-linux_dmabuf.patch
===================================================================
--- 0001-egl-allow-INVALID-format-for-linux_dmabuf.patch	2020-05-15 16:50:34 UTC (rev 383701)
+++ 0001-egl-allow-INVALID-format-for-linux_dmabuf.patch	2020-05-15 16:50:41 UTC (rev 383702)
@@ -1,84 +0,0 @@
-From c71ea55be7c1dbb58d56df9c6cfa69718fdf5d6a Mon Sep 17 00:00:00 2001
-From: Ivan Molodetskikh <yalterz at gmail.com>
-Date: Fri, 27 Sep 2019 00:45:39 +0300
-Subject: [PATCH 1/2] egl: allow INVALID format for linux_dmabuf
-
-As per
-https://gitlab.freedesktop.org/wayland/wayland-protocols/commit/fb9b2a87317c77e26283da5f6c9559d709f6fdcd,
-the compositor may advertise DRM_FORMAT_MOD_INVALID as a supported
-modifier. This patch makes mesa recognize this fact and allow
-linux_dmabuf usage with the INVALID modifier in this case.
-
-In case the driver doesn't support modifiers, we can still use
-linux-dmabuf protocol instead of the legacy wl_drm interface to create
-wl_buffers. This will help compositors to handle these buffers better.
-
-In this commit, the INVALID modifier is allowed to be added to the list
-of supported modifiers, and create_wl_buffer will be able to use
-linux_dmabuf with an INVALID modifier if the compositor advertised it as
-supported.
-
-Signed-off-by: Ivan Molodetskikh <yalterz at gmail.com>
-Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2147>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/2147>
----
- src/egl/drivers/dri2/platform_wayland.c | 29 ++++++++++++++++++++-----
- 1 file changed, 24 insertions(+), 5 deletions(-)
-
-diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
-index 71bcb04a77b..324ac2357da 100644
---- a/src/egl/drivers/dri2/platform_wayland.c
-+++ b/src/egl/drivers/dri2/platform_wayland.c
-@@ -522,6 +522,13 @@ get_back_bo(struct dri2_egl_surface *dri2_surf)
-    modifiers = u_vector_tail(&dri2_dpy->wl_modifiers[visual_idx]);
-    num_modifiers = u_vector_length(&dri2_dpy->wl_modifiers[visual_idx]);
- 
-+   if (num_modifiers == 1 && modifiers[0] == DRM_FORMAT_MOD_INVALID) {
-+      /* For the purposes of this function, an INVALID modifier on its own
-+       * means the modifiers aren't supported.
-+       */
-+      num_modifiers = 0;
-+   }
-+
-    /* Substitute dri image format if server does not support original format */
-    if (!BITSET_TEST(dri2_dpy->formats, visual_idx))
-       linear_dri_image_format = dri2_wl_visuals[visual_idx].alt_dri_image_format;
-@@ -917,7 +924,23 @@ create_wl_buffer(struct dri2_egl_display *dri2_dpy,
-       }
-    }
- 
--   if (dri2_dpy->wl_dmabuf && modifier != DRM_FORMAT_MOD_INVALID) {
-+   bool supported_modifier = false;
-+   if (modifier != DRM_FORMAT_MOD_INVALID) {
-+      supported_modifier = true;
-+   } else {
-+      int visual_idx = dri2_wl_visual_idx_from_fourcc(fourcc);
-+      assert(visual_idx != -1);
-+
-+      uint64_t *mod;
-+      u_vector_foreach(mod, &dri2_dpy->wl_modifiers[visual_idx]) {
-+         if (*mod == DRM_FORMAT_MOD_INVALID) {
-+            supported_modifier = true;
-+            break;
-+         }
-+      }
-+   }
-+
-+   if (dri2_dpy->wl_dmabuf && supported_modifier) {
-       struct zwp_linux_buffer_params_v1 *params;
-       int i;
- 
-@@ -1290,10 +1313,6 @@ dmabuf_handle_modifier(void *data, struct zwp_linux_dmabuf_v1 *dmabuf,
-    if (visual_idx == -1)
-       return;
- 
--   if (modifier_hi == (DRM_FORMAT_MOD_INVALID >> 32) &&
--       modifier_lo == (DRM_FORMAT_MOD_INVALID & 0xffffffff))
--      return;
--
-    BITSET_SET(dri2_dpy->formats, visual_idx);
- 
-    mod = u_vector_add(&dri2_dpy->wl_modifiers[visual_idx]);
--- 
-2.26.2
-

Copied: mesa/repos/extra-x86_64/0001-omx-fix-build-with-gcc-10.patch (from rev 383701, mesa/trunk/0001-omx-fix-build-with-gcc-10.patch)
===================================================================
--- 0001-omx-fix-build-with-gcc-10.patch	                        (rev 0)
+++ 0001-omx-fix-build-with-gcc-10.patch	2020-05-15 16:50:41 UTC (rev 383702)
@@ -0,0 +1,40 @@
+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
+

Copied: mesa/repos/extra-x86_64/0001-swr-Fix-build-with-GCC-10.patch (from rev 383701, mesa/trunk/0001-swr-Fix-build-with-GCC-10.patch)
===================================================================
--- 0001-swr-Fix-build-with-GCC-10.patch	                        (rev 0)
+++ 0001-swr-Fix-build-with-GCC-10.patch	2020-05-15 16:50:41 UTC (rev 383702)
@@ -0,0 +1,56 @@
+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
+

Deleted: 0002-egl-wayland-Fix-zwp_linux_dmabuf-usage.patch
===================================================================
--- 0002-egl-wayland-Fix-zwp_linux_dmabuf-usage.patch	2020-05-15 16:50:34 UTC (rev 383701)
+++ 0002-egl-wayland-Fix-zwp_linux_dmabuf-usage.patch	2020-05-15 16:50:41 UTC (rev 383702)
@@ -1,71 +0,0 @@
-From 8aeeb72b5af16e27b152f733da4a7de0ec47f328 Mon Sep 17 00:00:00 2001
-From: Christopher James Halse Rogers <christopher.halse.rogers at canonical.com>
-Date: Tue, 24 Mar 2020 14:19:51 +1100
-Subject: [PATCH 2/2] egl/wayland: Fix zwp_linux_dmabuf usage
-
-There's no guarantee that the formats advertised by wl_drm and the formats
-advertised by zwp_linux_dmabuf_v1 are the same.
-
-get_back_bo() handles this by falling back from createImageWithModifiers() to
-createImage() when there's a wl_drm format but no corresponding linux_dmabuf
-format, but create_wl_buffer() unconditionally tries to create a linux_dmabuf
-buffer unless DRIimage has DRM_FORMAT_MOD_INVALID.
-
-Fix this by always checking if the DRIimage modifier has been advertised
-by zwp_linux_dmabuf_v1, and falling back to wl_drm if not.
-
-If DRM_FORMAT_MOD_INVALID has been advertised then we trust the client
-has allocated something appropriate and treat any modifier as matching.
-
-Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2220
-Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers at canonical.com>
----
- src/egl/drivers/dri2/platform_wayland.c | 30 ++++++++++++++++---------
- 1 file changed, 19 insertions(+), 11 deletions(-)
-
-diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
-index 324ac2357da..7b7646e6e7f 100644
---- a/src/egl/drivers/dri2/platform_wayland.c
-+++ b/src/egl/drivers/dri2/platform_wayland.c
-@@ -925,19 +925,27 @@ create_wl_buffer(struct dri2_egl_display *dri2_dpy,
-    }
- 
-    bool supported_modifier = false;
--   if (modifier != DRM_FORMAT_MOD_INVALID) {
--      supported_modifier = true;
--   } else {
--      int visual_idx = dri2_wl_visual_idx_from_fourcc(fourcc);
--      assert(visual_idx != -1);
-+   bool mod_invalid_supported = false;
-+   int visual_idx = dri2_wl_visual_idx_from_fourcc(fourcc);
-+   assert(visual_idx != -1);
- 
--      uint64_t *mod;
--      u_vector_foreach(mod, &dri2_dpy->wl_modifiers[visual_idx]) {
--         if (*mod == DRM_FORMAT_MOD_INVALID) {
--            supported_modifier = true;
--            break;
--         }
-+   uint64_t *mod;
-+   u_vector_foreach(mod, &dri2_dpy->wl_modifiers[visual_idx]) {
-+      if (*mod == DRM_FORMAT_MOD_INVALID) {
-+         mod_invalid_supported = true;
-       }
-+      if (*mod == modifier) {
-+         supported_modifier = true;
-+         break;
-+      }
-+   }
-+   if (!supported_modifier && mod_invalid_supported) {
-+      /* If the server has advertised DRM_FORMAT_MOD_INVALID then we trust
-+       * that the client has allocated the buffer with the right implicit
-+       * modifier for the format, even though it's allocated a buffer the
-+       * server hasn't explicitly claimed to support. */
-+      modifier = DRM_FORMAT_MOD_INVALID;
-+      supported_modifier = true;
-    }
- 
-    if (dri2_dpy->wl_dmabuf && supported_modifier) {
--- 
-2.26.2
-

Deleted: LICENSE
===================================================================
--- LICENSE	2020-05-15 16:50:34 UTC (rev 383701)
+++ LICENSE	2020-05-15 16:50:41 UTC (rev 383702)
@@ -1,83 +0,0 @@
-The Mesa 3D Graphics Library
-
-Disclaimer
-
-   Mesa is a 3-D graphics library with an API which is very similar to
-   that of [1]OpenGL.* To the extent that Mesa utilizes the OpenGL command
-   syntax or state machine, it is being used with authorization from
-   [2]Silicon Graphics, Inc.(SGI). However, the author does not possess an
-   OpenGL license from SGI, and makes no claim that Mesa is in any way a
-   compatible replacement for OpenGL or associated with SGI. Those who
-   want a licensed implementation of OpenGL should contact a licensed
-   vendor.
-
-   Please do not refer to the library as MesaGL (for legal reasons). It's
-   just Mesa or The Mesa 3-D graphics library.
-
-   * OpenGL is a trademark of [3]Silicon Graphics Incorporated.
-
-License / Copyright Information
-
-   The Mesa distribution consists of several components. Different
-   copyrights and licenses apply to different components. For example, the
-   GLX client code uses the SGI Free Software License B, and some of the
-   Mesa device drivers are copyrighted by their authors. See below for a
-   list of Mesa's main components and the license for each.
-
-   The core Mesa library is licensed according to the terms of the MIT
-   license. This allows integration with the XFree86, Xorg and DRI
-   projects.
-
-   The default Mesa license is as follows:
-
-Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-Attention, Contributors
-
-   When contributing to the Mesa project you must agree to the licensing
-   terms of the component to which you're contributing. The following
-   section lists the primary components of the Mesa distribution and their
-   respective licenses.
-
-Mesa Component Licenses
-
-Component         Location               License
-------------------------------------------------------------------
-Main Mesa code    src/mesa/              MIT
-
-Device drivers    src/mesa/drivers/*     MIT, generally
-
-Gallium code      src/gallium/           MIT
-
-Ext headers       include/GL/glext.h     Khronos
-                  include/GL/glxext.h
-
-GLX client code   src/glx/               SGI Free Software License B
-
-C11 thread        include/c11/threads*.h Boost (permissive) emulation
-
-   In general, consult the source files for license terms.
-
-References
-
-   1. https://www.opengl.org/
-   2. https://www.sgi.com/
-   3. https://www.sgi.com/

Copied: mesa/repos/extra-x86_64/LICENSE (from rev 383701, mesa/trunk/LICENSE)
===================================================================
--- LICENSE	                        (rev 0)
+++ LICENSE	2020-05-15 16:50:41 UTC (rev 383702)
@@ -0,0 +1,83 @@
+The Mesa 3D Graphics Library
+
+Disclaimer
+
+   Mesa is a 3-D graphics library with an API which is very similar to
+   that of [1]OpenGL.* To the extent that Mesa utilizes the OpenGL command
+   syntax or state machine, it is being used with authorization from
+   [2]Silicon Graphics, Inc.(SGI). However, the author does not possess an
+   OpenGL license from SGI, and makes no claim that Mesa is in any way a
+   compatible replacement for OpenGL or associated with SGI. Those who
+   want a licensed implementation of OpenGL should contact a licensed
+   vendor.
+
+   Please do not refer to the library as MesaGL (for legal reasons). It's
+   just Mesa or The Mesa 3-D graphics library.
+
+   * OpenGL is a trademark of [3]Silicon Graphics Incorporated.
+
+License / Copyright Information
+
+   The Mesa distribution consists of several components. Different
+   copyrights and licenses apply to different components. For example, the
+   GLX client code uses the SGI Free Software License B, and some of the
+   Mesa device drivers are copyrighted by their authors. See below for a
+   list of Mesa's main components and the license for each.
+
+   The core Mesa library is licensed according to the terms of the MIT
+   license. This allows integration with the XFree86, Xorg and DRI
+   projects.
+
+   The default Mesa license is as follows:
+
+Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+
+Attention, Contributors
+
+   When contributing to the Mesa project you must agree to the licensing
+   terms of the component to which you're contributing. The following
+   section lists the primary components of the Mesa distribution and their
+   respective licenses.
+
+Mesa Component Licenses
+
+Component         Location               License
+------------------------------------------------------------------
+Main Mesa code    src/mesa/              MIT
+
+Device drivers    src/mesa/drivers/*     MIT, generally
+
+Gallium code      src/gallium/           MIT
+
+Ext headers       include/GL/glext.h     Khronos
+                  include/GL/glxext.h
+
+GLX client code   src/glx/               SGI Free Software License B
+
+C11 thread        include/c11/threads*.h Boost (permissive) emulation
+
+   In general, consult the source files for license terms.
+
+References
+
+   1. https://www.opengl.org/
+   2. https://www.sgi.com/
+   3. https://www.sgi.com/

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2020-05-15 16:50:34 UTC (rev 383701)
+++ PKGBUILD	2020-05-15 16:50:41 UTC (rev 383702)
@@ -1,200 +0,0 @@
-# Maintainer: Jan de Groot <jgc at archlinux.org>
-# Maintainer: Andreas Radke <andyrtr at archlinux.org>
-
-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.6
-pkgrel=2
-arch=('x86_64')
-makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
-             'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd'
-             'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors'
-             'libxrandr' 'valgrind' 'glslang' 'meson')
-url="https://www.mesa3d.org/"
-license=('custom')
-source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
-        0001-egl-allow-INVALID-format-for-linux_dmabuf.patch
-        0002-egl-wayland-Fix-zwp_linux_dmabuf-usage.patch
-        LICENSE)
-sha512sums=('a93dc3ed57ed7469b7c60cdbdcf4f29c5da4ec3986171c7b534e009e136ca21fec16207ffab38a6747437a9b1060e2e6c4b74c4e5cdc168b9aba0fc1940b5e90'
-            'SKIP'
-            '2371631512cd0f6aeaa9db3a8484da039fe98610123683520d0fe076dbf49860f00f8d44ecb0b0b149cee766946fe800080178c6fca8cff289329bf46ce97858'
-            'd8998785c373743932674eecdfc1f502b5ef58b3f53572a42b177bf5b367d43b4af3867e37bd71c6a23f1b740841aabf2d42c68eb95f1bc33c0e58d9b7e029b8'
-            'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
-validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov at gmail.com>
-              '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty at igalia.com>
-              '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>
-
-prepare() {
-  cd mesa-$pkgver
-
-  # https://gitlab.gnome.org/GNOME/mutter/issues/987
-  # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4294
-  patch -Np1 -i ../0001-egl-allow-INVALID-format-for-linux_dmabuf.patch
-  patch -Np1 -i ../0002-egl-wayland-Fix-zwp_linux_dmabuf-usage.patch
-}
-
-build() {
-  arch-meson mesa-$pkgver build \
-    -D b_lto=true \
-    -D b_ndebug=true \
-    -D platforms=x11,wayland,drm,surfaceless \
-    -D dri-drivers=i915,i965,r100,r200,nouveau \
-    -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr,iris \
-    -D vulkan-drivers=amd,intel \
-    -D vulkan-overlay-layer=true \
-    -D swr-arches=avx,avx2 \
-    -D dri3=true \
-    -D egl=true \
-    -D gallium-extra-hud=true \
-    -D gallium-nine=true \
-    -D gallium-omx=bellagio \
-    -D gallium-opencl=icd \
-    -D gallium-va=true \
-    -D gallium-vdpau=true \
-    -D gallium-xa=true \
-    -D gallium-xvmc=false \
-    -D gbm=true \
-    -D gles1=false \
-    -D gles2=true \
-    -D glvnd=true \
-    -D glx=dri \
-    -D libunwind=true \
-    -D llvm=true \
-    -D lmsensors=true \
-    -D osmesa=gallium \
-    -D shared-glapi=true \
-    -D valgrind=true
-
-  # Print config
-  meson configure build
-
-  ninja -C build xmlpool-pot xmlpool-update-po xmlpool-gmo
-  ninja -C build
-
-  # fake installation to be seperated into packages
-  # outside of fakeroot but mesa doesn't need to chown/mod
-  DESTDIR="${srcdir}/fakeinstall" ninja -C build install
-}
-
-_install() {
-  local src f dir
-  for src; do
-    f="${src#fakeinstall/}"
-    dir="${pkgdir}/${f%/*}"
-    install -m755 -d "${dir}"
-    mv -v "${src}" "${dir}/"
-  done
-}
-
-package_vulkan-mesa-layer() {
-  pkgdesc="Vulkan overlay layer to display information about the application"
-
-  _install fakeinstall/usr/share/vulkan/explicit_layer.d
-  _install fakeinstall/usr/lib/libVkLayer_MESA_overlay.so
-  _install fakeinstall/usr/bin/mesa-overlay-control.py
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_opencl-mesa() {
-  pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
-  depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang' 'zstd')
-  optdepends=('opencl-headers: headers necessary for OpenCL development')
-  provides=('opencl-driver')
-
-  _install fakeinstall/etc/OpenCL
-  _install fakeinstall/usr/lib/lib*OpenCL*
-  _install fakeinstall/usr/lib/gallium-pipe
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_vulkan-intel() {
-  pkgdesc="Intel's Vulkan mesa driver"
-  depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd')
-  optdepends=('vulkan-mesa-layer: a vulkan layer to display information using an overlay')
-  provides=('vulkan-driver')
-
-  _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
-  _install fakeinstall/usr/lib/libvulkan_intel.so
-  _install fakeinstall/usr/include/vulkan/vulkan_intel.h
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_vulkan-radeon() {
-  pkgdesc="Radeon's Vulkan mesa driver"
-  depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'zstd' 'llvm-libs')
-  optdepends=('vulkan-mesa-layer: a vulkan layer to display information using an overlay')
-  provides=('vulkan-driver')
-
-  _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
-  _install fakeinstall/usr/lib/libvulkan_radeon.so
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_libva-mesa-driver() {
-  pkgdesc="VA-API implementation for gallium"
-  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'zstd')
-
-  _install fakeinstall/usr/lib/dri/*_drv_video.so
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_mesa-vdpau() {
-  pkgdesc="Mesa VDPAU drivers"
-  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'zstd')
-
-  _install fakeinstall/usr/lib/vdpau
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}
-
-package_mesa() {
-  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
-           'libomxil-bellagio' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd')
-  optdepends=('opengl-man-pages: for the OpenGL API man pages'
-              'mesa-vdpau: for accelerated video playback'
-              'libva-mesa-driver: for accelerated video playback')
-  provides=('mesa-libgl' 'opengl-driver')
-  conflicts=('mesa-libgl')
-  replaces=('mesa-libgl')
-
-  _install fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf
-  _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
-
-  # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
-  _install fakeinstall/usr/lib/dri/*_dri.so
-
-  _install fakeinstall/usr/lib/bellagio
-  _install fakeinstall/usr/lib/d3d
-  _install fakeinstall/usr/lib/lib{gbm,glapi}.so*
-  _install fakeinstall/usr/lib/libOSMesa.so*
-  _install fakeinstall/usr/lib/libxatracker.so*
-  _install fakeinstall/usr/lib/libswrAVX*.so*
-
-  # in vulkan-headers
-  rm -rv fakeinstall/usr/include/vulkan
-
-  _install fakeinstall/usr/include
-  _install fakeinstall/usr/lib/pkgconfig
-
-  # libglvnd support
-  _install fakeinstall/usr/lib/libGLX_mesa.so*
-  _install fakeinstall/usr/lib/libEGL_mesa.so*
-
-  # indirect rendering
-  ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0"
-  
-  # make sure there are no files left to install
-  find fakeinstall -depth -print0 | xargs -0 rmdir
-
-  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
-}

Copied: mesa/repos/extra-x86_64/PKGBUILD (from rev 383701, mesa/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2020-05-15 16:50:41 UTC (rev 383702)
@@ -0,0 +1,199 @@
+# Maintainer: Jan de Groot <jgc at archlinux.org>
+# Maintainer: Andreas Radke <andyrtr at archlinux.org>
+
+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=1
+arch=('x86_64')
+makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
+             'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd'
+             'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors'
+             'libxrandr' 'valgrind' 'glslang' 'meson')
+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
+        LICENSE)
+sha512sums=('00baae50f14bf2b08b5654dffb11cf67499dc1825e1700b137fb5719e767e0e78e789979df2c194f677ea9c5e531f34965d47b9e37c239944c38d0570c7a9685'
+            'SKIP'
+            '296a7502e959ccd2a6f1279878c0562a853ecdd78b5960196fc8f99ed8dd995c6e1106551aef7a53db891295235ca55676788e7cf78e336e2d5ee49e4e463be5'
+            'e1f0fa2a8802184580d9d95777f02a1c35bf71c3ab380d88e5b9268f84c2ac338fa517d20065094b7764490bbbfb290c1c5ad6dec6d27f3dbf737dfa0b6c7263'
+            'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
+validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov at gmail.com>
+              '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty at igalia.com>
+              '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>
+
+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
+}
+
+build() {
+  arch-meson mesa-$pkgver build \
+    -D b_lto=true \
+    -D b_ndebug=true \
+    -D platforms=x11,wayland,drm,surfaceless \
+    -D dri-drivers=i915,i965,r100,r200,nouveau \
+    -D gallium-drivers=r300,r600,radeonsi,nouveau,virgl,svga,swrast,swr,iris \
+    -D vulkan-drivers=amd,intel \
+    -D vulkan-overlay-layer=true \
+    -D swr-arches=avx,avx2 \
+    -D dri3=true \
+    -D egl=true \
+    -D gallium-extra-hud=true \
+    -D gallium-nine=true \
+    -D gallium-omx=bellagio \
+    -D gallium-opencl=icd \
+    -D gallium-va=true \
+    -D gallium-vdpau=true \
+    -D gallium-xa=true \
+    -D gallium-xvmc=false \
+    -D gbm=true \
+    -D gles1=false \
+    -D gles2=true \
+    -D glvnd=true \
+    -D glx=dri \
+    -D libunwind=true \
+    -D llvm=true \
+    -D lmsensors=true \
+    -D osmesa=gallium \
+    -D shared-glapi=true \
+    -D valgrind=true
+
+  # Print config
+  meson configure build
+
+  ninja -C build xmlpool-pot xmlpool-update-po xmlpool-gmo
+  ninja -C build
+
+  # fake installation to be seperated into packages
+  # outside of fakeroot but mesa doesn't need to chown/mod
+  DESTDIR="${srcdir}/fakeinstall" ninja -C build install
+}
+
+_install() {
+  local src f dir
+  for src; do
+    f="${src#fakeinstall/}"
+    dir="${pkgdir}/${f%/*}"
+    install -m755 -d "${dir}"
+    mv -v "${src}" "${dir}/"
+  done
+}
+
+package_vulkan-mesa-layer() {
+  pkgdesc="Vulkan overlay layer to display information about the application"
+
+  _install fakeinstall/usr/share/vulkan/explicit_layer.d
+  _install fakeinstall/usr/lib/libVkLayer_MESA_overlay.so
+  _install fakeinstall/usr/bin/mesa-overlay-control.py
+
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_opencl-mesa() {
+  pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
+  depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang' 'zstd')
+  optdepends=('opencl-headers: headers necessary for OpenCL development')
+  provides=('opencl-driver')
+
+  _install fakeinstall/etc/OpenCL
+  _install fakeinstall/usr/lib/lib*OpenCL*
+  _install fakeinstall/usr/lib/gallium-pipe
+
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_vulkan-intel() {
+  pkgdesc="Intel's Vulkan mesa driver"
+  depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd')
+  optdepends=('vulkan-mesa-layer: a vulkan layer to display information using an overlay')
+  provides=('vulkan-driver')
+
+  _install fakeinstall/usr/share/vulkan/icd.d/intel_icd*.json
+  _install fakeinstall/usr/lib/libvulkan_intel.so
+  _install fakeinstall/usr/include/vulkan/vulkan_intel.h
+
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_vulkan-radeon() {
+  pkgdesc="Radeon's Vulkan mesa driver"
+  depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'zstd' 'llvm-libs')
+  optdepends=('vulkan-mesa-layer: a vulkan layer to display information using an overlay')
+  provides=('vulkan-driver')
+
+  _install fakeinstall/usr/share/vulkan/icd.d/radeon_icd*.json
+  _install fakeinstall/usr/lib/libvulkan_radeon.so
+
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_libva-mesa-driver() {
+  pkgdesc="VA-API implementation for gallium"
+  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'zstd')
+
+  _install fakeinstall/usr/lib/dri/*_drv_video.so
+
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_mesa-vdpau() {
+  pkgdesc="Mesa VDPAU drivers"
+  depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'zstd')
+
+  _install fakeinstall/usr/lib/vdpau
+
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}
+
+package_mesa() {
+  depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
+           'libomxil-bellagio' 'libunwind' 'llvm-libs' 'lm_sensors' 'libglvnd')
+  optdepends=('opengl-man-pages: for the OpenGL API man pages'
+              'mesa-vdpau: for accelerated video playback'
+              'libva-mesa-driver: for accelerated video playback')
+  provides=('mesa-libgl' 'opengl-driver')
+  conflicts=('mesa-libgl')
+  replaces=('mesa-libgl')
+
+  _install fakeinstall/usr/share/drirc.d/00-mesa-defaults.conf
+  _install fakeinstall/usr/share/glvnd/egl_vendor.d/50_mesa.json
+
+  # ati-dri, nouveau-dri, intel-dri, svga-dri, swrast, swr
+  _install fakeinstall/usr/lib/dri/*_dri.so
+
+  _install fakeinstall/usr/lib/bellagio
+  _install fakeinstall/usr/lib/d3d
+  _install fakeinstall/usr/lib/lib{gbm,glapi}.so*
+  _install fakeinstall/usr/lib/libOSMesa.so*
+  _install fakeinstall/usr/lib/libxatracker.so*
+  _install fakeinstall/usr/lib/libswrAVX*.so*
+
+  # in vulkan-headers
+  rm -rv fakeinstall/usr/include/vulkan
+
+  _install fakeinstall/usr/include
+  _install fakeinstall/usr/lib/pkgconfig
+
+  # libglvnd support
+  _install fakeinstall/usr/lib/libGLX_mesa.so*
+  _install fakeinstall/usr/lib/libEGL_mesa.so*
+
+  # indirect rendering
+  ln -s /usr/lib/libGLX_mesa.so.0 "${pkgdir}/usr/lib/libGLX_indirect.so.0"
+  
+  # make sure there are no files left to install
+  find fakeinstall -depth -print0 | xargs -0 rmdir
+
+  install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
+}


More information about the arch-commits mailing list