summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorZhirui Dai2024-04-02 15:38:31 -0700
committerZhirui Dai2024-04-02 15:38:31 -0700
commit9682a7eff467bc33237a84aa4ec20f1a3bd1888c (patch)
treedee41e4c5d604bdfd93366d9d0b9a1183abe01a4
parent6e80b9d45e70811aed28ef5cc185591b92e35aaa (diff)
downloadaur-9682a7eff467bc33237a84aa4ec20f1a3bd1888c.tar.gz
fix build with latest Eigen
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD18
2 files changed, 16 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index cce36bfb9cfc..9ca82888213e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = pcl-git
pkgdesc = a standalone, large scale, open project for 2D/3D image and point cloud processing
- pkgver = r14291.cc9c979cd
+ pkgver = r14353.21b58c1be
pkgrel = 1
url = http://pointclouds.org/
arch = i686
@@ -43,6 +43,8 @@ pkgbase = pcl-git
provides = pcl
conflicts = pcl
source = git+https://github.com/PointCloudLibrary/pcl
+ source = patch-eigen.patch::https://github.com/PointCloudLibrary/pcl/pull/5998.patch
+ sha256sums = SKIP
sha256sums = SKIP
pkgname = pcl-git
diff --git a/PKGBUILD b/PKGBUILD
index cc35b2f714c8..01dbb7ed3e18 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,7 +6,7 @@
# Contributor: lubosz
pkgname=pcl-git
-pkgver=r14291.cc9c979cd
+pkgver=r14353.21b58c1be
pkgrel=1
pkgdesc="a standalone, large scale, open project for 2D/3D image and point cloud processing"
arch=(i686 x86_64)
@@ -47,8 +47,14 @@ depends=(
gcc12
)
makedepends=(cmake git)
-source=(git+https://github.com/PointCloudLibrary/pcl)
-sha256sums=(SKIP)
+source=(
+ git+https://github.com/PointCloudLibrary/pcl
+ patch-eigen.patch::https://github.com/PointCloudLibrary/pcl/pull/5998.patch
+)
+sha256sums=(
+ SKIP
+ SKIP
+)
conflicts=(pcl)
provides=(pcl)
@@ -59,15 +65,16 @@ pkgver() {
}
prepare() {
+ cd "${srcdir}/pcl"
+ patch -Np1 -i "${srcdir}/patch-eigen.patch" || true
mkdir -p "$srcdir/build"
cd "$srcdir/build"
- export PATH="/opt/cuda/bin:$PATH" # FIX for CUDA 12.3
cmake "${srcdir}/pcl" \
-DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_CXX_FLAGS="${CXXFLAGS} -fPIC" \
-DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS} -Wl,--as-needed" \
-DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS} -Wl,--as-needed" \
- -DCMAKE_CUDA_ARCHITECTURES="52;60;60;62;70;72;75;80;86;86-virtual" \
+ -DCMAKE_CUDA_ARCHITECTURES="all" \
-DBUILD_apps=ON \
-DBUILD_apps_cloud_composer=ON \
-DBUILD_apps_in_hand_scanner=ON \
@@ -86,6 +93,7 @@ prepare() {
-DBUILD_gpu_tracking=ON \
-DBUILD_simulation=ON \
-DCMAKE_CUDA_COMPILER=/opt/cuda/bin/nvcc \
+ -DCMAKE_CUDA_HOST_COMPILER=/usr/bin/g++-12 \
-DCMAKE_MODULE_PATH=/usr/lib/cmake/OpenVDB \
-DWITH_QT=QT5 # VTK is still using Qt5
}