[arch-commits] Commit in liblas/repos/community-x86_64 (4 files)
Bruno Pagani
archange at gemini.archlinux.org
Sun Mar 20 12:09:21 UTC 2022
Date: Sunday, March 20, 2022 @ 12:09:21
Author: archange
Revision: 1163466
archrelease: copy trunk to community-x86_64
Added:
liblas/repos/community-x86_64/PKGBUILD
(from rev 1163465, liblas/trunk/PKGBUILD)
liblas/repos/community-x86_64/fix-gdal-2.5.patch
(from rev 1163465, liblas/trunk/fix-gdal-2.5.patch)
Deleted:
liblas/repos/community-x86_64/PKGBUILD
liblas/repos/community-x86_64/fix-gdal-2.5.patch
--------------------+
PKGBUILD | 112 +++++++++++++++++++++++++--------------------------
fix-gdal-2.5.patch | 56 ++++++++++++-------------
2 files changed, 84 insertions(+), 84 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2022-03-20 12:08:50 UTC (rev 1163465)
+++ PKGBUILD 2022-03-20 12:09:21 UTC (rev 1163466)
@@ -1,56 +0,0 @@
-# Maintainer: Bruno Pagani <archange at archlinux.org>
-
-pkgname=liblas
-pkgver=1.8.1.r120+ge12742f4
-pkgrel=8
-pkgdesc="C/C++ library for reading and writing the very common LAS LiDAR format"
-arch=(x86_64)
-url="https://liblas.org/"
-license=(BSD)
-depends=(boost-libs gdal laszip2 libgeotiff proj)
-makedepends=(cmake boost git)
-#source=(https://download.osgeo.org/liblas/libLAS-${pkgver}.tar.bz2)
-#md5sums=('2e6a975dafdf57f59a385ccb87eb5919')
-#sha256sums=('9adb4a98c63b461ed2bc82e214ae522cbd809cff578f28511122efe6c7ea4e76')
-source=(git+https://github.com/libLAS/libLAS.git#commit=e12742f4152146d3a71f9b2de573257e91736c93
- fix-gdal-2.5.patch)
-sha256sums=(SKIP c492dd229664c0f1be1a7ca7a7e2df0414a04e2ac89dc5b5ce61463fbe84a6af)
-
-pkgver() {
- cd libLAS
- git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./;s/-/+/'
-}
-
-prepare() {
- cd libLAS
- # https://github.com/libLAS/libLAS/issues/164
- patch -Np1 -i ../fix-gdal-2.5.patch
- # Find our laszip 2.x version
- sed -i 's at laszip/@laszip2/@g' cmake/modules/FindLASzip.cmake
- sed -i 's at laszip/@laszip2/@g' src/header.cpp
- sed -i 's at laszip/@laszip2/@g' src/version.cpp
- sed -i 's at laszip/@laszip2/@g' src/detail/zippoint.cpp
- sed -i 's at laszip/@laszip2/@g' src/detail/reader/zipreader.cpp
- sed -i 's at laszip/@laszip2/@g' src/detail/writer/zipwriter.cpp
-}
-
-build() {
- #cmake -B build -S libLAS-${pkgver} \
- cmake -B build -S libLAS \
- -DCMAKE_INSTALL_PREFIX=/usr \
- -DWITH_GDAL=True \
- -DWITH_GEOTIFF=True \
- -DWITH_LASZIP=True \
- -DWITH_UTILITIES=True \
- -DCMAKE_INSTALL_RPATH=/usr/lib/laszip2 \
- -DLASZIP_INCLUDE_DIR=/usr/include \
- -DLASZIP_LIBRARY=/usr/lib/laszip2/liblaszip.so \
- -G "Unix Makefiles"
- make -C build
-}
-
-package() {
- make -C build DESTDIR="${pkgdir}" install
- #install -Dm644 libLAS-${pkgver}/LICENSE.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}
- install -Dm644 libLAS/LICENSE.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}
-}
Copied: liblas/repos/community-x86_64/PKGBUILD (from rev 1163465, liblas/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2022-03-20 12:09:21 UTC (rev 1163466)
@@ -0,0 +1,56 @@
+# Maintainer: Bruno Pagani <archange at archlinux.org>
+
+pkgname=liblas
+pkgver=1.8.1.r127+ge6a1aaed
+pkgrel=1
+pkgdesc="C/C++ library for reading and writing the very common LAS LiDAR format"
+arch=(x86_64)
+url="https://liblas.org/"
+license=(BSD)
+depends=(boost-libs gdal laszip2 libgeotiff proj)
+makedepends=(cmake boost git)
+#source=(https://download.osgeo.org/liblas/libLAS-${pkgver}.tar.bz2)
+#md5sums=('2e6a975dafdf57f59a385ccb87eb5919')
+#sha256sums=('9adb4a98c63b461ed2bc82e214ae522cbd809cff578f28511122efe6c7ea4e76')
+source=(git+https://github.com/libLAS/libLAS.git#commit=e6a1aaed412d638687b8aec44f7b12df7ca2bbbb
+ fix-gdal-2.5.patch)
+sha256sums=(SKIP c492dd229664c0f1be1a7ca7a7e2df0414a04e2ac89dc5b5ce61463fbe84a6af)
+
+pkgver() {
+ cd libLAS
+ git describe --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./;s/-/+/'
+}
+
+prepare() {
+ cd libLAS
+ # https://github.com/libLAS/libLAS/issues/164
+ patch -Np1 -i ../fix-gdal-2.5.patch
+ # Find our laszip 2.x version
+ sed -i 's at laszip/@laszip2/@g' cmake/modules/FindLASzip.cmake
+ sed -i 's at laszip/@laszip2/@g' src/header.cpp
+ sed -i 's at laszip/@laszip2/@g' src/version.cpp
+ sed -i 's at laszip/@laszip2/@g' src/detail/zippoint.cpp
+ sed -i 's at laszip/@laszip2/@g' src/detail/reader/zipreader.cpp
+ sed -i 's at laszip/@laszip2/@g' src/detail/writer/zipwriter.cpp
+}
+
+build() {
+ #cmake -B build -S libLAS-${pkgver} \
+ cmake -B build -S libLAS \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DWITH_GDAL=ON \
+ -DWITH_GEOTIFF=ON \
+ -DWITH_LASZIP=ON \
+ -DWITH_UTILITIES=ON \
+ -DCMAKE_INSTALL_RPATH=/usr/lib/laszip2 \
+ -DLASZIP_INCLUDE_DIR=/usr/include \
+ -DLASZIP_LIBRARY=/usr/lib/laszip2/liblaszip.so \
+ -G "Unix Makefiles"
+ make -C build
+}
+
+package() {
+ make -C build DESTDIR="${pkgdir}" install
+ #install -Dm644 libLAS-${pkgver}/LICENSE.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}
+ install -Dm644 libLAS/LICENSE.txt -t "${pkgdir}"/usr/share/licenses/${pkgname}
+}
Deleted: fix-gdal-2.5.patch
===================================================================
--- fix-gdal-2.5.patch 2022-03-20 12:08:50 UTC (rev 1163465)
+++ fix-gdal-2.5.patch 2022-03-20 12:09:21 UTC (rev 1163466)
@@ -1,28 +0,0 @@
-diff --git a/src/gt_wkt_srs.cpp b/src/gt_wkt_srs.cpp
---- a/src/gt_wkt_srs.cpp
-+++ b/src/gt_wkt_srs.cpp
-@@ -299,7 +299,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn )
- oSRS.SetFromUserInput(pszWKT);
- oSRS.SetExtension( "PROJCS", "PROJ4",
- "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs" );
-- oSRS.FixupOrdering();
- CPLFree(pszWKT);
- pszWKT = NULL;
- oSRS.exportToWkt(&pszWKT);
-@@ -505,7 +504,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn )
- {
- char *pszWKT;
- oSRS.morphFromESRI();
-- oSRS.FixupOrdering();
- if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE )
- return pszWKT;
- }
-@@ -1107,8 +1105,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn )
- /* ==================================================================== */
- char *pszWKT;
-
-- oSRS.FixupOrdering();
--
- if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE )
- return pszWKT;
- else
Copied: liblas/repos/community-x86_64/fix-gdal-2.5.patch (from rev 1163465, liblas/trunk/fix-gdal-2.5.patch)
===================================================================
--- fix-gdal-2.5.patch (rev 0)
+++ fix-gdal-2.5.patch 2022-03-20 12:09:21 UTC (rev 1163466)
@@ -0,0 +1,28 @@
+diff --git a/src/gt_wkt_srs.cpp b/src/gt_wkt_srs.cpp
+--- a/src/gt_wkt_srs.cpp
++++ b/src/gt_wkt_srs.cpp
+@@ -299,7 +299,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn )
+ oSRS.SetFromUserInput(pszWKT);
+ oSRS.SetExtension( "PROJCS", "PROJ4",
+ "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext +no_defs" );
+- oSRS.FixupOrdering();
+ CPLFree(pszWKT);
+ pszWKT = NULL;
+ oSRS.exportToWkt(&pszWKT);
+@@ -505,7 +504,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn )
+ {
+ char *pszWKT;
+ oSRS.morphFromESRI();
+- oSRS.FixupOrdering();
+ if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE )
+ return pszWKT;
+ }
+@@ -1107,8 +1105,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn )
+ /* ==================================================================== */
+ char *pszWKT;
+
+- oSRS.FixupOrdering();
+-
+ if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE )
+ return pszWKT;
+ else
More information about the arch-commits
mailing list