pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
liblas: remove, dead upstream and broken
Module Name: pkgsrc-wip
Committed By: Dr. Thomas Orgis <thomas.orgis%uni-hamburg.de@localhost>
Pushed By: thor
Date: Sat Dec 23 15:27:37 2023 +0100
Changeset: 13640ab57b1082d670ca2278e71713ec138b6f83
Modified Files:
Makefile
Added 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
Removed Files:
liblas/DESCR
liblas/Makefile
liblas/PLIST
liblas/distinfo
Log Message:
liblas: remove, dead upstream and broken
Even patches for Boost compatibility from a PR are too outdated now,
it just doesn't build anymore and upstream declared itself dormant. People
should use PDAL to read this file format.
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=13640ab57b1082d670ca2278e71713ec138b6f83
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
Makefile | 1 -
liblas/DESCR | 4 -
liblas/Makefile | 27 ------
liblas/PLIST | 103 ---------------------
liblas/distinfo | 5 -
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 ++++
9 files changed, 94 insertions(+), 140 deletions(-)
diffs:
diff --git a/Makefile b/Makefile
index f44cb2c4d3..1146b8f075 100644
--- a/Makefile
+++ b/Makefile
@@ -1937,7 +1937,6 @@ SUBDIR+= libjingle
SUBDIR+= libjxl
SUBDIR+= libkml
SUBDIR+= libksysguard
-SUBDIR+= liblas
SUBDIR+= liblingoteach
SUBDIR+= libltc
SUBDIR+= libm4ri
diff --git a/liblas/DESCR b/liblas/DESCR
deleted file mode 100644
index 563102786e..0000000000
--- a/liblas/DESCR
+++ /dev/null
@@ -1,4 +0,0 @@
-ibLAS is a C/C++ library for reading and writing the very common LAS
-LiDAR format. The ASPRS LAS format is a sequential binary format used
-to store data from LiDAR sensors and by LiDAR processing software for
-data interchange and archival.
diff --git a/liblas/Makefile b/liblas/Makefile
deleted file mode 100644
index e3b91c9508..0000000000
--- a/liblas/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# $NetBSD$
-
-VERSION= 1.8.1
-PKGNAME= liblas-${VERSION}
-PKGREVISION= 7
-DISTNAME= libLAS-${VERSION}
-CATEGORIES= geography
-MASTER_SITES= http://download.osgeo.org/liblas/
-EXTRACT_SUFX= .tar.bz2
-
-MAINTAINER= thomas.orgis%uni-hamburg.de@localhost
-HOMEPAGE= http://www.liblas.org/
-COMMENT= LAS 1.0/1.1/1.2 ASPRS LiDAR data translation toolset
-LICENSE= 2-clause-bsd
-
-USE_CMAKE= yes
-USE_TOOLS+= pkg-config
-USE_LANGUAGES= c c++
-
-PKGCONFIG_OVERRIDE+= apps/liblas.pc.in
-
-.include "../../devel/boost-headers/buildlink3.mk"
-.include "../../devel/boost-libs/buildlink3.mk"
-.include "../../geography/gdal-lib/buildlink3.mk"
-.include "../../geography/libgeotiff/buildlink3.mk"
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/liblas/PLIST b/liblas/PLIST
deleted file mode 100644
index 3aee90f276..0000000000
--- a/liblas/PLIST
+++ /dev/null
@@ -1,103 +0,0 @@
-@comment $NetBSD$
-bin/las2col
-bin/las2las
-bin/las2pg
-bin/las2txt
-bin/lasblock
-bin/lasinfo
-bin/liblas-config
-bin/ts2las
-bin/txt2las
-include/liblas/bounds.hpp
-include/liblas/capi/las_config.h
-include/liblas/capi/las_version.h
-include/liblas/capi/liblas.h
-include/liblas/chipper.hpp
-include/liblas/classification.hpp
-include/liblas/color.hpp
-include/liblas/compatibility.hpp
-include/liblas/detail/binary.hpp
-include/liblas/detail/endian.hpp
-include/liblas/detail/file_ptr_stream.hpp
-include/liblas/detail/fwd.hpp
-include/liblas/detail/index/indexcell.hpp
-include/liblas/detail/index/indexoutput.hpp
-include/liblas/detail/opt_allocator.hpp
-include/liblas/detail/pointrecord.hpp
-include/liblas/detail/private_utility.hpp
-include/liblas/detail/reader/cachedreader.hpp
-include/liblas/detail/reader/header.hpp
-include/liblas/detail/reader/reader.hpp
-include/liblas/detail/reader/zipreader.hpp
-include/liblas/detail/sha1.hpp
-include/liblas/detail/singleton.hpp
-include/liblas/detail/timer.hpp
-include/liblas/detail/writer/header.hpp
-include/liblas/detail/writer/point.hpp
-include/liblas/detail/writer/writer.hpp
-include/liblas/detail/writer/zipwriter.hpp
-include/liblas/detail/zippoint.hpp
-include/liblas/dimension.hpp
-include/liblas/error.hpp
-include/liblas/exception.hpp
-include/liblas/export.hpp
-include/liblas/external/property_tree/detail/exception_implementation.hpp
-include/liblas/external/property_tree/detail/file_parser_error.hpp
-include/liblas/external/property_tree/detail/info_parser_error.hpp
-include/liblas/external/property_tree/detail/info_parser_read.hpp
-include/liblas/external/property_tree/detail/info_parser_utils.hpp
-include/liblas/external/property_tree/detail/info_parser_write.hpp
-include/liblas/external/property_tree/detail/info_parser_writer_settings.hpp
-include/liblas/external/property_tree/detail/json_parser_error.hpp
-include/liblas/external/property_tree/detail/json_parser_read.hpp
-include/liblas/external/property_tree/detail/json_parser_write.hpp
-include/liblas/external/property_tree/detail/ptree_implementation.hpp
-include/liblas/external/property_tree/detail/ptree_utils.hpp
-include/liblas/external/property_tree/detail/rapidxml.hpp
-include/liblas/external/property_tree/detail/xml_parser_error.hpp
-include/liblas/external/property_tree/detail/xml_parser_flags.hpp
-include/liblas/external/property_tree/detail/xml_parser_read_rapidxml.hpp
-include/liblas/external/property_tree/detail/xml_parser_utils.hpp
-include/liblas/external/property_tree/detail/xml_parser_write.hpp
-include/liblas/external/property_tree/detail/xml_parser_writer_settings.hpp
-include/liblas/external/property_tree/exceptions.hpp
-include/liblas/external/property_tree/id_translator.hpp
-include/liblas/external/property_tree/info_parser.hpp
-include/liblas/external/property_tree/ini_parser.hpp
-include/liblas/external/property_tree/json_parser.hpp
-include/liblas/external/property_tree/ptree.hpp
-include/liblas/external/property_tree/ptree_fwd.hpp
-include/liblas/external/property_tree/ptree_serialization.hpp
-include/liblas/external/property_tree/stream_translator.hpp
-include/liblas/external/property_tree/string_path.hpp
-include/liblas/external/property_tree/xml_parser.hpp
-include/liblas/factory.hpp
-include/liblas/filter.hpp
-include/liblas/header.hpp
-include/liblas/index.hpp
-include/liblas/iterator.hpp
-include/liblas/liblas.hpp
-include/liblas/point.hpp
-include/liblas/reader.hpp
-include/liblas/schema.hpp
-include/liblas/spatialreference.hpp
-include/liblas/transform.hpp
-include/liblas/utility.hpp
-include/liblas/variablerecord.hpp
-include/liblas/version.hpp
-include/liblas/writer.hpp
-lib/liblas.so
-lib/liblas.so.2.4.0
-lib/liblas.so.3
-lib/liblas_c.so
-lib/liblas_c.so.2.4.0
-lib/liblas_c.so.3
-share/cmake/libLAS/liblas-config-version.cmake
-share/cmake/libLAS/liblas-config.cmake
-share/cmake/libLAS/liblas-depends-release.cmake
-share/cmake/libLAS/liblas-depends.cmake
-share/liblas/doc/AUTHORS
-share/liblas/doc/COPYING
-share/liblas/doc/INSTALL
-share/liblas/doc/LICENSE.txt
-share/liblas/doc/README.txt
diff --git a/liblas/distinfo b/liblas/distinfo
deleted file mode 100644
index 3dfc785fdc..0000000000
--- a/liblas/distinfo
+++ /dev/null
@@ -1,5 +0,0 @@
-$NetBSD$
-
-RMD160 (libLAS-1.8.1.tar.bz2) = b397a8a1a108ea694f6fccbe8463636cff9a04d9
-SHA512 (libLAS-1.8.1.tar.bz2) = 1cb39c557af0006c54f1100d0d409977fcc1886abd155c1b144d806c47f8675a9f2125d3a9aca16bae65d2aabba84d5e5e322b42085e7db312f3d53f92342acf
-Size (libLAS-1.8.1.tar.bz2) = 3920203 bytes
diff --git a/liblas/patches/patch-CMakeLists.txt b/liblas/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..6070542e52
--- /dev/null
+++ b/liblas/patches/patch-CMakeLists.txt
@@ -0,0 +1,16 @@
+$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
new file mode 100644
index 0000000000..1e602c8241
--- /dev/null
+++ b/liblas/patches/patch-include_liblas_detail_binary.hpp
@@ -0,0 +1,33 @@
+$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
new file mode 100644
index 0000000000..504c9fa24b
--- /dev/null
+++ b/liblas/patches/patch-src_c__api.cpp
@@ -0,0 +1,27 @@
+$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
new file mode 100644
index 0000000000..65088eb9dc
--- /dev/null
+++ b/liblas/patches/patch-src_header.cpp
@@ -0,0 +1,18 @@
+$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