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

[Felix Yan]

    Date: Thursday, April 23, 2020 @ 22:50:38
  Author: felixonmars
Revision: 381451

upgpkg: mesa 20.0.5-1

Modified:
  mesa/trunk/PKGBUILD
Deleted:
  mesa/trunk/0001-iris-handle-the-failure-of-converting-unsupported-yu.patch

-----------------------------------------------------------------+
 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch |   54 ----------
 PKGBUILD                                                        |   13 --
 2 files changed, 3 insertions(+), 64 deletions(-)

Deleted: 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch
===================================================================
--- 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch	2020-04-23 22:42:54 UTC (rev 381450)
+++ 0001-iris-handle-the-failure-of-converting-unsupported-yu.patch	2020-04-23 22:50:38 UTC (rev 381451)
@@ -1,54 +0,0 @@
-From 4d3f535ebb341ddce05e5b1750fcf17c6c4166c9 Mon Sep 17 00:00:00 2001
-From: James Xiong <james.xiong at intel.com>
-Date: Wed, 20 Nov 2019 15:59:00 -0800
-Subject: [PATCH] iris: handle the failure of converting unsupported yuv
- formats to isl
-
-Signed-off-by: James Xiong <james.xiong at intel.com>
-Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
-(cherry picked from commit d8569baaed1a38cf3da9e45375fa2267d9a1eeb0)
-
-Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3898>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3898>
-Signed-off-by: Laurent Carlier <lordheavym at gmail.com>
----
- src/gallium/drivers/iris/iris_formats.c  | 6 +++++-
- src/gallium/drivers/iris/iris_resource.c | 3 ++-
- 2 files changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/src/gallium/drivers/iris/iris_formats.c b/src/gallium/drivers/iris/iris_formats.c
-index f6344cc7543..a35b663a53c 100644
---- a/src/gallium/drivers/iris/iris_formats.c
-+++ b/src/gallium/drivers/iris/iris_formats.c
-@@ -338,9 +338,13 @@ iris_format_for_usage(const struct gen_device_info *devinfo,
-                       isl_surf_usage_flags_t usage)
- {
-    enum isl_format format = iris_isl_format_for_pipe_format(pformat);
--   const struct isl_format_layout *fmtl = isl_format_get_layout(format);
-    struct isl_swizzle swizzle = ISL_SWIZZLE_IDENTITY;
- 
-+   if (format == ISL_FORMAT_UNSUPPORTED)
-+      return (struct iris_format_info) { .fmt = format, .swizzle = swizzle };
-+
-+   const struct isl_format_layout *fmtl = isl_format_get_layout(format);
-+
-    if (!util_format_is_srgb(pformat)) {
-       if (util_format_is_intensity(pformat)) {
-          swizzle = ISL_SWIZZLE(RED, RED, RED, RED);
-diff --git a/src/gallium/drivers/iris/iris_resource.c b/src/gallium/drivers/iris/iris_resource.c
-index bdd715df2c9..7ca6097840a 100644
---- a/src/gallium/drivers/iris/iris_resource.c
-+++ b/src/gallium/drivers/iris/iris_resource.c
-@@ -85,7 +85,8 @@ modifier_is_supported(const struct gen_device_info *devinfo,
- 
-       enum isl_format linear_format = isl_format_srgb_to_linear(rt_format);
- 
--      if (!isl_format_supports_ccs_e(devinfo, linear_format))
-+      if (linear_format == ISL_FORMAT_UNSUPPORTED ||
-+          !isl_format_supports_ccs_e(devinfo, linear_format))
-          return false;
- 
-       return devinfo->gen >= 9 && devinfo->gen <= 11;
--- 
-2.25.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-04-23 22:42:54 UTC (rev 381450)
+++ PKGBUILD	2020-04-23 22:50:38 UTC (rev 381451)
@@ -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.4
-pkgrel=2
+pkgver=20.0.5
+pkgrel=1
 arch=('x86_64')
 makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
              'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd'
@@ -14,11 +14,9 @@
 url="https://www.mesa3d.org/"
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
-        mesa-llvm-10.patch::https://github.com/mesa3d/mesa/commit/ff1a3a00cb37d84ab9a563f0aa241714876f56b4.patch
         LICENSE)
-sha512sums=('17d8bc3b56779a8e5648d81da9ee97b66bcec015710801edce4e8055fbb314cd9ebc1d112e3035480ba844c7d9ae6b5b1f1eac0cc0817e69e9253a7748451a55'
+sha512sums=('6f5780f7574400fea54978b40eb97faca35826a8a7bed96362d7bebcda78e2cadd44585ef8dd7dc126e0cc62cff61bee9b2ea360fedcc09a1fbb4c1f20c6aa08'
             'SKIP'
-            'e6c1812816ed6251959400a9f6824b604b69d4ce057b677baff8c4c2c41de8edc1571ce13f0cc9ec87eb0e9d007a305b6a1727d820a8632f482c7a8629bd6fb8'
             'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D'  # Emil Velikov <emil.l.velikov at gmail.com>
               '946D09B5E4C9845E63075FF1D961C596A7203456'  # Andres Gomez <tanty at igalia.com>
@@ -27,11 +25,6 @@
               '71C4B75620BC75708B4BDB254C95FAAB3EB073EC'  # Dylan Baker <dylan at pnwbakers.com>
 	      '57551DE15B968F6341C248F68D8E31AFC32428A6') # Eric Engestrom <eric at engestrom.ch>
 
-prepare() {
-  cd mesa-$pkgver
-  patch -p1 -i ../mesa-llvm-10.patch
-}
-
 build() {
   arch-meson mesa-$pkgver build \
     -D b_lto=false \