pdal: update to 2.6.1
This commit is contained in:
@@ -1,11 +0,0 @@
|
||||
--- a/pdal/util/CMakeLists.txt
|
||||
+++ b/pdal/util/CMakeLists.txt
|
||||
@@ -11,7 +11,7 @@
|
||||
include(${PDAL_CMAKE_DIR}/unwind.cmake)
|
||||
include(${PDAL_CMAKE_DIR}/utfcpp.cmake)
|
||||
|
||||
-if(LIBUNWIND_FOUND)
|
||||
+if(LIBUNWIND_FOUND AND NOT WIN32)
|
||||
set(BACKTRACE_SOURCE BacktraceUnwind.cpp)
|
||||
set(BACKTRACE_LIBRARIES ${LIBUNWIND_LIBRARIES} ${CMAKE_DL_LIBS})
|
||||
elseif(LIBEXECINFO_FOUND)
|
||||
@@ -3,26 +3,30 @@
|
||||
_realname=pdal
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
|
||||
pkgver=2.5.6
|
||||
pkgver=2.6.1
|
||||
pkgrel=1
|
||||
pkgdesc="A C++ library for translating and manipulating point cloud data (mingw-w64)"
|
||||
arch=(any)
|
||||
mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
|
||||
mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
|
||||
url="https://www.pdal.io"
|
||||
msys2_repository_url="https://github.com/PDAL/PDAL"
|
||||
msys2_references=(
|
||||
'archlinux: pdal'
|
||||
)
|
||||
license=('spdx:BSD-3-Clause')
|
||||
depends=("${MINGW_PACKAGE_PREFIX}-gdal")
|
||||
makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
|
||||
"${MINGW_PACKAGE_PREFIX}-cmake"
|
||||
"${MINGW_PACKAGE_PREFIX}-ninja"
|
||||
"${MINGW_PACKAGE_PREFIX}-pkgconf"
|
||||
"${MINGW_PACKAGE_PREFIX}-hdf5")
|
||||
#"${MINGW_PACKAGE_PREFIX}-tiledb")
|
||||
"${MINGW_PACKAGE_PREFIX}-hdf5"
|
||||
"${MINGW_PACKAGE_PREFIX}-tiledb")
|
||||
optdepends=("${MINGW_PACKAGE_PREFIX}-hdf5: HDF plugin, read data in the HDF format"
|
||||
"${MINGW_PACKAGE_PREFIX}-tiledb: TileDB plugin, read/write data from TileDB")
|
||||
source=("https://github.com/PDAL/PDAL/releases/download/${pkgver}/PDAL-${pkgver}-src.tar.gz"
|
||||
0001-cmake-disable-backtrace-unwind.patch)
|
||||
sha256sums=('c4f51e7bb9843ecc5d51c47aad87d8ddbd919111fb49222294c5835be7c1fa85'
|
||||
'94638e8db55b3815c976643b73be114e71018fd8edb699b1488e4ddcd1583f75')
|
||||
"001-fix-build-with-libxml2-2.12.patch::https://github.com/PDAL/PDAL/commit/4957980a.patch")
|
||||
sha256sums=('d5c43e812df522fa89766e149247a392eb44ca225197dafced277f0d740018d0'
|
||||
'a5ad648687bc61fd834579420751c30dcde09d28752bdc5d292b656dddbe3898')
|
||||
|
||||
apply_patch_with_msg() {
|
||||
for _patch in "$@"
|
||||
@@ -34,31 +38,32 @@ apply_patch_with_msg() {
|
||||
|
||||
prepare() {
|
||||
cd PDAL-${pkgver}-src
|
||||
|
||||
apply_patch_with_msg \
|
||||
0001-cmake-disable-backtrace-unwind.patch
|
||||
001-fix-build-with-libxml2-2.12.patch
|
||||
}
|
||||
|
||||
build() {
|
||||
mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}
|
||||
|
||||
declare -a extra_config
|
||||
declare -a _extra_config
|
||||
if check_option "debug" "n"; then
|
||||
extra_config+=("-DCMAKE_BUILD_TYPE=Release")
|
||||
_extra_config+=("-DCMAKE_BUILD_TYPE=Release")
|
||||
else
|
||||
extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
|
||||
_extra_config+=("-DCMAKE_BUILD_TYPE=Debug")
|
||||
fi
|
||||
|
||||
MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
|
||||
"${MINGW_PREFIX}"/bin/cmake.exe \
|
||||
-Wno-dev \
|
||||
-GNinja \
|
||||
${extra_config[@]} \
|
||||
"${_extra_config[@]}" \
|
||||
-DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
|
||||
-DBUILD_SHARED_LIBS=ON \
|
||||
-DCMAKE_DLL_NAME_WITH_SOVERSION=ON \
|
||||
-DWITH_TESTS=OFF \
|
||||
-DBUILD_PLUGIN_HDF=ON \
|
||||
-DBUILD_PLUGIN_TILEDB=OFF \
|
||||
-DBUILD_PLUGIN_TILEDB=ON \
|
||||
-DWITH_BACKTRACE=OFF \
|
||||
../PDAL-${pkgver}-src
|
||||
|
||||
"${MINGW_PREFIX}"/bin/cmake.exe --build .
|
||||
|
||||
Reference in New Issue
Block a user