summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2020-03-24 20:55:04 +0100
committerbartus2020-03-24 20:55:04 +0100
commitd344dd0858af7b0deb0a8fe54f0794e0b2e5dbc0 (patch)
tree1a2abcad8710a3d7d839246c1bd0c6cf83e31f24
parent356d5a4d941f9058826b76159fb44fec72576af4 (diff)
downloadaur-d344dd0858af7b0deb0a8fe54f0794e0b2e5dbc0.tar.gz
Refactor+.
-rw-r--r--.SRCINFO22
-rw-r--r--PKGBUILD40
2 files changed, 31 insertions, 31 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6b9303e511b..f2c6b3c81b5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,30 +1,30 @@
pkgbase = cloudcompare-git
pkgdesc = A 3D point cloud (and triangular mesh) processing software
- pkgver = 2.10.2.r561.gd15c435b
+ pkgver = 2.10.2.r605.ge29c11df
pkgrel = 1
url = http://www.danielgm.net/cc/
arch = i686
arch = x86_64
license = GPL2
- makedepends = git
makedepends = cmake
+ makedepends = doxygen
+ makedepends = git
+ makedepends = laz-perf
+ makedepends = libharu
makedepends = ninja
makedepends = pcl
- makedepends = libharu
makedepends = proj
makedepends = python
- makedepends = doxygen
- makedepends = laz-perf
+ depends = cgal
+ depends = ffmpeg
+ depends = glew
+ depends = glu
+ depends = mesa
+ depends = pdal
depends = qt5-base
depends = qt5-tools
depends = qt5-svg
- depends = glu
- depends = glew
- depends = mesa
depends = vxl
- depends = ffmpeg
- depends = cgal
- depends = pdal
optdepends = pcl
provides = cloudcompare
conflicts = cloudcompare
diff --git a/PKGBUILD b/PKGBUILD
index cc028f6bf53..85aa77aeaf5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,20 @@
#!/hint/bash
-# Maintainer : bartus <arch-user-repo(at)bartus.33mail.com>
-# Contributor : Danilo Bargen <aur at dbrgn dot ch>
+# Maintainer : bartus <arch-user-repo(at)bartus.33mail.com>
# Contributor : Johannes Sauer <joh.sauer(at)gmail(dot)com>
-# shellcheck disable=SC2034,SC2154
+# Contributor : Danilo Bargen <aur at dbrgn dot ch>
+# shellcheck disable=SC2034,SC2154 # allow unused/uninitialized variables.
name=cloudcompare
#_fragment="#branch="
pkgname=${name}-git
-pkgver=2.10.2.r561.gd15c435b
+pkgver=2.10.2.r605.ge29c11df
pkgrel=1
pkgdesc="A 3D point cloud (and triangular mesh) processing software"
arch=('i686' 'x86_64')
url="http://www.danielgm.net/cc/"
license=('GPL2')
-depends=('qt5-base' 'qt5-tools' 'qt5-svg' 'glu' 'glew' 'mesa' 'vxl' 'ffmpeg' 'cgal' 'pdal')
-makedepends=('git' 'cmake' 'ninja' 'pcl' 'libharu' 'proj' 'python' 'doxygen' 'laz-perf')
+depends=('cgal' 'ffmpeg' 'glew' 'glu' 'mesa' 'pdal' 'qt5-base' 'qt5-tools' 'qt5-svg' 'vxl')
+makedepends=('cmake' 'doxygen' 'git' 'laz-perf' 'libharu' 'ninja' 'pcl' 'proj' 'python')
optdepends=('pcl')
conflicts=('cloudcompare')
provides=('cloudcompare')
@@ -29,20 +29,19 @@ md5sums=('SKIP'
'456526b717c1b47d52990df8f06a04e0')
prepare() {
- git -C "${name}" submodule update --init --recursive
- git -C "${name}" apply -v "${srcdir}"/constexpr.patch
+ git -C ${name} submodule update --init --recursive
+ git -C ${name} apply -v "${srcdir}"/constexpr.patch
}
pkgver() {
- git -C "${name}" describe --long --tags | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
+ git -C ${name} describe --long --tags | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
}
build() {
- mkdir -p build
-
- cmake -S "${name}" -B build \
- -G Ninja \
+# shellcheck disable=SC2191
+ CMAKE_FLAGS=(
-Wno-dev \
+ -DCMAKE_CXX_STANDARD=14 \
-DCMAKE_CXX_FLAGS=-fpermissive \
-DOPTION_PDAL_LAS=ON \
-DCMAKE_INSTALL_PREFIX=/usr \
@@ -75,7 +74,10 @@ build() {
-DINSTALL_QBROOM_PLUGIN=true \
-DINSTALL_QHOUGH_NORMALS_PLUGIN=true \
-DEIGEN_ROOT_DIR=/usr/include/eigen3
- ninja -C build "${MAKEFLAGS:--j1}"
+ )
+ cmake -B build -S ${name} -G Ninja "${CMAKE_FLAGS[@]}"
+# shellcheck disable=SC2086 # allow slitting for MAKEFLAGS carrying multiple flags.
+ ninja -C build ${MAKEFLAGS:--j1}
}
package() {
@@ -85,13 +87,11 @@ package() {
install -D -m 644 "${srcdir}"/*.desktop -t "${pkgdir}"/usr/share/applications/
# copy icons for *.desktop files
- # shellcheck disable=SC2164
- cd "${name}"
for size in 16 32 64 256; do
- install -D -m 644 qCC/images/icon/cc_icon_${size}.png "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/cc_icon.png
- install -D -m 644 qCC/images/icon/cc_viewer_icon_${size}.png "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/cc_viewer_icon.png
+ install -D -m 644 ${name}/qCC/images/icon/cc_icon_${size}.png "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/cc_icon.png
+ install -D -m 644 ${name}/qCC/images/icon/cc_viewer_icon_${size}.png "${pkgdir}"/usr/share/icons/hicolor/${size}x${size}/apps/cc_viewer_icon.png
done
- install -D -m 644 qCC/images/icon/cc_icon.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/cc_icon.svg
- install -D -m 644 qCC/images/icon/cc_viewer_icon.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/cc_viewer_icon.svg
+ install -D -m 644 ${name}/qCC/images/icon/cc_icon.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/cc_icon.svg
+ install -D -m 644 ${name}/qCC/images/icon/cc_viewer_icon.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/cc_viewer_icon.svg
}
# vim:set sw=2 ts=2 et: