diff options
| author | bartus | 2024-04-10 13:52:41 +0200 |
|---|---|---|
| committer | bartus | 2024-04-10 13:58:08 +0200 |
| commit | 169024ea1fee6e12df62fb22ef67bea1ca7c544d (patch) | |
| tree | 277dad22494f40dccec9a468b217d58e0ed07d55 | |
| parent | e5989d1d6d3184572b8e436cfc2ead9b614bb1c5 (diff) | |
| download | aur-169024ea1fee6e12df62fb22ef67bea1ca7c544d.tar.gz | |
Loosen gcc version requirement
resolve #8
| -rw-r--r-- | .SRCINFO | 3 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
2 files changed, 7 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = meshlab pkgdesc = System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version) pkgver = 2023.12 - pkgrel = 2 + pkgrel = 3 url = https://www.meshlab.net arch = i686 arch = x86_64 @@ -14,7 +14,6 @@ pkgbase = meshlab makedepends = muparser makedepends = lib3ds makedepends = openctm-tools - makedepends = gcc12 depends = bzip2 depends = cgal depends = glew @@ -18,14 +18,14 @@ pkgname=meshlab pkgver=2023.12 _pkgver_vcg=${pkgver} -pkgrel=2 +pkgrel=3 pkgdesc="System for processing and editing of unstructured 3D models arising in 3D scanning (qt5 version)" arch=('i686' 'x86_64') url="https://www.meshlab.net" license=('GPL2') depends=('bzip2' 'cgal' 'glew' 'glu' 'openssl' 'qt5-base' 'qt5-declarative' 'qt5-script' 'qt5-xmlpatterns' 'xerces-c' 'gmp' 'mpfr' 'mesa' 'qhull') -makedepends=('boost' 'cmake' 'eigen' 'ninja' 'git' 'muparser' 'lib3ds' 'openctm-tools' 'gcc12') +makedepends=('boost' 'cmake' 'eigen' 'ninja' 'git' 'muparser' 'lib3ds' 'openctm-tools') optdepends=('lib3ds: for Autodesk`s 3D-Studio r3 and r4 .3DS file support' 'muparser: for filer_func plugins' 'openctm-tools: for compressed triangle mesh file format') @@ -43,10 +43,12 @@ prepare() { build() { _cmake_flags+=( '-DCMAKE_INSTALL_PREFIX=/usr' '-DCMAKE_BUILD_TYPE=Release' - '-DCMAKE_C_COMPILER=gcc-12' - '-DCMAKE_CXX_COMPILER=g++-12' + '-DCMAKE_C_COMPILER=gcc' + '-DCMAKE_CXX_COMPILER=g++' ) cmake "${_cmake_flags[@]}" -G Ninja -B "${srcdir}/build" -S "${srcdir}/meshlab" +# Fix gcc:13 build + sed -i '1 i\#include <cstdint>' "${srcdir}"/meshlab/src/external/downloads/{nexus-master/src/corto/include/corto/tunstall.h,libE57Format-2.3.0/include/E57Format.h} # shellcheck disable=SC2046 # allow MAKEFLAGS to split when passing multiple flags. ninja $(grep -oP -- '-+[A-z]+ ?[0-9]*'<<<"${MAKEFLAGS:--j1}") -C "${srcdir}/build" } |