update to 1.8.1.20240916git.62f3d57 [release 1.8.1.20240916git.62f3d57-1mamba;Sun Apr 06 2025]

liblas-1.8.1.20240916git.62f3d57-gcc15.patch

@@ -0,0 +1,52 @@
+diff -rupN libLAS-62f3d57215ba1b074a84ff08a1539b69e69e38fb/apps/las2col.c libLAS-62f3d57215ba1b074a84ff08a1539b69e69e38fb-new/apps/las2col.c
+--- libLAS-62f3d57215ba1b074a84ff08a1539b69e69e38fb/apps/las2col.c	2024-09-16 20:55:36.000000000 +0200
++++ libLAS-62f3d57215ba1b074a84ff08a1539b69e69e38fb-new/apps/las2col.c	2025-02-13 00:15:05.260929008 +0100
+@@ -452,17 +452,17 @@ void* readFile(void *arg) {
+                     case ENTRY_y:
+                     case ENTRY_z:
+                     case ENTRY_t:
+-                        ((double*) dataWriteTT[j].values)[index] = entriesFuncD[j](p);
++                        ((double*) dataWriteTT[j].values)[index] = ((double(*)(LASPointH))entriesFuncD[j])(p);
+                         //printf(" Point is:%lf\n", ((double*) dataWriteTT[j].values)[index]);
+                         break;
+                     case ENTRY_X:
+-                        ((int*) dataWriteTT[j].values)[index] = entriesFuncD[j](p) / file_scale_x;
++                        ((int*) dataWriteTT[j].values)[index] = ((double(*)(LASPointH))entriesFuncD[j])(p) / file_scale_x;
+                         break;
+                     case ENTRY_Y:
+-                        ((int*) dataWriteTT[j].values)[index] = entriesFuncD[j](p) / file_scale_y;
++                        ((int*) dataWriteTT[j].values)[index] = ((double(*)(LASPointH))entriesFuncD[j])(p) / file_scale_y;
+                         break;
+                     case ENTRY_Z:
+-                        ((int*) dataWriteTT[j].values)[index] = entriesFuncD[j](p) / file_scale_z;
++                        ((int*) dataWriteTT[j].values)[index] = ((double(*)(LASPointH))entriesFuncD[j])(p) / file_scale_z;
+                         break;
+                     case ENTRY_i:
+                     case ENTRY_r:
+@@ -470,22 +470,22 @@ void* readFile(void *arg) {
+                     case ENTRY_p:
+                     case ENTRY_e:
+                     case ENTRY_d:
+-                        ((short*) dataWriteTT[j].values)[index] = entriesFuncS[j](p);
++                        ((short*) dataWriteTT[j].values)[index] = ((short(*)(LASPointH))entriesFuncS[j])(p);
+                         break;
+                     case ENTRY_a:
+                     case ENTRY_c:
+                     case ENTRY_u:
+-                        ((char*) dataWriteTT[j].values)[index] = entriesFuncC[j](p);
++                        ((char*) dataWriteTT[j].values)[index] = ((char(*)(LASPointH))entriesFuncC[j])(p);
+                         break;
+                     case ENTRY_k:
+-                        entriesFuncD[j](&res, p, factorX, factorY);
++                        ((double(*)(uint64_t*, LASPointH, int64_t, int64_t))entriesFuncD[j])(&res, p, factorX, factorY);
+                         ((int64_t*)dataWriteTT[j].values)[index] = res;
+                         break;
+                     case ENTRY_R:
+                     case ENTRY_G:
+                     case ENTRY_B:
+                         color = (color == NULL) ? LASPoint_GetColor(p) : color;
+-                        ((unsigned short*) dataWriteTT[j].values)[index] = entriesFuncS[j](color);;
++                        ((unsigned short*) dataWriteTT[j].values)[index] = ((short(*)(LASColorH))entriesFuncS[j])(color);;
+                         break;
+                     case ENTRY_M:
+                         ((unsigned int*)dataWriteTT[j].values)[index] = index;

liblas-1.8.1.20240916git.62f3d57-gdal3.patch

@@ -1,7 +1,7 @@
-diff --git a/src/gt_wkt_srs.cpp b/src/gt_wkt_srs.cpp
+diff -rupN --no-dereference libLAS-96d4dc9d6abc93c683ee97cfd14a984148390320/src/gt_wkt_srs.cpp libLAS-96d4dc9d6abc93c683ee97cfd14a984148390320-new/src/gt_wkt_srs.cpp
---- a/src/gt_wkt_srs.cpp
+--- libLAS-96d4dc9d6abc93c683ee97cfd14a984148390320/src/gt_wkt_srs.cpp	2024-04-04 12:20:33.000000000 +0200
-+++ b/src/gt_wkt_srs.cpp
++++ libLAS-96d4dc9d6abc93c683ee97cfd14a984148390320-new/src/gt_wkt_srs.cpp	2024-05-14 07:33:10.757260484 +0200
-@@ -299,7 +299,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn )
+@@ -299,7 +299,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIF
                  oSRS.SetFromUserInput(pszWKT);
                  oSRS.SetExtension( "PROJCS", "PROJ4",
                                     "+proj=merc +a=6378137 +b=6378137 +lat_ts=0.0 +lon_0=0.0 +x_0=0.0 +y_0=0 +k=1.0 +units=m +nadgrids=@null +wktext  +no_defs" );
@@ -9,17 +9,17 @@ diff --git a/src/gt_wkt_srs.cpp b/src/gt_wkt_srs.cpp
                  CPLFree(pszWKT);
                  pszWKT = NULL;
                  oSRS.exportToWkt(&pszWKT);
-@@ -505,7 +504,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn )
+@@ -505,7 +504,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIF
          {
-             char       *pszWKT;
+             char	*pszWKT;
              oSRS.morphFromESRI();
 -            oSRS.FixupOrdering();
              if( oSRS.exportToWkt( &pszWKT ) == OGRERR_NONE )
                  return pszWKT;
          }
-@@ -1107,8 +1105,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIFDefn * psDefn )
+@@ -1107,8 +1105,6 @@ char *GTIFGetOGISDefn( GTIF *hGTIF, GTIF
  /* ==================================================================== */
-     char       *pszWKT;
+     char	*pszWKT;
  
 -    oSRS.FixupOrdering();
 -

liblas-1.8.1.20240916git.62f3d57-stdc++14.patch

@@ -0,0 +1,12 @@
+diff -rupN --no-dereference libLAS-62f3d57215ba1b074a84ff08a1539b69e69e38fb/CMakeLists.txt libLAS-62f3d57215ba1b074a84ff08a1539b69e69e38fb-new/CMakeLists.txt
+--- libLAS-62f3d57215ba1b074a84ff08a1539b69e69e38fb/CMakeLists.txt	2024-09-16 20:55:36.000000000 +0200
++++ libLAS-62f3d57215ba1b074a84ff08a1539b69e69e38fb-new/CMakeLists.txt	2025-02-12 23:56:00.570966630 +0100
+@@ -231,7 +231,7 @@ if (WITH_GDAL)
+   endif ()
+ endif ()
+ if (GDAL_FOUND)
+-  SET(CMAKE_CXX_STANDARD 11)
++  # SET(CMAKE_CXX_STANDARD 11)
+   SET(CMAKE_CXX_STANDARD_REQUIRED ON)
+   SET(CMAKE_CXX_EXTENSIONS OFF)
+   include_directories(${GDAL_INCLUDE_DIR})

liblas.spec

@@ -1,8 +1,8 @@
 %define git_commit %(echo %version | cut -d. -f5)
 %define git_tag %(echo %version | cut -d. -f1-3)
 Name:          liblas
-Version:       1.8.1.20240404git.96d4dc9
+Version:       1.8.1.20240916git.62f3d57
-Release:       2mamba
+Release:       1mamba
 Summary:       C++ library and programs for reading and writing ASPRS LAS format with LiDAR data
 Group:         System/Libraries
 Vendor:        openmamba
@@ -10,8 +10,10 @@ Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://liblas.org/
 Source:        https://github.com/libLAS/libLAS.git/%{git_tag}@%{git_commit}/libLAS-%{version}.tar.bz2
-Patch0:        liblas-1.8.1.20240404git.96d4dc9-gdal-2.5.patch
+Patch0:        liblas-1.8.1.20240916git.62f3d57-gdal3.patch
 Patch1:        liblas-1.8.1.20240404git.96d4dc9-fix-cmake-remove-liblas-depends.patch
+Patch2:        liblas-1.8.1.20240916git.62f3d57-gcc15.patch
+Patch3:        liblas-1.8.1.20240916git.62f3d57-stdc++14.patch
 License:       BSD
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
@@ -23,6 +25,8 @@ BuildRequires: libproj-devel
 BuildRequires: libstdc++6-devel
 BuildRequires: libtiff-devel
 ## AUTOBUILDREQ-END
+BuildRequires: libboost-devel >= 1.87.0
+BuildRequires: libgdal-devel >= 3.10.2
 BuildRequires: cmake
 
 %description
@@ -44,16 +48,17 @@ Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 %description tools
 This package contains utility applications for %{name}.
 
-%debug_package
-
 %prep
 %setup -q -n libLAS-%{version}
 %define _default_patch_fuzz 2
 %patch 0 -p1 -b .gdal-2.5
 %patch 1 -p1
+%patch 2 -p1 -b .gcc15
+%patch 3 -p1 -b .stdc++14
 
 %build
 %cmake \
+    -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
 	-DCMAKE_CXX_FLAGS="-std=gnu++11" \
 	-DLIBLAS_LIB_SUBDIR="%{_lib}" \
     -DWITH_GDAL=ON \
@@ -111,6 +116,12 @@ rm -f %{buildroot}%{_libdir}/pkgconfig/liblas.pc
 %{_bindir}/txt2las
 
 %changelog
+* Sun Apr 06 2025 Silvan Calarco <silvan.calarco@mambasoft.it> 1.8.1.20240916git.62f3d57-1mamba
+- update to 1.8.1.20240916git.62f3d57
+
+* Sat Oct 12 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.8.1.20240404git.96d4dc9-3mamba
+- rebuilt with libboost 1.86.0
+
 * Wed May 08 2024 Silvan Calarco <silvan.calarco@mambasoft.it> 1.8.1.20240404git.96d4dc9-2mamba
 - add patch to cmake fles to not include liblas-depends.cmake which causes build failure to vtk