[arch-commits] Commit in mesa/trunk (2 files)
Christian Hesse
eworm at archlinux.org
Fri Feb 14 22:28:21 UTC 2020
Date: Friday, February 14, 2020 @ 22:28:20
Author: eworm
Revision: 375614
upgpkg: mesa 19.3.4-2
fix illegal instruction (FS#65498)
Added:
mesa/trunk/0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch
Modified:
mesa/trunk/PKGBUILD
------------------------------------------------------------------------+
0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch | 66 ++++++++++
PKGBUILD | 22 ++-
2 files changed, 81 insertions(+), 7 deletions(-)
Added: 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch
===================================================================
--- 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch (rev 0)
+++ 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch 2020-02-14 22:28:20 UTC (rev 375614)
@@ -0,0 +1,66 @@
+From 689817c9dfde9a0852f2b2489cb0fa93ffbcb215 Mon Sep 17 00:00:00 2001
+From: Krzysztof Raszkowski <krzysztof.raszkowski at intel.com>
+Date: Mon, 10 Feb 2020 16:24:10 +0100
+Subject: [PATCH] gallium/swr: simplify environmental variabled expansion code
+
+There were 2 versions of code doing the same thing.
+Since std::regexp are locale-sensitive better is to leave old
+good way to do this.
+
+Reviewed-by: Jan Zielinski <jan.zielinski at intel.com>
+Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3761>
+Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3761>
+---
+ .../codegen/templates/gen_knobs.cpp | 29 -------------------
+ 1 file changed, 29 deletions(-)
+
+diff --git a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
+index b073f73e3a0..194499aa1e0 100644
+--- a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
++++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp
+@@ -43,9 +43,6 @@
+ //========================================================
+ void KnobBase::autoExpandEnvironmentVariables(std::string& text)
+ {
+-#if (__GNUC__) && (GCC_VERSION < 40900)
+- // <regex> isn't implemented prior to gcc-4.9.0
+- // unix style variable replacement
+ size_t start;
+ while ((start = text.find("${'${'}")) != std::string::npos)
+ {
+@@ -64,32 +61,6 @@ void KnobBase::autoExpandEnvironmentVariables(std::string& text)
+ const std::string var = GetEnv(text.substr(start + 1, end - start - 1));
+ text.replace(start, end - start + 1, var);
+ }
+-#else
+- {
+- // unix style variable replacement
+- static std::regex env("\\$\\{([^}]+?)\\}");
+- std::smatch match;
+- while (std::regex_search(text, match, env))
+- {
+- const std::string var = GetEnv(match[1].str());
+- // certain combinations of gcc/libstd++ have problems with this
+- // text.replace(match[0].first, match[0].second, var);
+- text.replace(match.prefix().length(), match[0].length(), var);
+- }
+- }
+- {
+- // win32 style variable replacement
+- static std::regex env("%([^%]+?)%");
+- std::smatch match;
+- while (std::regex_search(text, match, env))
+- {
+- const std::string var = GetEnv(match[1].str());
+- // certain combinations of gcc/libstd++ have problems with this
+- // text.replace(match[0].first, match[0].second, var);
+- text.replace(match.prefix().length(), match[0].length(), var);
+- }
+- }
+-#endif
+ }
+
+ //========================================================
+--
+2.24.1
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2020-02-14 20:17:28 UTC (rev 375613)
+++ PKGBUILD 2020-02-14 22:28:20 UTC (rev 375614)
@@ -5,7 +5,7 @@
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=19.3.4
-pkgrel=1
+pkgrel=2
arch=('x86_64')
makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
@@ -14,9 +14,11 @@
url="https://www.mesa3d.org/"
license=('custom')
source=(https://mesa.freedesktop.org/archive/mesa-${pkgver}.tar.xz{,.sig}
+ 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch
LICENSE)
sha512sums=('2bbb3dc8f1d839f11fe12cc959393cd69607fa6714b2166b80299e0559d2d3b0ac38ed4e15ac3e5f472264eb24536d1901d350f7409f3a7e00d6f4ccbb2312fb'
'SKIP'
+ '10c62cef7b9cd2617453397a7585fcc36bbe3dbb817f44fd59aee2ba11df67e5943cd919838f51e37ee523757210c3a3685c4676f561801cc9e47378b1c5fa09'
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov at gmail.com>
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty at igalia.com>
@@ -24,6 +26,12 @@
'A5CC9FEC93F2F837CB044912336909B6B25FADFA' # Juan A. Suarez Romero <jasuarez at igalia.com>
'71C4B75620BC75708B4BDB254C95FAAB3EB073EC') # Dylan Baker <dylan at pnwbakers.com>
+prepare() {
+ cd mesa-$pkgver
+
+ patch -Np1 < ../0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch
+}
+
build() {
arch-meson mesa-$pkgver build \
-D b_lto=false \
@@ -78,7 +86,7 @@
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
@@ -116,7 +124,7 @@
depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' '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
@@ -128,7 +136,7 @@
depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
_install fakeinstall/usr/lib/dri/*_drv_video.so
-
+
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
@@ -137,12 +145,12 @@
depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
_install fakeinstall/usr/lib/vdpau
-
+
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
package_mesa() {
- depends=('libdrm' 'wayland' 'libxxf86vm' 'libxdamage' 'libxshmfence' 'libelf'
+ 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'
@@ -156,7 +164,7 @@
# 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*
More information about the arch-commits
mailing list