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

[Laurent Carlier]

    Date: Thursday, October 19, 2017 @ 16:40:08
  Author: lcarlier
Revision: 263633

upgpkg: lib32-mesa 17.2.3-1

upstream update 17.2.3

Modified:
  lib32-mesa/trunk/PKGBUILD
Deleted:
  lib32-mesa/trunk/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch

----------------------------------------------------------------+
 PKGBUILD                                                       |   13 ++-------
 swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch |   14 ----------
 2 files changed, 4 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-10-19 16:32:56 UTC (rev 263632)
+++ PKGBUILD	2017-10-19 16:40:08 UTC (rev 263633)
@@ -5,7 +5,7 @@
 
 pkgbase=lib32-mesa
 pkgname=('lib32-vulkan-intel' 'lib32-vulkan-radeon' 'lib32-libva-mesa-driver' 'lib32-mesa-vdpau' 'lib32-mesa')
-pkgver=17.2.2
+pkgver=17.2.3
 pkgrel=1
 arch=('x86_64')
 makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto'
@@ -15,13 +15,11 @@
 license=('custom')
 source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
 	LICENSE
-        0002-glvnd-fix-gl-dot-pc.patch
-        swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch)
-sha256sums=('cf522244d6a5a1ecde3fc00e7c96935253fe22f808f064cab98be6f3faa65782'
+        0002-glvnd-fix-gl-dot-pc.patch)
+sha256sums=('a0b0ec8f7b24dd044d7ab30a8c7e6d3767521e245f88d4ed5dd93315dc56f837'
             'SKIP'
             '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
-            '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966'
-            '2dcbd3b311b18e473000fb496a93a4a7a4ae9f9413aace209c0ea4aebbba715b')
+            '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966')
 validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov at gmail.com>
 validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # "Andres Gomez <tanty at igalia.com>"
 validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez at igalia.com>"
@@ -33,9 +31,6 @@
   # non-upstreamed ones
   patch -Np1 -i ../0002-glvnd-fix-gl-dot-pc.patch
 
-  # swr driver
-  patch -Np1 -i ../swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
-
   autoreconf -fiv
 }
 

Deleted: swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
===================================================================
--- swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch	2017-10-19 16:32:56 UTC (rev 263632)
+++ swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch	2017-10-19 16:40:08 UTC (rev 263633)
@@ -1,14 +0,0 @@
-diff --git a/src/gallium/drivers/swr/rasterizer/core/utils.h b/src/gallium/drivers/swr/rasterizer/core/utils.h
-index b096d2120cb..3c849e82d3b 100644
---- a/src/gallium/drivers/swr/rasterizer/core/utils.h
-+++ b/src/gallium/drivers/swr/rasterizer/core/utils.h
-@@ -365,7 +365,8 @@ static INLINE std::string GetEnv(const std::string& variableName)
-     output.resize(valueSize - 1); // valueSize includes null, output.resize() does not
-     GetEnvironmentVariableA(variableName.c_str(), &output[0], valueSize);
- #else
--    output = getenv(variableName.c_str());
-+    char *o = getenv(variableName.c_str());
-+    output = o ? std::string(o) : std::string();
- #endif
- 
-     return output;