diff options
Diffstat (limited to 'source/x')
| -rw-r--r-- | source/x/mesa/0001-swr-Fix-GCC-4.9-checks.patch | 58 | ||||
| -rwxr-xr-x | source/x/mesa/mesa.SlackBuild | 11 |
2 files changed, 65 insertions, 4 deletions
diff --git a/source/x/mesa/0001-swr-Fix-GCC-4.9-checks.patch b/source/x/mesa/0001-swr-Fix-GCC-4.9-checks.patch new file mode 100644 index 000000000..03542cc4d --- /dev/null +++ b/source/x/mesa/0001-swr-Fix-GCC-4.9-checks.patch @@ -0,0 +1,58 @@ +From 4656d2d30a8c176d81f31827302cd082eff59de3 Mon Sep 17 00:00:00 2001 +From: Vinson Lee <vlee@freedesktop.org> +Date: Sat, 1 Feb 2020 01:12:32 -0800 +Subject: [PATCH] swr: Fix GCC 4.9 checks. + +Fixes: f0a22956be48 ("swr/rast: _mm*_undefined_* implementations for gcc<4.9") +Fixes: e21fc2c62527 ("swr/rast: non-regex knob fallback code for gcc < 4.9") +Signed-off-by: Vinson Lee <vlee@freedesktop.org> +Reviewed-by: Jan Zielinski <jan.zielinski@intel.com> +(cherry picked from commit deb2bbf57ec1d0660dd85b7080bf5ebeb10e8768) +--- + .pick_status.json | 2 +- + .../drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp | 2 +- + src/gallium/drivers/swr/rasterizer/common/os.h | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/.pick_status.json b/.pick_status.json +index a442be492f4..af4f23fb12f 100644 +--- a/.pick_status.json ++++ b/.pick_status.json +@@ -319,7 +319,7 @@ + "description": "swr: Fix GCC 4.9 checks.", + "nominated": true, + "nomination_type": 1, +- "resolution": 0, ++ "resolution": 1, + "master_sha": null, + "because_sha": "f0a22956be4802e01f2b4f3244f011212626f12d" + }, +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 1ef83ad10d1..b073f73e3a0 100644 +--- a/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp ++++ b/src/gallium/drivers/swr/rasterizer/codegen/templates/gen_knobs.cpp +@@ -43,7 +43,7 @@ + //======================================================== + void KnobBase::autoExpandEnvironmentVariables(std::string& text) + { +-#if (__GNUC__) && (GCC_VERSION < 409000) ++#if (__GNUC__) && (GCC_VERSION < 40900) + // <regex> isn't implemented prior to gcc-4.9.0 + // unix style variable replacement + size_t start; +diff --git a/src/gallium/drivers/swr/rasterizer/common/os.h b/src/gallium/drivers/swr/rasterizer/common/os.h +index e812da39851..7d33f6d99d6 100644 +--- a/src/gallium/drivers/swr/rasterizer/common/os.h ++++ b/src/gallium/drivers/swr/rasterizer/common/os.h +@@ -182,7 +182,7 @@ static INLINE void _mm256_storeu2_m128i(__m128i* hi, __m128i* lo, __m256i a) + } + + // gcc prior to 4.9 doesn't have _mm*_undefined_* +-#if (__GNUC__) && (GCC_VERSION < 409000) ++#if (__GNUC__) && (GCC_VERSION < 40900) + #define _mm_undefined_si128 _mm_setzero_si128 + #define _mm256_undefined_ps _mm256_setzero_ps + #endif +-- +2.25.0 + diff --git a/source/x/mesa/mesa.SlackBuild b/source/x/mesa/mesa.SlackBuild index a3cf4ae3d..a987721f3 100755 --- a/source/x/mesa/mesa.SlackBuild +++ b/source/x/mesa/mesa.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2007, 2008, 2009, 2010, 2011, 2013, 2014, 2015, 2016, 2017, 2018, 2019, 2020 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,9 +23,9 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=mesa -VERSION=${VERSION:-$(echo $PKGNAM-1*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} +VERSION=${VERSION:-$(echo $PKGNAM-[0-9]*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} DEMOVERS=${DEMOVERS:-8.4.0} -BUILD=${BUILD:-1} +BUILD=${BUILD:-2} BUILD_DEMOS=${BUILD_DEMOS:-YES} NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "} @@ -77,7 +77,7 @@ mkdir -p $TMP $PKG cd $TMP rm -rf ${PKGNAM}-${VERSION} -tar xvf $CWD/${PKGNAM}-${VERSION}.tar.xz || exit 1 +tar xvf $CWD/${PKGNAM}-${VERSION}.tar.?z || exit 1 cd ${PKGNAM}-$VERSION || exit 1 # Let's kill the warning about operating on a dangling symlink: @@ -101,6 +101,9 @@ if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then done fi +# Revert a patch causing illegal instruction crashes starting X: +zcat $CWD/0001-swr-Fix-GCC-4.9-checks.patch.gz | patch -R -p1 --verbose || exit 1 + # Configure, build, and install: export CFLAGS="$SLKCFLAGS" export CXXFLAGS="$SLKCFLAGS" |