[pdal] 06/12: Add patch to not require Nitro dependency (disable nitfwrap tool by default).

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master-git
in repository pdal.

commit 06874f14546084288617381f4b44547a94d24394
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Apr 30 17:12:11 2016 +0200

    Add patch to not require Nitro dependency (disable nitfwrap tool by default).
---
 debian/changelog                        |  2 ++
 debian/patches/dont-require-nitro.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f5de30f..7531d90 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ pdal (1.2.0+git20160429-cbe9b08-1) UNRELEASED; urgency=medium
     - Drop Files section for OGR.cpp, relicensed to BSD-3-Clause
     - Add license & copyright for arbiter files
   * Drop jsoncpp.patch, fixed upstream. Refresh privacy-breach.patch.
+  * Add patch to not require Nitro dependency
+    (disable nitfwrap tool by default).
 
  -- Bas Couwenberg <sebastic at debian.org>  Sat, 30 Apr 2016 15:30:38 +0200
 
diff --git a/debian/patches/dont-require-nitro.patch b/debian/patches/dont-require-nitro.patch
new file mode 100644
index 0000000..f4bfefb
--- /dev/null
+++ b/debian/patches/dont-require-nitro.patch
@@ -0,0 +1,25 @@
+Description: Don't require Nitro dependency.
+ Like the NITF plugin, the tool should not be built by default.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: https://github.com/PDAL/PDAL/pull/1235
+Applied-Upstream: https://github.com/PDAL/PDAL/commit/9b4e87c383ef5b645f18b8b0252eddfd46d7d158
+
+--- a/cmake/options.cmake
++++ b/cmake/options.cmake
+@@ -88,6 +88,8 @@ option(BUILD_PLUGIN_PYTHON
+ add_feature_info("Python plugin" BUILD_PLUGIN_PYTHON
+     "add features that depend on python")
+ 
++option(BUILD_TOOLS_NITFWRAP "Choose if nitfwrap tool should be built" FALSE)
++
+ option(WITH_TESTS
+     "Choose if PDAL unit tests should be built" TRUE)
+ add_feature_info("Unit tests" WITH_TESTS "PDAL unit tests")
+--- a/tools/CMakeLists.txt
++++ b/tools/CMakeLists.txt
+@@ -1,2 +1,4 @@
+ add_subdirectory(lasdump)
+-add_subdirectory(nitfwrap)
++if (BUILD_TOOLS_NITFWRAP)
++    add_subdirectory(nitfwrap)
++endif()
diff --git a/debian/patches/series b/debian/patches/series
index 7ca3720..e4f300e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 privacy-breach.patch
+dont-require-nitro.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pdal.git