Auto update brlcad : 7.40.2

author: envolution 2024-11-12 10:43:57 +0000
committer: envolution 2024-11-12 10:43:57 +0000
commit: 287df660fe6b2462c327024397e5bc9c34592a15 (patch)
tree: 525412fd99978cc43032c7b656433d611387d517
parent: d793efd7da495a1cda834f1edcbf2c7110a14507 (diff)
download: aur-287df660fe6b2462c327024397e5bc9c34592a15.tar.gz
6 files changed, 106 insertions, 77 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d16fd9a7b341..ea7e791ad047 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = brlcad
 	pkgdesc = An extensive 3D solid modeling system.
-	pkgver = 7.36.0
+	pkgver = 7.40.2
 	pkgrel = 1
 	url = https://brlcad.org
 	install = brlcad.install
@@ -15,9 +15,15 @@ pkgbase = brlcad
 	depends = libgl
 	depends = libxft
 	depends = libxi
+	options = !strip
+	options = !debug
 	source = build.patch
-	source = https://github.com/BRL-CAD/brlcad/archive/refs/tags/rel-7-36-0.tar.gz
-	sha256sums = SKIP
-	sha256sums = 1108ae3bb031c5ab84c1c5eaf752bc253ae8a81853113afeba9d4b1ec61db835
+	source = clipper.core.h.patch
+	source = slacon_idamax_isamax.patch
+	source = https://github.com/BRL-CAD/brlcad/releases/download/rel-7-40-2/brlcad-7.40.2.tar.bz2
+	sha256sums = 74e8dc6bec7e83359439dc05d9f53105f487544ae61af19fca5658cc8f0d56d9
+	sha256sums = 9fb1f3670d3fc9a5566548ea56f7f51945eb2b9f782d6556adca4ddf111f12d9
+	sha256sums = 66ea42c548d50e203590afce317849766b91477da4e14cff494605288a22fb18
+	sha256sums = da444502029791d2c074fc3826b8c32fec9afd7e762d19cd9797279ad691b809
 
 pkgname = brlcad
diff --git a/.nvchecker.toml b/.nvchecker.toml
new file mode 100644
index 000000000000..4da958806224
--- /dev/null
+++ b/.nvchecker.toml
@@ -0,0 +1,7 @@
+[brlcad]
+source="github"
+github="BRL-CAD/brlcad"
+use_latest_release=true
+prefix="rel-"
+from_pattern = "-"
+to_pattern = "."
diff --git a/PKGBUILD b/PKGBUILD
index be5be6bee2be..5b72ab8bb4d8 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
+# Maintainer: envolution
 pkgname=brlcad
-pkgver=7.36.0
+pkgver=7.40.2
 pkgrel=1
 pkgdesc='An extensive 3D solid modeling system.'
 url='https://brlcad.org'
@@ -7,71 +8,77 @@ license=('LGPL' 'BSD' 'custom:BDL')
 arch=('i686' 'x86_64')
 depends=('gdal' 'libgl' 'libxft' 'libxi')
 makedepends=('cmake' 'ninja')
+options=(!strip !debug)
 install="${pkgname}.install"
 _tag_name="rel-${pkgver//./-}"
 source=(
-    'build.patch'
-    "https://github.com/BRL-CAD/${pkgname}/archive/refs/tags/${_tag_name}.tar.gz")
-sha256sums=(
-    'SKIP'
-    '1108ae3bb031c5ab84c1c5eaf752bc253ae8a81853113afeba9d4b1ec61db835')
-
+  'build.patch'
+  'clipper.core.h.patch'
+  'slacon_idamax_isamax.patch'
+  "https://github.com/BRL-CAD/${pkgname}/releases/download/${_tag_name}/${pkgname}-${pkgver}.tar.bz2"
+)
+sha256sums=('74e8dc6bec7e83359439dc05d9f53105f487544ae61af19fca5658cc8f0d56d9'
+            '9fb1f3670d3fc9a5566548ea56f7f51945eb2b9f782d6556adca4ddf111f12d9'
+            '66ea42c548d50e203590afce317849766b91477da4e14cff494605288a22fb18'
+            'da444502029791d2c074fc3826b8c32fec9afd7e762d19cd9797279ad691b809')
 
 _build_config='Release'
 _prefix="/opt/${pkgname}"
 
-
 prepare() {
-    patch \
-        --strip=0 \
-        "--directory=${srcdir}/${pkgname}-${_tag_name}" \
-        "--input=${srcdir}/build.patch"
-}
+  mkdir -p build
+  git clone -b "${_tag_name}" https://github.com/BRL-CAD/bext.git build/bext
+  pwd
+  ls -la
+  patch -p0 -i ../clipper.core.h.patch
+  patch -p0 -i ../slacon_idamax_isamax.patch
+  patch -p0 -i ../build.patch -d $pkgname-${pkgver}
 
+  cmake \
+    -G Ninja \
+    -S "${srcdir}/${pkgname}-${pkgver}" \
+    -B "${srcdir}/build" \
+    -Wno-dev \
+    "-DCMAKE_INSTALL_PREFIX=${_prefix}" \
+    "-DCMAKE_BUILD_TYPE=${_build_config}" \
+    -DBUILD_STATIC_LIBS=OFF \
+    -DBRLCAD_ENABLE_COMPILER_WARNINGS=OFF \
+    -DBRLCAD_ENABLE_STRICT=OFF \
+    -DBRLCAD_FLAGS_DEBUG=OFF \
+    -DBRLCAD_BUNDLED_LIBS=BUNDLED \
+    -DBRLCAD_GDAL=OFF \
+    -DBRLCAD_PNG=OFF \
+    -DBRLCAD_REGEX=OFF \
+    -DBRLCAD_ZLIB=OFF \
+    -DBRLCAD_ENABLE_OPENGL=ON \
+    -DBRLCAD_ENABLE_QT=ON \
+    -DBRLCAD_ENABLE_TCL=OFF
 
-build() {
-    cmake \
-        -G Ninja \
-        -S "${srcdir}/${pkgname}-${_tag_name}" \
-        -B "${srcdir}/build" \
-        -Wno-dev \
-        "-DCMAKE_INSTALL_PREFIX=${_prefix}" \
-        "-DCMAKE_BUILD_TYPE=${_build_config}" \
-        -DBUILD_STATIC_LIBS=OFF \
-        -DBRLCAD_ENABLE_COMPILER_WARNINGS=OFF \
-        -DBRLCAD_ENABLE_STRICT=OFF \
-        -DBRLCAD_FLAGS_DEBUG=OFF \
-        -DBRLCAD_BUNDLED_LIBS=BUNDLED \
-        -DBRLCAD_GDAL=OFF \
-        -DBRLCAD_PNG=OFF \
-        -DBRLCAD_REGEX=OFF \
-        -DBRLCAD_ZLIB=OFF \
-        -DBRLCAD_ENABLE_OPENGL=ON \
-        -DBRLCAD_ENABLE_QT=OFF
+}
 
-    cmake --build "${srcdir}/build" --config "${_build_config}"
+build() {
+  cmake --build "${srcdir}/build" --config "${_build_config}"
 
-    echo \
-        "export PATH=\"\$PATH:${_prefix}/bin\"" \
-        >"${srcdir}/build/${pkgname}.sh"
+  echo \
+    "export PATH=\"\$PATH:${_prefix}/bin\"" \
+    >"${srcdir}/build/${pkgname}.sh"
 }
 
-
 package() {
-    cmake \
-        --install "${srcdir}/build" \
-        --config "${_build_config}" \
-        --prefix "${pkgdir}${_prefix}"
+  cmake \
+    --install "${srcdir}/build" \
+    --config "${_build_config}" \
+    --prefix "${pkgdir}${_prefix}"
 
-    install \
-        -D \
-        --mode=u=rw,go=r \
-        "--target-directory=${pkgdir}/usr/share/licenses/${pkgname}" \
-        "${srcdir}/build/share/doc/legal/"{bdl,bsd}.txt
+  install \
+    -D \
+    --mode=u=rw,go=r \
+    "--target-directory=${pkgdir}/usr/share/licenses/${pkgname}" \
+    "${srcdir}/build/share/doc/legal/"{bdl,bsd}.txt
 
-    install \
-        -D \
-        --mode=u=rw,go=r \
-        "--target-directory=${pkgdir}/etc/profile.d" \
-        "${srcdir}/build/${pkgname}.sh"
+  install \
+    -D \
+    --mode=u=rw,go=r \
+    "--target-directory=${pkgdir}/etc/profile.d" \
+    "${srcdir}/build/${pkgname}.sh"
 }
diff --git a/build.patch b/build.patch
index d674ccd69ae7..0075ec674c13 100644
--- a/build.patch
+++ b/build.patch
@@ -1,15 +1,3 @@
---- db/nist/CMakeLists.txt
-+++ 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(
 --- regress/coverage/covgcheck.cpp
 +++ regress/coverage/covgcheck.cpp
 @@ -43,6 +43,7 @@
@@ -30,13 +18,3 @@
  #include <algorithm>
  #include <locale>
  #include <fstream>
---- src/other/ext/assetimport.cmake
-+++ src/other/ext/assetimport.cmake
-@@ -68,6 +68,7 @@ if (BRLCAD_ASSETIMPORT_BUILD)
-     -DASSIMP_BUILD_MINIZIP=ON
-     -DASSIMP_INJECT_DEBUG_POSTFIX=OFF
-     -DASSIMP_INSTALL_PDB=OFF
-+    -DASSIMP_WARNINGS_AS_ERRORS=OFF
-     DEPENDS ${ASSETIMPORT_DEPS}
-     LOG_CONFIGURE ${EXT_BUILD_QUIET}
-     LOG_BUILD ${EXT_BUILD_QUIET}
diff --git a/clipper.core.h.patch b/clipper.core.h.patch
new file mode 100644
index 000000000000..51177a3282f5
--- /dev/null
+++ b/clipper.core.h.patch
@@ -0,0 +1,11 @@
+--- ./build/bext/manifold/manifold/src/third_party/clipper2/include/clipper2/clipper.core.h	2024-11-08 16:45:27.205735113 -0500
++++ ./build/bext/manifold/manifold/src/third_party/clipper2/include/clipper2/clipper.core.h_patch	2024-11-08 18:42:49.950337130 -0500
+@@ -178,7 +178,7 @@
+     Point(const T2 x_, const T2 y_) { Init(x_, y_); }
+ 
+     template <typename T2>
+-    explicit Point<T>(const Point<T2>& p) { Init(p.x, p.y); }
++    explicit Point(const Point<T2>& p) { Init(p.x, p.y); }
+ 
+     Point operator * (const double scale) const
+     {
diff --git a/slacon_idamax_isamax.patch b/slacon_idamax_isamax.patch
new file mode 100644
index 000000000000..da3de620d210
--- /dev/null
+++ b/slacon_idamax_isamax.patch
@@ -0,0 +1,20 @@
+--- ./build/bext/geogram/geogram/src/lib/third_party/numerics/SUPERLU/slacon2.c	2024-11-08 16:45:57.828556643 -0500
++++ ./build/bext/geogram/geogram/src/lib/third_party/numerics/SUPERLU/slacon2.c_patched	2024-11-08 17:25:12.939279798 -0500
+@@ -22,7 +22,7 @@
+ #include <math.h>
+ #include "slu_Cnames.h"
+ 
+-extern int idamax_(int *, double *, int *);
++extern int isamax_(int *, float *, int *);
+ 
+ 
+ /*! \brief
+@@ -160,7 +160,7 @@
+ #ifdef _CRAY
+     isave[1] = ISAMAX(n, &x[0], &c__1);   /* j */
+ #else
+-    isave[1] = idamax_(n, &x[0], &c__1);  /* j */
++    isave[1] = isamax_(n, &x[0], &c__1);  /* j */
+ #endif
+     --isave[1];  /* --j; */
+     isave[2] = 2;  /* iter = 2; */
author	envolution	2024-11-12 10:43:57 +0000
committer	envolution	2024-11-12 10:43:57 +0000
commit	287df660fe6b2462c327024397e5bc9c34592a15 (patch)
tree	525412fd99978cc43032c7b656433d611387d517
parent	d793efd7da495a1cda834f1edcbf2c7110a14507 (diff)
download	aur-287df660fe6b2462c327024397e5bc9c34592a15.tar.gz