[arch-commits] Commit in mesa/trunk (2 files)
Laurent Carlier
lcarlier at archlinux.org
Thu Feb 20 13:27:01 UTC 2020
Date: Thursday, February 20, 2020 @ 13:27:00
Author: lcarlier
Revision: 375917
upgpkg: mesa 20.0.0-1: upstream update 20.0.0
Modified:
mesa/trunk/PKGBUILD
Deleted:
mesa/trunk/0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch
------------------------------------------------------------------------+
0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch | 66 ----------
PKGBUILD | 27 +---
2 files changed, 10 insertions(+), 83 deletions(-)
Deleted: 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch
===================================================================
--- 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch 2020-02-20 12:38:00 UTC (rev 375916)
+++ 0001-gallium-swr-simplify-environmental-variabled-expansion-code.patch 2020-02-20 13:27:00 UTC (rev 375917)
@@ -1,66 +0,0 @@
-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-20 12:38:00 UTC (rev 375916)
+++ PKGBUILD 2020-02-20 13:27:00 UTC (rev 375917)
@@ -4,21 +4,19 @@
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=19.3.4
-pkgrel=2
+pkgver=20.0.0
+pkgrel=1
arch=('x86_64')
makedepends=('python-mako' 'libxml2' 'libx11' 'xorgproto' 'libdrm' 'libxshmfence' 'libxxf86vm'
- 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols'
+ 'libxdamage' 'libvdpau' 'libva' 'wayland' 'wayland-protocols' 'zstd'
'elfutils' 'llvm' 'libomxil-bellagio' 'libclc' 'clang' 'libglvnd' 'libunwind' 'lm_sensors'
'libxrandr' 'valgrind' 'glslang' 'meson')
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'
+sha512sums=('3968820029434682fb6644947c76e12b6bb991a3d05cb519a6ea971ecc4aa9b21d03f84b9a452cc21cc77a7981db9e40dd2dfd3ea3dee85b3dd88a59b4842bbb'
'SKIP'
- '10c62cef7b9cd2617453397a7585fcc36bbe3dbb817f44fd59aee2ba11df67e5943cd919838f51e37ee523757210c3a3685c4676f561801cc9e47378b1c5fa09'
'f9f0d0ccf166fe6cb684478b6f1e1ab1f2850431c06aa041738563eb1808a004e52cdec823c103c9e180f03ffc083e95974d291353f0220fe52ae6d4897fecc7')
validpgpkeys=('8703B6700E7EE06D7A39B8D6EDAE37B02CEB490D' # Emil Velikov <emil.l.velikov at gmail.com>
'946D09B5E4C9845E63075FF1D961C596A7203456' # Andres Gomez <tanty at igalia.com>
@@ -26,12 +24,6 @@
'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 \
@@ -89,6 +81,7 @@
_install fakeinstall/usr/share/vulkan/explicit_layer.d
_install fakeinstall/usr/lib/libVkLayer_MESA_overlay.so
+ _install fakeinstall/usr/bin/mesa-overlay-control.py
install -m644 -Dt "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE
}
@@ -95,7 +88,7 @@
package_opencl-mesa() {
pkgdesc="OpenCL support for AMD/ATI Radeon mesa drivers"
- depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang')
+ depends=('expat' 'libdrm' 'libelf' 'libclc' 'clang' 'zstd')
optdepends=('opencl-headers: headers necessary for OpenCL development')
provides=('opencl-driver')
@@ -108,7 +101,7 @@
package_vulkan-intel() {
pkgdesc="Intel's Vulkan mesa driver"
- depends=('wayland' 'libx11' 'libxshmfence' 'libdrm')
+ depends=('wayland' 'libx11' 'libxshmfence' 'libdrm' 'zstd')
optdepends=('vulkan-mesa-layer: a vulkan layer to display information using an overlay')
provides=('vulkan-driver')
@@ -121,7 +114,7 @@
package_vulkan-radeon() {
pkgdesc="Radeon's Vulkan mesa driver"
- depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'llvm-libs')
+ depends=('wayland' 'libx11' 'libxshmfence' 'libelf' 'libdrm' 'zstd' 'llvm-libs')
optdepends=('vulkan-mesa-layer: a vulkan layer to display information using an overlay')
provides=('vulkan-driver')
@@ -133,7 +126,7 @@
package_libva-mesa-driver() {
pkgdesc="VA-API implementation for gallium"
- depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
+ depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'zstd')
_install fakeinstall/usr/lib/dri/*_drv_video.so
@@ -142,7 +135,7 @@
package_mesa-vdpau() {
pkgdesc="Mesa VDPAU drivers"
- depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence')
+ depends=('libdrm' 'libx11' 'llvm-libs' 'expat' 'libelf' 'libxshmfence' 'zstd')
_install fakeinstall/usr/lib/vdpau
More information about the arch-commits
mailing list