summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libre/mesa/PKGBUILD18
-rw-r--r--libre/mesa/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch14
-rw-r--r--libre/mesa/swr-rast-remove-llvm-fence-atomics-from-generated-files.patch19
3 files changed, 5 insertions, 46 deletions
diff --git a/libre/mesa/PKGBUILD b/libre/mesa/PKGBUILD
index cd77d95d3..2e05aa035 100644
--- a/libre/mesa/PKGBUILD
+++ b/libre/mesa/PKGBUILD
@@ -4,8 +4,8 @@
pkgbase=mesa
pkgname=("${pkgbase}")
-pkgver=17.2.1
-pkgrel=3.parabola1
+pkgver=17.2.3
+pkgrel=1.parabola1
arch=('i686' 'x86_64' 'armv7h')
makedepends=('python2-mako' 'libxml2' 'libx11' 'glproto' 'libdrm' 'dri2proto' 'dri3proto' 'presentproto'
'libxshmfence' 'libxxf86vm' 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
@@ -17,16 +17,12 @@ license=('custom')
source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
LICENSE
drirc
- 0002-glvnd-fix-gl-dot-pc.patch
- swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
- swr-rast-remove-llvm-fence-atomics-from-generated-files.patch)
-sha256sums=('77385d17827cff24a3bae134342234f2efe7f7f990e778109682571dbbc9ba1e'
+ 0002-glvnd-fix-gl-dot-pc.patch)
+sha256sums=('a0b0ec8f7b24dd044d7ab30a8c7e6d3767521e245f88d4ed5dd93315dc56f837'
'SKIP'
'7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2'
'2cc6f40076e07a2d4769557c1aa40e5b6fbbb59c38e551c1a1997ef0d3f3c5f2'
- '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966'
- '2dcbd3b311b18e473000fb496a93a4a7a4ae9f9413aace209c0ea4aebbba715b'
- 'a747e0046eab7bb9c73444549c9c63d078b11b756d2294ba9c7ee0612caf62db')
+ '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966')
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D') # Emil Velikov <emil.l.velikov@gmail.com>
validpgpkeys+=('946D09B5E4C9845E63075FF1D961C596A7203456') # "Andres Gomez <tanty@igalia.com>"
validpgpkeys+=('E3E8F480C52ADD73B278EE78E1ECBE07D7D70895') # Juan Antonio Suárez Romero (Igalia, S.L.) <jasuarez@igalia.com>"
@@ -38,10 +34,6 @@ prepare() {
# 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
- patch -Np1 -i ../swr-rast-remove-llvm-fence-atomics-from-generated-files.patch
-
autoreconf -fiv
}
diff --git a/libre/mesa/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch b/libre/mesa/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
deleted file mode 100644
index b9e81f9a3..000000000
--- a/libre/mesa/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch
+++ /dev/null
@@ -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;
diff --git a/libre/mesa/swr-rast-remove-llvm-fence-atomics-from-generated-files.patch b/libre/mesa/swr-rast-remove-llvm-fence-atomics-from-generated-files.patch
deleted file mode 100644
index 02a2feecf..000000000
--- a/libre/mesa/swr-rast-remove-llvm-fence-atomics-from-generated-files.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
-index 025d38a..ce892a9 100644
---- a/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
-+++ b/src/gallium/drivers/swr/rasterizer/codegen/gen_llvm_ir_macros.py
-@@ -140,6 +140,14 @@ def parse_ir_builder(input_file):
-
- ignore = False
-
-+ # The following functions need to be ignored in openswr.
-+ # API change in llvm-5.0 breaks baked autogen files
-+ if (
-+ (func_name == 'CreateFence' or
-+ func_name == 'CreateAtomicCmpXchg' or
-+ func_name == 'CreateAtomicRMW')):
-+ ignore = True
-+
- # The following functions need to be ignored.
- if (func_name == 'CreateInsertNUWNSWBinOp' or
- func_name == 'CreateMaskedIntrinsic' or