Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=13ecf958f8d5f9e526023d6c8bda212dd702ac96
commit 13ecf958f8d5f9e526023d6c8bda212dd702ac96 Author: DeX77 <[email protected]> Date: Thu Oct 19 15:32:12 2017 +0200 mesa-17.2.3-1-x86_64 * version bump diff --git a/source/x11/mesa/FrugalBuild b/source/x11/mesa/FrugalBuild index 63cb5b7..63376dd 100644 --- a/source/x11/mesa/FrugalBuild +++ b/source/x11/mesa/FrugalBuild @@ -36,8 +36,8 @@ fi ## we want to see whatever we are missing things in splitting. If we go and just Frm stuff ## we may 1) not notice new libs/files and 2) while 1 we may break things. pkgname=mesa -pkgver=17.2.2 -pkgrel=2 +pkgver=17.2.3 +pkgrel=1 pkgdesc="Mesa is a 3D graphics library" url="http://mesa3d.sourceforge.net/"; _F_archive_grepv="-rc" @@ -71,9 +71,8 @@ else source=(https://mesa.freedesktop.org/archive/$pkgname-$pkgver.tar.xz \ nouveau_locking_1.patch \ nouveau_locking_2.patch \ - nouveau_locking_3.patch \ - swr-fix.patch) - signatures=("${source[0]}".sig '' '' '' '') + nouveau_locking_3.patch ) + signatures=("${source[0]}".sig '' '' '' ) fi subpkgs=('libgl' 'mesa-libgl-headers') diff --git a/source/x11/mesa/swr-fix.patch b/source/x11/mesa/swr-fix.patch deleted file mode 100644 index af25598..0000000 --- a/source/x11/mesa/swr-fix.patch +++ /dev/null @@ -1,39 +0,0 @@ -From 21e271024d8e050b75361c2da2e5783100f2e87b Mon Sep 17 00:00:00 2001 -From: Emil Velikov <[email protected]> -Date: Mon, 18 Sep 2017 11:29:21 +0100 -Subject: swr/rast: do not crash on NULL strings returned by getenv - -The current convenience function GetEnv feeds the results of getenv -directly into std::string(). That is a bad idea, since the variable -may be unset, thus we feed NULL into the C++ construct. - -The latter of which is not allowed and leads to a crash. - -v2: Better variable name, implicit char* -> std::string conversion (Eric) - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101832 -Fixes: a25093de718 ("swr/rast: Implement JIT shader caching to disk") -Cc: Tim Rowley <[email protected]> -Cc: Laurent Carlier <[email protected]> -Cc: Bernhard Rosenkraenzer <[email protected]> -[Emil Velikov: make an actual commit from the misc diff] -Signed-off-by: Emil Velikov <[email protected]> -Reviewed-by: Eric Engestrom <[email protected]> (v1) -Reviewed-by: Laurent Carlier <[email protected]> (v1) - -diff --git a/src/gallium/drivers/swr/rasterizer/core/utils.h b/src/gallium/drivers/swr/rasterizer/core/utils.h -index b096d21..c926f6a 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 *env = getenv(variableName.c_str()); -+ output = env ? env : ""; - #endif - - return output; --- -cgit v0.10.2 \ No newline at end of file _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
