diff --git a/graphics/brlcad/brlcad-skip-gstep.patch b/graphics/brlcad/brlcad-skip-gstep.patch deleted file mode 100644 index 5768ad63a25..00000000000 --- a/graphics/brlcad/brlcad-skip-gstep.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/db/nist/CMakeLists.txt -+++ b/db/nist/CMakeLists.txt -@@ -10,7 +10,8 @@ set(NIST_SAMPLE_MODELS - ) - - foreach(im ${NIST_SAMPLE_MODELS}) -- ADD_G_TARGET(${im} "BRL-CAD Geometry Models/Sample") -+# disabled because this often segfaults -+# ADD_G_TARGET(${im} "BRL-CAD Geometry Models/Sample") - endforeach(im ${NIST_SAMPLE_MODELS}) - - CMAKEFILES( diff --git a/graphics/brlcad/brlcad.SlackBuild b/graphics/brlcad/brlcad.SlackBuild index 47795622176..a7c1cb4fa69 100644 --- a/graphics/brlcad/brlcad.SlackBuild +++ b/graphics/brlcad/brlcad.SlackBuild @@ -15,7 +15,7 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=brlcad -VERSION=${VERSION:-7.38.2} +VERSION=${VERSION:-7.42.0} SRCVER=rel-${VERSION//./-} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} @@ -75,18 +75,17 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+ -# thanks arch maintainers. -# fixes build on i586. -patch -p1 < $CWD/brlcad-skip-gstep.patch -sed -i 's%#define OPENNURBS_INC_IN_PROGRESS%#define OPENNURBS_INC_IN_PROGRESS\n\n#define ON_'${ENDIAN}'_ENDIAN%' src/other/openNURBS/opennurbs.h - +if [ $(cmake --version |head -1 |cut -f3 -d' ') == "3.21.4" ]; then + echo "export PATH for cmake-opt" + export PATH="/opt/cmake-opt/bin/:$PATH" +fi mkdir -p build cd build # There is a "known issue" according to the guys on #brlcad and we need # the cmake define "-DBRLCAD_ENABLE_STRICT=OFF" for now cmake \ - -DBRLCAD_BUNDLED_LIBS=AUTO \ + -DBRLCAD_BUNDLED_LIBS=ON \ -DBRLCAD_ENABLE_OPENGL=ON \ -DBRLCAD_ENABLE_RUNTIME_DEBUG=${BRLCAD_ENABLE_RUNTIME_DEBUG:-ON} \ -DBRLCAD_FLAGS_DEBUG=OFF \ diff --git a/graphics/brlcad/brlcad.info b/graphics/brlcad/brlcad.info index 18235da774c..5fcd5b66971 100644 --- a/graphics/brlcad/brlcad.info +++ b/graphics/brlcad/brlcad.info @@ -1,10 +1,10 @@ PRGNAM="brlcad" -VERSION="7.38.2" +VERSION="7.42.0" HOMEPAGE="https://brlcad.org" -DOWNLOAD="https://github.com/BRL-CAD/brlcad/archive/rel-7-38-2/brlcad-7-38-2.tar.gz" -MD5SUM="658a363c6064532bf17cba5924cab7f1" +DOWNLOAD="https://github.com/BRL-CAD/brlcad/archive/rel-7-42-0/brlcad-rel-7-42-0.tar.gz" +MD5SUM="f31109c8adf2a5dea7c5a196e663b648" DOWNLOAD_x86_64="" MD5SUM_x86_64="" -REQUIRES="" +REQUIRES="cmake-opt" MAINTAINER="Yth - Arnaud" EMAIL="yth@ythogtha.org"