aboutsummarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2021-05-20 13:25:20 +0200
committerbartus2021-05-20 13:25:20 +0200
commitb473e8f856e008b4e71be018ca61a10992629a51 (patch)
tree07e8d3afbaa43ada87f659a428f58f7b397aca94
parenta41dbc41806efd90a2d9b0ce1cc83b22f55bc0df (diff)
downloadaur-b473e8f856e008b4e71be018ca61a10992629a51.tar.gz
Fix gcc:11 regression: https://bugs.archlinux.org/task/70930
-rw-r--r--.SRCINFO3
-rw-r--r--PKGBUILD8
2 files changed, 9 insertions, 2 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8a6c8b1fceb6..c06d5eae44bf 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
pkgbase = blender-develop-git
pkgdesc = Development version of Blender (non-conflicting version)
- pkgver = 3.0.r105731.gecc7a837982
+ pkgver = 3.0.r106161.g0745afeddb6
pkgrel = 1
url = https://blender.org/
changelog = blender.changelog
arch = i686
arch = x86_64
license = GPL
+ makedepends = gcc10
makedepends = ninja
makedepends = git
makedepends = cmake
diff --git a/PKGBUILD b/PKGBUILD
index 33501fff5a17..23e4fb621bb1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,6 +6,12 @@ _fragment=${FRAGMENT:-#branch=master}
# shellcheck disable=SC2206
[[ -v CUDA_ARCH ]] && _cuda_capability=(${CUDA_ARCH})
+# fix gcc:11 regression: https://bugs.archlinux.org/task/70930
+makedepends+=('gcc10')
+_CMAKE_FLAGS+=( -DCMAKE_C_COMPILER=gcc-10
+ -DCMAKE_CXX_COMPILER=g++-10
+)
+
# opencolorio=2 fix (add LD_LIBRRY_PATH or rpath to blender-2.93)
_CMAKE_FLAGS+=( -DOSL_ROOT_DIR=/opt/osl
-DOPENIMAGEIO_ROOT_DIR=/opt/oiio
@@ -26,7 +32,7 @@ _CMAKE_FLAGS+=( -DOSL_ROOT_DIR=/opt/osl
((DISABLE_CUDA)) && optdepends+=('cuda: CUDA support in Cycles') || { makedepends+=('cuda') ; ((DISABLE_OPTIX)) || makedepends+=('optix>=7.0'); }
pkgname=blender-develop-git
-pkgver=3.0.r105731.gecc7a837982
+pkgver=3.0.r106161.g0745afeddb6
pkgrel=1
pkgdesc="Development version of Blender (non-conflicting version)"
changelog=blender.changelog