laszip: Update to 3.1.1
This commit is contained in:
@@ -1,35 +0,0 @@
|
||||
diff -c -r LASzip-2.2.0.orig/CMakeLists.txt LASzip-2.2.0/CMakeLists.txt
|
||||
*** LASzip-2.2.0.orig/CMakeLists.txt 2013-08-05 15:05:19.000000000 -0300
|
||||
--- LASzip-2.2.0/CMakeLists.txt 2016-03-13 19:42:53.853767500 -0300
|
||||
***************
|
||||
*** 78,84 ****
|
||||
###############################################################################
|
||||
# Installation settings
|
||||
|
||||
! if(WIN32)
|
||||
set(DEFAULT_LIB_SUBDIR lib)
|
||||
set(DEFAULT_DATA_SUBDIR .)
|
||||
set(DEFAULT_INCLUDE_SUBDIR include)
|
||||
--- 78,84 ----
|
||||
###############################################################################
|
||||
# Installation settings
|
||||
|
||||
! if(WIN32 AND NOT MINGW)
|
||||
set(DEFAULT_LIB_SUBDIR lib)
|
||||
set(DEFAULT_DATA_SUBDIR .)
|
||||
set(DEFAULT_INCLUDE_SUBDIR include)
|
||||
***************
|
||||
*** 154,159 ****
|
||||
|
||||
add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
|
||||
|
||||
! if (WIN32)
|
||||
include(BuildOSGeo4W)
|
||||
! endif(WIN32)
|
||||
--- 154,159 ----
|
||||
|
||||
add_custom_target(dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
|
||||
|
||||
! if (WIN32 AND NOT MINGW)
|
||||
include(BuildOSGeo4W)
|
||||
! endif(WIN32 AND NOT MINGW)
|
||||
@@ -3,21 +3,21 @@
|
||||
_realname=laszip
|
||||
pkgbase=mingw-w64-${_realname}
|
||||
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
|
||||
pkgver=2.2.0
|
||||
pkgver=3.1.1
|
||||
pkgrel=1
|
||||
pkgdesc="Free and lossless LiDAR compression (mingw-w64)"
|
||||
arch=('any')
|
||||
url="https://www.laszip.org/"
|
||||
license=('LGPL')
|
||||
makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-cmake")
|
||||
source=("${_realname}-${pkgver}.tar.gz::https://codeload.github.com/LASzip/LASzip/tar.gz/v${pkgver}"
|
||||
"${_realname}-${pkgver}.patch")
|
||||
sha256sums=('b8e8cc295f764b9d402bc587f3aac67c83ed8b39f1cb686b07c168579c61fbb2'
|
||||
'401cfd64246a92af14d2af79983028ab1794f9bc8f6d20f748cf52360e269fa7')
|
||||
source=(https://github.com/LASzip/LASzip/releases/download/${pkgver}/laszip-src-${pkgver}.tar.gz
|
||||
"${_realname}-3.1.1.patch")
|
||||
sha256sums=('53307e39072318b0175787cf0ed445de12efe0d6b4ccae66829a9a475f3aca19'
|
||||
'c3d98f0bb85bb78e8cd31e1578799ed2ebda67b567a96c07d22b6eb2c9f208ef')
|
||||
|
||||
prepare() {
|
||||
cd "${srcdir}/${_realname}-${pkgver}"
|
||||
patch -Np1 -i "${srcdir}/${_realname}-${pkgver}.patch"
|
||||
cd "${srcdir}/${_realname}-src-${pkgver}"
|
||||
patch -Np1 -i "${srcdir}/${_realname}-3.1.1.patch"
|
||||
}
|
||||
|
||||
build() {
|
||||
@@ -29,7 +29,7 @@ build() {
|
||||
${MINGW_PREFIX}/bin/cmake.exe \
|
||||
-G"MSYS Makefiles" \
|
||||
-DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
|
||||
"../${_realname}-${pkgver}"
|
||||
"../${_realname}-src-${pkgver}"
|
||||
|
||||
make
|
||||
}
|
||||
|
||||
16
mingw-w64-laszip/laszip-3.1.1.patch
Normal file
16
mingw-w64-laszip/laszip-3.1.1.patch
Normal file
@@ -0,0 +1,16 @@
|
||||
--- laszip-src-3.1.1/cmake/macros.cmake.orig 2017-11-09 14:29:52.850009700 +0300
|
||||
+++ laszip-src-3.1.1/cmake/macros.cmake 2017-11-09 14:30:00.597623800 +0300
|
||||
@@ -183,10 +183,10 @@
|
||||
"share/doc/${PROJECT_NAME_LOWER}-${LASZIP_VERSION_MAJOR}.${LASZIP_VERSION_MINOR}")
|
||||
set(LASZIP_BIN_INSTALL_DIR "bin")
|
||||
set(LASZIP_PLUGIN_INSTALL_DIR "share/pdal/plugins")
|
||||
- if(WIN32)
|
||||
+ if(MSVC)
|
||||
set(LASZIPCONFIG_INSTALL_DIR "cmake")
|
||||
- else(WIN32)
|
||||
+ else(MSVC)
|
||||
set(LASZIPCONFIG_INSTALL_DIR
|
||||
"share/${PROJECT_NAME_LOWER}-${LASZIP_VERSION_MAJOR}.${LASZIP_VERSION_MINOR}")
|
||||
- endif(WIN32)
|
||||
+ endif(MSVC)
|
||||
endmacro(SET_INSTALL_DIRS)
|
||||
Reference in New Issue
Block a user