[packages/laszip] - updated to 3.4.4

qboosh qboosh at pld-linux.org
Sun Apr 21 13:53:13 CEST 2024


commit 3f0209cfbca8ceafe834dea9255f66cf77652323
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Apr 21 13:01:30 2024 +0200

    - updated to 3.4.4

 laszip-format.patch     | 13 +++++++++++++
 laszip-link.patch       |  9 ++++-----
 laszip-restoreapi.patch | 15 +++++++--------
 laszip.spec             | 16 +++++++++-------
 4 files changed, 33 insertions(+), 20 deletions(-)
---
diff --git a/laszip.spec b/laszip.spec
index dde86ff..eeb6a2e 100644
--- a/laszip.spec
+++ b/laszip.spec
@@ -1,19 +1,20 @@
 Summary:	LASzip - free and lossless LiDAR compression
 Summary(pl.UTF-8):	LASzip - wolnodostępna, bezstratna kompresja danych LiDARowych
 Name:		laszip
-Version:	3.4.3
+Version:	3.4.4
 Release:	1
-License:	LGPL v2.1
+License:	Apache v2.0
 Group:		Libraries
 #Source0Download: https://laszip.org/
-Source0:	https://github.com/LASzip/LASzip/releases/download/%{version}/%{name}-src-%{version}.tar.gz
-# Source0-md5:	e07be9ba6247889a4ba0bda8535c77e3
+Source0:	https://github.com/LASzip/LASzip/archive/%{version}/LASzip-%{version}.tar.gz
+# Source0-md5:	557f723c46129586aea60e842e7afad0
 Patch0:		%{name}-link.patch
 # from Fedora: restore old API for libLAS, related to https://github.com/libLAS/libLAS/issues/144
 Patch1:		%{name}-restoreapi.patch
 Patch2:		%{name}-example.patch
+Patch3:		%{name}-format.patch
 URL:		https://laszip.org/
-BuildRequires:	cmake >= 2.8.11
+BuildRequires:	cmake >= 3.10
 BuildRequires:	libstdc++-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -40,10 +41,11 @@ Header files for LASzip library.
 Pliki nagłówkowe biblioteki LASzip.
 
 %prep
-%setup -q -n %{name}-src-%{version}
+%setup -q -n LASzip-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 install -d build/example
@@ -72,7 +74,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc AUTHORS CHANGES.txt ChangeLog NEWS README.rst
+%doc AUTHORS CHANGES.txt ChangeLog NEWS README.md
 %attr(755,root,root) %{_libdir}/liblaszip.so.*.*.*
 %attr(755,root,root) %ghost %{_libdir}/liblaszip.so.8
 %attr(755,root,root) %{_libdir}/liblaszip_api.so.*.*.*
diff --git a/laszip-format.patch b/laszip-format.patch
new file mode 100644
index 0000000..bc8a1ca
--- /dev/null
+++ b/laszip-format.patch
@@ -0,0 +1,13 @@
+--- LASzip-3.4.4/src/lasmessage.cpp.orig	2024-04-17 08:32:41.000000000 +0200
++++ LASzip-3.4.4/src/lasmessage.cpp	2024-04-21 12:52:38.780907756 +0200
+@@ -139,8 +139,8 @@ void las_default_message_handler(LAS_MES
+ 	if (!prefix.empty())
+ 	{
+ 		format_message(message, (unsigned)prefix.size());
+-		fprintf(stderr, prefix.c_str());
+-		fprintf(stderr, message.c_str());
++		fputs(prefix.c_str(), stderr);
++		fputs(message.c_str(), stderr);
+ 	}
+ 	else
+ 	{
diff --git a/laszip-link.patch b/laszip-link.patch
index 7a25443..609795a 100644
--- a/laszip-link.patch
+++ b/laszip-link.patch
@@ -1,8 +1,7 @@
---- laszip-src-3.4.3/dll/CMakeLists.txt.orig	2019-11-11 21:31:12.000000000 +0100
-+++ laszip-src-3.4.3/dll/CMakeLists.txt	2020-12-12 08:54:18.306119493 +0100
-@@ -5,4 +5,4 @@
+--- LASzip-3.4.4/dll/CMakeLists.txt.orig	2024-04-21 12:30:25.784795882 +0200
++++ LASzip-3.4.4/dll/CMakeLists.txt	2024-04-21 12:46:07.356361618 +0200
+@@ -4,3 +4,4 @@ set(LASZIP_API_SOURCES
  
  LASZIP_ADD_LIBRARY(${LASZIP_API_LIB_NAME} ${LASZIP_API_SOURCES})
- LASZIP_ADD_INCLUDES("laszip" "${LASZIP_HEADERS_DIR}/laszip_api.h" ${LASZIP_API_VERSION_H})
--
+ LASZIP_ADD_INCLUDES("laszip" "${CMAKE_CURRENT_SOURCE_DIR}/laszip_api.h" ${LASZIP_API_VERSION_H})
 +target_link_libraries(${LASZIP_API_LIB_NAME} dl)
diff --git a/laszip-restoreapi.patch b/laszip-restoreapi.patch
index 36f85b3..bf81efa 100644
--- a/laszip-restoreapi.patch
+++ b/laszip-restoreapi.patch
@@ -1,16 +1,15 @@
-diff -rupN laszip-src-3.4.3/src/CMakeLists.txt laszip-src-3.4.3-new/src/CMakeLists.txt
---- laszip-src-3.4.3/src/CMakeLists.txt	2019-11-11 21:31:12.000000000 +0100
-+++ laszip-src-3.4.3-new/src/CMakeLists.txt	2020-04-14 13:58:54.570284271 +0200
-@@ -26,6 +26,8 @@ set(LASZIP_SOURCES
+--- LASzip-3.4.4/src/CMakeLists.txt.orig	2024-04-17 08:32:41.000000000 +0200
++++ LASzip-3.4.4/src/CMakeLists.txt	2024-04-21 12:48:08.925703020 +0200
+@@ -25,6 +25,8 @@ set(LASZIP_SOURCES
+     laswritepoint.cpp
      laszip.cpp
      laszip_dll.cpp
-     mydefs.cpp
 +    laszipper.cpp
 +    lasunzipper.cpp
+     mydefs.cpp
+ 	lasmessage.cpp
  )
- 
- add_definitions(-DLASZIPDLL_EXPORTS)
-@@ -35,3 +37,4 @@ if(HAVE_UNORDERED_MAP)
+@@ -36,3 +38,4 @@ if(HAVE_UNORDERED_MAP)
      add_definitions(-DHAVE_UNORDERED_MAP=1)
  endif(HAVE_UNORDERED_MAP)
  LASZIP_ADD_LIBRARY(${LASZIP_BASE_LIB_NAME} ${LASZIP_SOURCES})
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/laszip.git/commitdiff/3f0209cfbca8ceafe834dea9255f66cf77652323



More information about the pld-cvs-commit mailing list