[pdal] 06/16: Drop patches, applied upstream.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Apr 1 23:02:33 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository pdal.
commit a5555847b15cb3d0333a3d3d1b61e61f8eabd92d
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Apr 1 17:56:53 2016 +0200
Drop patches, applied upstream.
---
debian/changelog | 1 +
debian/patches/big-endian.patch | 16 -------------
debian/patches/hardening.patch | 13 -----------
debian/patches/jsoncpp.patch | 23 -------------------
debian/patches/kfreebsd.patch | 19 ----------------
debian/patches/kfreebsd2.patch | 27 ----------------------
debian/patches/mod-spatialite.patch | 44 ------------------------------------
debian/patches/series | 7 ------
debian/patches/spelling-errors.patch | 41 ---------------------------------
9 files changed, 1 insertion(+), 190 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index df94bf0..02dcaa5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ pdal (1.2.0-1) UNRELEASED; urgency=medium
- Add Theodore Ts'o to copyright holders
- Add license & copyright for jsoncpp & pdalboost files
- Drop license & copyright for Endian.hpp, removed upstream
+ * Drop patches, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Fri, 01 Apr 2016 12:01:50 +0200
diff --git a/debian/patches/big-endian.patch b/debian/patches/big-endian.patch
deleted file mode 100644
index 16e5b12..0000000
--- a/debian/patches/big-endian.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: Fix build failure on big endian architectures.
- error: #elif with no expression
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-
---- a/plugins/pgpointcloud/io/PgWriter.cpp
-+++ b/plugins/pgpointcloud/io/PgWriter.cpp
-@@ -492,7 +492,7 @@ void PgWriter::writeTile(const PointView
- SWAP_ENDIANNESS(pcid);
- SWAP_ENDIANNESS(compression);
- SWAP_ENDIANNESS(num_points);
--#elif BOOST_BIG_ENDIAN
-+#elif defined(BOOST_BIG_ENDIAN)
- // needs to be 1 byte
- options << boost::format("%02x") % 0;
- #endif
diff --git a/debian/patches/hardening.patch b/debian/patches/hardening.patch
deleted file mode 100644
index df15dd9..0000000
--- a/debian/patches/hardening.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: Use FLAGS set in the environment.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/PDAL/PDAL/pull/1182
-Applied-Upstream: https://github.com/PDAL/PDAL/commit/3be814330f76a80ee6934f1765c3d38a4451160f
-
---- a/cmake/unix_compiler_options.cmake
-+++ b/cmake/unix_compiler_options.cmake
-@@ -19,4 +19,4 @@ else()
- message(FATAL_ERROR "Unsupported C++ compiler")
- endif()
-
--set (CMAKE_CXX_FLAGS "${PDAL_COMMON_CXX_FLAGS} ${CXX_STANDARD}")
-+set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PDAL_COMMON_CXX_FLAGS} ${CXX_STANDARD}")
diff --git a/debian/patches/jsoncpp.patch b/debian/patches/jsoncpp.patch
deleted file mode 100644
index a9c2aaa..0000000
--- a/debian/patches/jsoncpp.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Description: Update FindJSONCPP.cmake to support libjsoncpp-dev Debian package.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/PDAL/PDAL/pull/1184
-Applied-Upstream: https://github.com/PDAL/PDAL/commit/26ff8511424bfde3894ebeb8d0f6aeca2f3065b0
-
---- a/cmake/modules/FindJSONCPP.cmake
-+++ b/cmake/modules/FindJSONCPP.cmake
-@@ -76,6 +76,7 @@ find_library(JSONCPP_LIBRARY
- ${_jsoncppnames}
- PATHS
- "${JSONCPP_ROOT_DIR}/libs"
-+ /usr/lib/${CMAKE_LIBRARY_ARCHITECTURE}
- PATH_SUFFIXES
- ${_pathsuffixes})
-
-@@ -84,6 +85,7 @@ find_path(JSONCPP_INCLUDE_DIR
- json/json.h
- PATHS
- "${JSONCPP_ROOT_DIR}"
-+ /usr/include/jsoncpp
- PATH_SUFFIXES
- include)
-
diff --git a/debian/patches/kfreebsd.patch b/debian/patches/kfreebsd.patch
deleted file mode 100644
index bf6353a..0000000
--- a/debian/patches/kfreebsd.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: Add support for kFreeBSD architectures.
- Treat like Linux, has GNU libc.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/PDAL/PDAL/pull/1187
-Applied-Upstream: https://github.com/PDAL/PDAL/commit/cc8760b633e1e36f0d01d02b651dbc6ffcbf662a
-
---- a/include/pdal/util/portable_endian.hpp
-+++ b/include/pdal/util/portable_endian.hpp
-@@ -58,6 +58,10 @@
- # define be64toh betoh64
- # define le64toh letoh64
-
-+#elif defined(__FreeBSD_kernel__)
-+
-+# include <endian.h>
-+
- #elif defined(__WINDOWS__)
-
- # include <winsock2.h>
diff --git a/debian/patches/kfreebsd2.patch b/debian/patches/kfreebsd2.patch
deleted file mode 100644
index 703684d..0000000
--- a/debian/patches/kfreebsd2.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: Add support for kFreeBSD to PluginManager and other sources.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/PDAL/PDAL/pull/1189
-Applied-Upstream: https://github.com/PDAL/PDAL/commit/f8e28b6465eb05ad7773d823b32501ebff308a97
-
---- a/src/PluginManager.cpp
-+++ b/src/PluginManager.cpp
-@@ -58,7 +58,7 @@ namespace
- {
- #if defined(__APPLE__) && defined(__MACH__)
- const std::string dynamicLibraryExtension(".dylib");
--#elif defined __linux__
-+#elif defined(__linux__) || defined(__FreeBSD_kernel__)
- const std::string dynamicLibraryExtension(".so");
- #elif defined _WIN32
- const std::string dynamicLibraryExtension(".dll");
---- a/plugins/sqlite/io/SQLiteCommon.hpp
-+++ b/plugins/sqlite/io/SQLiteCommon.hpp
-@@ -456,7 +456,7 @@ public:
- lib_extension = "mod_";
- #endif
-
--#ifdef __linux__
-+#if defined(__linux__) || defined(__FreeBSD_kernel__)
- so_extension = "so";
- #ifdef MOD_SPATIALITE
- lib_extension = "mod_";
diff --git a/debian/patches/mod-spatialite.patch b/debian/patches/mod-spatialite.patch
deleted file mode 100644
index 4345704..0000000
--- a/debian/patches/mod-spatialite.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Description: Load mod_spatialite.so on Linux too.
- The loadable SQLite3 module is named mod_spatialite since 4.2.0.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/PDAL/PDAL/pull/1183
-Applied-Upstream: https://github.com/PDAL/PDAL/commit/f3bd90512db78ebbec055c726f6e739edeff224e
-
---- a/plugins/sqlite/io/SQLiteCommon.hpp
-+++ b/plugins/sqlite/io/SQLiteCommon.hpp
-@@ -458,8 +458,12 @@ public:
-
- #ifdef __linux__
- so_extension = "so";
-+#ifdef MOD_SPATIALITE
-+ lib_extension = "mod_";
-+#else
- lib_extension = "lib";
- #endif
-+#endif
-
- #ifdef _WIN32
- so_extension = "dll";
---- /dev/null
-+++ b/cmake/spatialite.cmake
-@@ -0,0 +1,10 @@
-+#
-+# SpatiaLite cmake configuration
-+#
-+
-+include(FindPkgConfig)
-+
-+pkg_search_module(SPATIALITE spatialite>=4.2.0)
-+if(SPATIALITE_FOUND)
-+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DMOD_SPATIALITE")
-+endif(SPATIALITE_FOUND)
---- a/plugins/sqlite/CMakeLists.txt
-+++ b/plugins/sqlite/CMakeLists.txt
-@@ -3,6 +3,7 @@
- #
-
- include (${PDAL_CMAKE_DIR}/sqlite.cmake)
-+include (${PDAL_CMAKE_DIR}/spatialite.cmake)
- #
- # SQLite Reader
- #
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 064eec9..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,7 +0,0 @@
-spelling-errors.patch
-hardening.patch
-mod-spatialite.patch
-jsoncpp.patch
-big-endian.patch
-kfreebsd.patch
-kfreebsd2.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 60c1552..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-Description: Fix various spelling errors.
- statment -> statement
- aquired -> acquired
- Tranformation -> Transformation
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://github.com/PDAL/PDAL/pull/1181
-Applied-Upstream: https://github.com/PDAL/PDAL/commit/353c10c7710cfa62406f61b109b83b54189c5310
-
---- a/plugins/pgpointcloud/io/PgReader.cpp
-+++ b/plugins/pgpointcloud/io/PgReader.cpp
-@@ -45,7 +45,7 @@ namespace pdal
- static PluginInfo const s_info = PluginInfo(
- "readers.pgpointcloud",
- "Read data from pgpointcloud format. \"query\" option needs to be a \n" \
-- "SQL statment selecting the data.",
-+ "SQL statement selecting the data.",
- "http://pdal.io/stages/readers.pgpointcloud.html" );
-
- CREATE_SHARED_PLUGIN(1, 0, PgReader, Reader, s_info)
---- a/include/pdal/Dimension.hpp
-+++ b/include/pdal/Dimension.hpp
-@@ -249,7 +249,7 @@ inline std::string description(Id::Enum
- case Id::GpsTime:
- return "GPS time that the point was acquired";
- case Id::InternalTime:
-- return "Scanner's internal time when the point was aquired, in seconds";
-+ return "Scanner's internal time when the point was acquired, in seconds";
- case Id::OffsetTime:
- return "Milliseconds from first acquired point";
- case Id::IsPpsLocked:
---- a/io/las/LasWriter.cpp
-+++ b/io/las/LasWriter.cpp
-@@ -494,7 +494,7 @@ bool LasWriter::addWktVlr()
- std::vector<uint8_t> wktBytes(wkt.begin(), wkt.end());
- // This tacks a NULL to the end of the data, which is required by the spec.
- wktBytes.resize(wktBytes.size() + 1, 0);
-- addVlr(TRANSFORM_USER_ID, WKT_RECORD_ID, "OGC Tranformation Record",
-+ addVlr(TRANSFORM_USER_ID, WKT_RECORD_ID, "OGC Transformation Record",
- wktBytes);
-
- // The data in the vector gets moved to the VLR, so we have to recreate it.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/pdal.git
More information about the Pkg-grass-devel
mailing list