pkgsrc-WIP-changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

liblas: finish removal



Module Name:	pkgsrc-wip
Committed By:	Thomas Klausner <wiz%gatalith.at@localhost>
Pushed By:	wiz
Date:		Sat Dec 23 17:06:47 2023 +0100
Changeset:	5a1d2204dbf5bcfbf9b36d017717d3f0bdcd21c7

Removed Files:
	liblas/patches/patch-CMakeLists.txt
	liblas/patches/patch-include_liblas_detail_binary.hpp
	liblas/patches/patch-src_c__api.cpp
	liblas/patches/patch-src_header.cpp

Log Message:
liblas: finish removal

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5a1d2204dbf5bcfbf9b36d017717d3f0bdcd21c7

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 liblas/patches/patch-CMakeLists.txt                | 16 -----------
 .../patches/patch-include_liblas_detail_binary.hpp | 33 ----------------------
 liblas/patches/patch-src_c__api.cpp                | 27 ------------------
 liblas/patches/patch-src_header.cpp                | 18 ------------
 4 files changed, 94 deletions(-)

diffs:
diff --git a/liblas/patches/patch-CMakeLists.txt b/liblas/patches/patch-CMakeLists.txt
deleted file mode 100644
index 6070542e52..0000000000
--- a/liblas/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD$
-
---- CMakeLists.txt.orig	2023-12-19 12:09:53.661047148 +0000
-+++ CMakeLists.txt
-@@ -190,9 +190,9 @@ if(WIN32)
- endif(WIN32)
- 
- find_package(Threads)
--find_package(Boost 1.42 COMPONENTS program_options thread system iostreams filesystem REQUIRED)
-+find_package(Boost 1.42 REQUIRED)
- 
--if(Boost_FOUND AND Boost_PROGRAM_OPTIONS_FOUND)
-+if(Boost_FOUND)
-   include_directories(${Boost_INCLUDE_DIRS})
- endif()
- 
diff --git a/liblas/patches/patch-include_liblas_detail_binary.hpp b/liblas/patches/patch-include_liblas_detail_binary.hpp
deleted file mode 100644
index 1e602c8241..0000000000
--- a/liblas/patches/patch-include_liblas_detail_binary.hpp
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD$
-
-Apply boost compat fix from merged upstream pull request
-https://github.com/libLAS/libLAS/pull/166 .
-
---- include/liblas/detail/binary.hpp.orig	2022-06-20 17:45:56.297823730 +0000
-+++ 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/liblas/patches/patch-src_c__api.cpp b/liblas/patches/patch-src_c__api.cpp
deleted file mode 100644
index 504c9fa24b..0000000000
--- a/liblas/patches/patch-src_c__api.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD$
-
-Trying to work around further Boost breakage. To be pushed upstream?
-Actually, requiring C++11 and using std::bind could be another path.
-Or using lambdas, which everyone tells you are much easier. C++ is great!
-Muahahahahahahahahahahahahha!
-
---- src/c_api.cpp.orig	2022-06-20 18:26:14.096102848 +0000
-+++ src/c_api.cpp
-@@ -498,7 +498,7 @@ LAS_DLL LASErrorEnum LASReader_SetOutput
-         
-         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 @@ LAS_DLL LASErrorEnum LASWriter_SetOutput
-         
-         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 --git a/liblas/patches/patch-src_header.cpp b/liblas/patches/patch-src_header.cpp
deleted file mode 100644
index 65088eb9dc..0000000000
--- a/liblas/patches/patch-src_header.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD$
-
-Trying to work around further Boost breakage. To be pushed upstream?
-Actually, requiring C++11 and using std::bind could be another path.
-Or using lambdas, which everyone tells you are much easier. C++ is great!
-Muahahahahahahahahahahahahha!
-
---- src/header.cpp.orig	2016-08-22 13:06:34.000000000 +0000
-+++ src/header.cpp
-@@ -610,7 +610,7 @@ void Header::DeleteVLRs(std::string cons
- 
-     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());


Home | Main Index | Thread Index | Old Index