diff options
author | Vi0L0 | 2017-10-09 22:16:07 +0200 |
---|---|---|
committer | Vi0L0 | 2017-10-09 22:16:07 +0200 |
commit | 3fcb34180b103f0d2c5fb0c08c1f6f0e6e749dc9 (patch) | |
tree | f54197631e8fcc2a79e78709647e5325cebe53d6 | |
parent | 9865122524f1f9f9a807504af8da958c7d8e53ea (diff) | |
download | aur-3fcb34180b103f0d2c5fb0c08c1f6f0e6e749dc9.tar.gz |
17.2.2
-rw-r--r-- | .SRCINFO | 14 | ||||
-rw-r--r-- | 0002-glvnd-fix-gl-dot-pc.patch | 12 | ||||
-rw-r--r-- | PKGBUILD | 22 | ||||
-rw-r--r-- | swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch | 14 |
4 files changed, 52 insertions, 10 deletions
@@ -1,7 +1,7 @@ pkgbase = lib32-mesa-noglvnd - pkgver = 17.1.4 + pkgver = 17.2.2 pkgrel = 1 - url = http://mesa3d.sourceforge.net + url = https://www.mesa3d.org/ arch = x86_64 license = custom makedepends = python2-mako @@ -22,12 +22,16 @@ pkgbase = lib32-mesa-noglvnd makedepends = lib32-libvdpau makedepends = lib32-wayland makedepends = lib32-lm_sensors - source = https://mesa.freedesktop.org/archive/mesa-17.1.4.tar.xz - source = https://mesa.freedesktop.org/archive/mesa-17.1.4.tar.xz.sig + source = https://mesa.freedesktop.org/archive/mesa-17.2.2.tar.xz + source = https://mesa.freedesktop.org/archive/mesa-17.2.2.tar.xz.sig source = LICENSE - sha256sums = 06f3b0e6a28f0d20b7f3391cf67fe89ae98ecd0a686cd545da76557b6cec9cad + source = 0002-glvnd-fix-gl-dot-pc.patch + source = swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch + sha256sums = cf522244d6a5a1ecde3fc00e7c96935253fe22f808f064cab98be6f3faa65782 sha256sums = SKIP sha256sums = 7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2 + sha256sums = 64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966 + sha256sums = 2dcbd3b311b18e473000fb496a93a4a7a4ae9f9413aace209c0ea4aebbba715b pkgname = lib32-vulkan-intel-noglvnd pkgdesc = Intel's Vulkan mesa driver (32-bit) - non-libglvnd version diff --git a/0002-glvnd-fix-gl-dot-pc.patch b/0002-glvnd-fix-gl-dot-pc.patch new file mode 100644 index 000000000000..68118f45efe8 --- /dev/null +++ b/0002-glvnd-fix-gl-dot-pc.patch @@ -0,0 +1,12 @@ +diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in +--- mesa-12.0.3/src/mesa/gl.pc.in.jx 2016-01-18 02:39:26.000000000 -0500 ++++ mesa-12.0.3/src/mesa/gl.pc.in 2016-10-25 13:06:44.013159358 -0400 +@@ -7,7 +7,7 @@ Name: gl + Description: Mesa OpenGL library + Requires.private: @GL_PC_REQ_PRIV@ + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -l@GL_LIB@ ++Libs: -L${libdir} -lGL + Libs.private: @GL_PC_LIB_PRIV@ + Cflags: -I${includedir} @GL_PC_CFLAGS@ + glx_tls: @GLX_TLS@ @@ -5,26 +5,38 @@ pkgbase=lib32-mesa-noglvnd pkgname=('lib32-vulkan-intel-noglvnd' 'lib32-vulkan-radeon-noglvnd' 'lib32-mesa-vdpau-noglvnd' 'lib32-mesa-noglvnd' 'lib32-mesa-libgl-noglvnd') -pkgver=17.1.4 +pkgver=17.2.2 pkgrel=1 arch=('x86_64') makedepends=('python2-mako' 'lib32-libxml2' 'lib32-expat' 'lib32-libx11' 'glproto' 'lib32-libdrm' 'dri2proto' 'dri3proto' 'presentproto' 'lib32-libxshmfence' 'lib32-libxxf86vm' 'lib32-libxdamage' 'gcc-multilib' 'lib32-libelf' 'lib32-llvm' 'lib32-libvdpau' 'lib32-wayland' 'lib32-lm_sensors') -url="http://mesa3d.sourceforge.net" +url="https://www.mesa3d.org/" license=('custom') source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig} - LICENSE) -sha256sums=('06f3b0e6a28f0d20b7f3391cf67fe89ae98ecd0a686cd545da76557b6cec9cad' + LICENSE + 0002-glvnd-fix-gl-dot-pc.patch + swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch) +sha256sums=('cf522244d6a5a1ecde3fc00e7c96935253fe22f808f064cab98be6f3faa65782' 'SKIP' - '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2') + '7fdc119cf53c8ca65396ea73f6d10af641ba41ea1dd2bd44a824726e01c8b3f2' + '64a77944a28026b066c1682c7258d02289d257b24b6f173a9f7580c48beed966' + '2dcbd3b311b18e473000fb496a93a4a7a4ae9f9413aace209c0ea4aebbba715b') 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>" prepare() { cd ${srcdir}/mesa-${pkgver} + # glvnd support patches - from Fedora + # 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 } diff --git a/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch b/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch new file mode 100644 index 000000000000..b9e81f9a32fe --- /dev/null +++ b/swr-rast-do-not-crash-on-NULL-strings-returned-by-getenv.patch @@ -0,0 +1,14 @@ +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; |