[arch-commits] Commit in pdal/repos/community-x86_64 (4 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Sun May 20 20:06:13 UTC 2018


    Date: Sunday, May 20, 2018 @ 20:06:12
  Author: svenstaro
Revision: 325648

archrelease: copy trunk to community-x86_64

Added:
  pdal/repos/community-x86_64/PKGBUILD
    (from rev 325647, pdal/trunk/PKGBUILD)
  pdal/repos/community-x86_64/gcc.patch
    (from rev 325647, pdal/trunk/gcc.patch)
Deleted:
  pdal/repos/community-x86_64/PKGBUILD
  pdal/repos/community-x86_64/gcc.patch

-----------+
 PKGBUILD  |  105 +++++++++++++++++++++++++++++-------------------------------
 gcc.patch |   94 ++++++++++++++++++++++++++---------------------------
 2 files changed, 99 insertions(+), 100 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2018-05-20 20:06:00 UTC (rev 325647)
+++ PKGBUILD	2018-05-20 20:06:12 UTC (rev 325648)
@@ -1,53 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-# Contributor: SaultDon <sault.don gmail>
-pkgname=pdal
-pkgver=1.6.0
-pkgrel=3
-pkgdesc="A C++ library for translating and manipulating point cloud data"
-arch=('x86_64')
-url="http://www.pdal.io"
-license=('BSD')
-depends=('gdal' 'libgeotiff' 'laszip' 'jsoncpp')
-makedepends=('cmake' 'python' 'python-numpy' 'laz-perf' 'hexer-hobu')
-optdepends=('python-numpy: for the Python plugin'
-            'hexer-hobu: for the hexbin plugin'
-            'sqlite: for the sqlite plugin'
-            'postgresql-libs: for the postgresql plugin')
-provides=('pdal')
-source=("http://download.osgeo.org/pdal/PDAL-$pkgver-src.tar.gz"
-        gcc.patch)
-sha512sums=('2e3bb90033d2248277bae241e4c9387f175e31abfeb3951d9ccaddca8d8f4cf58606d9a6c1730c69a5a0814f708366a271a38f80359d1f0db4572f45e102bc32'
-            '4f71629c8ade61ca8266911b1d4ed6dd740bdf32a27e08f3a87d1c7d184036702deb61dc500ca41f734af8025285d9c9c59055a21044c9b3248632aa50ef5f95')
-
-prepare() {
-    cd "PDAL-$pkgver-src"
-
-    patch -Np1 < $srcdir/gcc.patch
-
-    [[ -d build ]] || mkdir build
-}
-
-build() {
-    cd "PDAL-$pkgver-src/build"
-
-    cmake .. \
-        -DCMAKE_INSTALL_PREFIX=/usr \
-        -DBUILD_PLUGIN_PYTHON=ON \
-        -DBUILD_PLUGIN_PGPOINTCLOUD=ON \
-        -DBUILD_PLUGIN_SQLITE=ON \
-        -DBUILD_PLUGIN_HEXBIN=ON \
-        -DWITH_LAZPERF=ON \
-        -DWITH_LASZIP=ON \
-        -DWITH_COMPLETION=ON
-
-    make
-}
-
-package() {
-    cd "PDAL-$pkgver-src/build"
-
-    make DESTDIR="$pkgdir/" install
-
-    cd "$srcdir/PDAL-$pkgver-src"
-    install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
-}

Copied: pdal/repos/community-x86_64/PKGBUILD (from rev 325647, pdal/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2018-05-20 20:06:12 UTC (rev 325648)
@@ -0,0 +1,52 @@
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+# Contributor: SaultDon <sault.don gmail>
+pkgname=pdal
+pkgver=1.6.0
+pkgrel=4
+pkgdesc="A C++ library for translating and manipulating point cloud data"
+arch=('x86_64')
+url="http://www.pdal.io"
+license=('BSD')
+depends=('gdal' 'libgeotiff' 'laszip' 'jsoncpp' 'hexer-hobu')
+makedepends=('cmake' 'python' 'python-numpy' 'laz-perf')
+optdepends=('python-numpy: for the Python plugin'
+            'sqlite: for the sqlite plugin'
+            'postgresql-libs: for the postgresql plugin')
+provides=('pdal')
+source=("http://download.osgeo.org/pdal/PDAL-$pkgver-src.tar.gz"
+        gcc.patch)
+sha512sums=('2e3bb90033d2248277bae241e4c9387f175e31abfeb3951d9ccaddca8d8f4cf58606d9a6c1730c69a5a0814f708366a271a38f80359d1f0db4572f45e102bc32'
+            '4f71629c8ade61ca8266911b1d4ed6dd740bdf32a27e08f3a87d1c7d184036702deb61dc500ca41f734af8025285d9c9c59055a21044c9b3248632aa50ef5f95')
+
+prepare() {
+    cd "PDAL-$pkgver-src"
+
+    patch -Np1 < $srcdir/gcc.patch
+
+    [[ -d build ]] || mkdir build
+}
+
+build() {
+    cd "PDAL-$pkgver-src/build"
+
+    cmake .. \
+        -DCMAKE_INSTALL_PREFIX=/usr \
+        -DBUILD_PLUGIN_PYTHON=ON \
+        -DBUILD_PLUGIN_PGPOINTCLOUD=ON \
+        -DBUILD_PLUGIN_SQLITE=ON \
+        -DBUILD_PLUGIN_HEXBIN=ON \
+        -DWITH_LAZPERF=ON \
+        -DWITH_LASZIP=ON \
+        -DWITH_COMPLETION=ON
+
+    make
+}
+
+package() {
+    cd "PDAL-$pkgver-src/build"
+
+    make DESTDIR="$pkgdir/" install
+
+    cd "$srcdir/PDAL-$pkgver-src"
+    install -Dm644 LICENSE.txt "${pkgdir}"/usr/share/licenses/$pkgname/LICENSE
+}

Deleted: gcc.patch
===================================================================
--- gcc.patch	2018-05-20 20:06:00 UTC (rev 325647)
+++ gcc.patch	2018-05-20 20:06:12 UTC (rev 325648)
@@ -1,47 +0,0 @@
-diff --git a/dimbuilder/DimBuilder.cpp b/dimbuilder/DimBuilder.cpp
-index dd2f4a4c7..96b978a67 100644
---- a/dimbuilder/DimBuilder.cpp
-+++ b/dimbuilder/DimBuilder.cpp
-@@ -174,9 +174,11 @@ bool DimBuilder::execute()
- void DimBuilder::extractDim(Json::Value& dim)
- {
-     DimSpec d;
-+    Json::Value empty;
- 
-     // Get dimension name.
--    Json::Value name = dim.removeMember("name");
-+    Json::Value name = dim.get("name", empty);
-+    dim.removeMember("name");
-     if (name.isNull())
-         throw dimbuilder_error("Dimension missing name.");
-     if (!name.isString())
-@@ -185,7 +187,8 @@ void DimBuilder::extractDim(Json::Value& dim)
-     validateDimension(d.m_name);
- 
-     // Get dimension description.
--    Json::Value description = dim.removeMember("description");
-+    Json::Value description = dim.get("description", empty);
-+    dim.removeMember("description");
-     if (description.isNull())
-     {
-         std::ostringstream oss;
-@@ -204,7 +207,8 @@ void DimBuilder::extractDim(Json::Value& dim)
-     d.m_description = description.asString();
- 
-     // Get dimension type
--    Json::Value type = dim.removeMember("type");
-+    Json::Value type = dim.get("type", empty);
-+    dim.removeMember("type");
-     if (type.isNull())
-     {
-         std::ostringstream oss;
-@@ -222,7 +226,8 @@ void DimBuilder::extractDim(Json::Value& dim)
-         throw dimbuilder_error(oss.str());
-     }
- 
--    Json::Value altNames = dim.removeMember("alt_names");
-+    Json::Value altNames = dim.get("alt_names", empty);
-+    dim.removeMember("alt_names");
-     if (!altNames.isNull())
-     {
-         if (!altNames.isString())

Copied: pdal/repos/community-x86_64/gcc.patch (from rev 325647, pdal/trunk/gcc.patch)
===================================================================
--- gcc.patch	                        (rev 0)
+++ gcc.patch	2018-05-20 20:06:12 UTC (rev 325648)
@@ -0,0 +1,47 @@
+diff --git a/dimbuilder/DimBuilder.cpp b/dimbuilder/DimBuilder.cpp
+index dd2f4a4c7..96b978a67 100644
+--- a/dimbuilder/DimBuilder.cpp
++++ b/dimbuilder/DimBuilder.cpp
+@@ -174,9 +174,11 @@ bool DimBuilder::execute()
+ void DimBuilder::extractDim(Json::Value& dim)
+ {
+     DimSpec d;
++    Json::Value empty;
+ 
+     // Get dimension name.
+-    Json::Value name = dim.removeMember("name");
++    Json::Value name = dim.get("name", empty);
++    dim.removeMember("name");
+     if (name.isNull())
+         throw dimbuilder_error("Dimension missing name.");
+     if (!name.isString())
+@@ -185,7 +187,8 @@ void DimBuilder::extractDim(Json::Value& dim)
+     validateDimension(d.m_name);
+ 
+     // Get dimension description.
+-    Json::Value description = dim.removeMember("description");
++    Json::Value description = dim.get("description", empty);
++    dim.removeMember("description");
+     if (description.isNull())
+     {
+         std::ostringstream oss;
+@@ -204,7 +207,8 @@ void DimBuilder::extractDim(Json::Value& dim)
+     d.m_description = description.asString();
+ 
+     // Get dimension type
+-    Json::Value type = dim.removeMember("type");
++    Json::Value type = dim.get("type", empty);
++    dim.removeMember("type");
+     if (type.isNull())
+     {
+         std::ostringstream oss;
+@@ -222,7 +226,8 @@ void DimBuilder::extractDim(Json::Value& dim)
+         throw dimbuilder_error(oss.str());
+     }
+ 
+-    Json::Value altNames = dim.removeMember("alt_names");
++    Json::Value altNames = dim.get("alt_names", empty);
++    dim.removeMember("alt_names");
+     if (!altNames.isNull())
+     {
+         if (!altNames.isString())



More information about the arch-commits mailing list