diff options
Diffstat (limited to 'gis')
| -rw-r--r-- | gis/gdal/gdal.SlackBuild | 2 | ||||
| -rw-r--r-- | gis/libLAS/Use_LIBLAS_BIG_ENDIAN.patch | 40 | ||||
| -rw-r--r-- | gis/libLAS/boost-1.73.patch | 36 | ||||
| -rw-r--r-- | gis/libLAS/libLAS.SlackBuild | 3 |
4 files changed, 81 insertions, 0 deletions
diff --git a/gis/gdal/gdal.SlackBuild b/gis/gdal/gdal.SlackBuild index bbe278050d..36d4d0f370 100644 --- a/gis/gdal/gdal.SlackBuild +++ b/gis/gdal/gdal.SlackBuild @@ -112,6 +112,8 @@ else WITHLIST+=" --with-jpeg=/usr/lib${LIBDIRSUFFIX}" fi +# The CPPFLAGS are for the newer mariadb (thanks pprkut!) +CPPFLAGS="-I/usr/include/mysql/server" \ CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ diff --git a/gis/libLAS/Use_LIBLAS_BIG_ENDIAN.patch b/gis/libLAS/Use_LIBLAS_BIG_ENDIAN.patch new file mode 100644 index 0000000000..fc7dee623e --- /dev/null +++ b/gis/libLAS/Use_LIBLAS_BIG_ENDIAN.patch @@ -0,0 +1,40 @@ +From af431abce95076b59f4eb7c6ef0930ca57c8a063 Mon Sep 17 00:00:00 2001 +From: Piotr Dobrowolski <dobrypd@gmail.com> +Date: Thu, 25 Apr 2019 15:33:28 +0200 +Subject: [PATCH] Use LIBLAS_BIG_ENDIAN instead of BOOST_BIG_ENDIAN (#166) + +Fixes #165 +--- + include/liblas/detail/binary.hpp | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/include/liblas/detail/binary.hpp b/include/liblas/detail/binary.hpp +index 3dd8a6fc..8f0b3d47 100644 +--- a/include/liblas/detail/binary.hpp ++++ b/include/liblas/detail/binary.hpp +@@ -17,6 +17,8 @@ + #ifndef LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+ #define LIBLAS_DETAIL_BINARY_HPP_INCLUDED
+
++#include <liblas/detail/endian.hpp>
++
+ #include <cassert>
+ #include <climits>
+ #include <cstring>
+@@ -25,7 +27,6 @@ +
+ #include <boost/config.hpp>
+ #include <boost/static_assert.hpp>
+-#include <boost/detail/endian.hpp>
+ #include <boost/type_traits/is_signed.hpp>
+
+ #if CHAR_BIT != 8
+@@ -43,7 +44,7 @@ namespace detail { namespace binary { + struct big_endian_tag {};
+ struct little_endian_tag {};
+
+-#ifdef BOOST_BIG_ENDIAN
++#ifdef LIBLAS_BIG_ENDIAN
+ typedef big_endian_tag native_endian_tag;
+ #else
+ typedef little_endian_tag native_endian_tag;
diff --git a/gis/libLAS/boost-1.73.patch b/gis/libLAS/boost-1.73.patch new file mode 100644 index 0000000000..818c15ef3b --- /dev/null +++ b/gis/libLAS/boost-1.73.patch @@ -0,0 +1,36 @@ +Qualify placeholders +Matteo Bernardini <ponce@slackbuilds.org> + +diff -Naur libLAS-1.8.1.orig/src/c_api.cpp libLAS-1.8.1/src/c_api.cpp +--- libLAS-1.8.1.orig/src/c_api.cpp 2016-08-22 15:06:34.000000000 +0200 ++++ libLAS-1.8.1/src/c_api.cpp 2020-08-04 14:54:22.311996000 +0200 +@@ -498,7 +498,7 @@ + + transforms.erase( std::remove_if( transforms.begin(), + transforms.end(), +- boost::bind( &IsReprojectionTransform, _1 ) ), ++ boost::bind( &IsReprojectionTransform, boost::placeholders::_1 ) ), + transforms.end()); + + liblas::TransformPtr srs_transform = liblas::TransformPtr(new liblas::ReprojectionTransform(in_ref, *out_ref, &h)); +@@ -1840,7 +1840,7 @@ + + transforms.erase( std::remove_if( transforms.begin(), + transforms.end(), +- boost::bind( &IsReprojectionTransform, _1 ) ), ++ boost::bind( &IsReprojectionTransform, boost::placeholders::_1 ) ), + transforms.end()); + + liblas::TransformPtr srs_transform = liblas::TransformPtr(new liblas::ReprojectionTransform(in_ref, *out_ref, &h)); +diff -Naur libLAS-1.8.1.orig/src/header.cpp libLAS-1.8.1/src/header.cpp +--- libLAS-1.8.1.orig/src/header.cpp 2016-08-22 15:06:34.000000000 +0200 ++++ libLAS-1.8.1/src/header.cpp 2020-08-04 14:53:36.599996000 +0200 +@@ -610,7 +610,7 @@ + + m_vlrs.erase( std::remove_if( m_vlrs.begin(), + m_vlrs.end(), +- boost::bind( &SameVLRs, name, id, _1 ) ), ++ boost::bind( &SameVLRs, name, id, boost::placeholders::_1 ) ), + m_vlrs.end()); + + m_recordsCount = static_cast<uint32_t>(m_vlrs.size()); diff --git a/gis/libLAS/libLAS.SlackBuild b/gis/libLAS/libLAS.SlackBuild index 706f11fa16..54a3e849ae 100644 --- a/gis/libLAS/libLAS.SlackBuild +++ b/gis/libLAS/libLAS.SlackBuild @@ -69,6 +69,9 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +patch -p1 < $CWD/Use_LIBLAS_BIG_ENDIAN.patch +patch -p1 < $CWD/boost-1.73.patch + mkdir -p build cd build cmake \ |