BR: libarchive

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>

.gitignore

@@ -110,3 +110,5 @@ gdalautotest-1.7.0.tar.gz
 /gdalautotest-3.8.2.tar.gz
 /gdal-3.8.3-fedora.tar.xz
 /gdalautotest-3.8.3.tar.gz
+/gdal-3.8.4-fedora.tar.xz
+/gdalautotest-3.8.4.tar.gz

gdal-config

@@ -2,7 +2,7 @@
 
 ARCH=$(uname -m)
 case $ARCH in
-x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 )
+x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 | riscv64 )
 gdal-config-64 ${*}
 ;;
 *)

gdal.spec

@@ -50,8 +50,8 @@
 
 
 Name:          gdal
-Version:       3.8.3
-Release:       1%{?dist}
+Version:       3.8.4
+Release:       2%{?dist}
 Summary:       GIS file format library
 License:       MIT
 URL:           http://www.gdal.org
@@ -71,6 +71,8 @@ Source5:       %{name}-cleaner.sh
 
 # Add some utils to the default install target
 Patch0:        gdal_utils.patch
+# Fix passing incompatible pointer type
+Patch1:        gdal_incompatible-pointer-types.patch
 
 BuildRequires: cmake
 BuildRequires: gcc-c++
@@ -88,7 +90,12 @@ BuildRequires: gtest-devel
 BuildRequires: hdf-devel
 BuildRequires: hdf5-devel
 BuildRequires: json-c-devel
+BuildRequires: libarchive-devel
+%ifnarch %{ix86} %{arm}
+BuildRequires: libarrow-devel
+%endif
 BuildRequires: libdap-devel
+BuildRequires: libdeflate-devel
 BuildRequires: libgeotiff-devel
 BuildRequires: libgta-devel
 BuildRequires: libjpeg-devel
@@ -133,6 +140,7 @@ BuildRequires: mingw32-expat
 BuildRequires: mingw32-freexl
 BuildRequires: mingw32-geos
 BuildRequires: mingw32-giflib
+BuildRequires: mingw32-libarchive
 BuildRequires: mingw32-libgeotiff
 BuildRequires: mingw32-libgta
 BuildRequires: mingw32-libjpeg-turbo
@@ -163,6 +171,7 @@ BuildRequires: mingw64-expat
 BuildRequires: mingw64-freexl
 BuildRequires: mingw64-geos
 BuildRequires: mingw64-giflib
+BuildRequires: mingw64-libarchive
 BuildRequires: mingw64-libgeotiff
 BuildRequires: mingw64-libgta
 BuildRequires: mingw64-libjpeg-turbo
@@ -572,6 +581,24 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
 
 
 %changelog
+* Mon Feb 26 2024 Sandro Mani <manisandro@gmail.com> - 3.8.4-2
+- BR: libarchive
+
+* Sun Feb 18 2024 Sandro Mani <manisandro@gmail.com> - 3.8.4-1
+- Update to 3.8.4
+
+* Fri Feb 02 2024 Sandro Mani <manisandro@gmail.com> - 3.8.3-5
+- Rebuild (poppler)
+
+* Sat Jan 27 2024 Sandro Mani <manisandro@gmail.com> - 3.8.3-4
+- Enable libarrow, libdeflate
+
+* Wed Jan 24 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.3-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 3.8.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
 * Mon Jan 08 2024 Sandro Mani <manisandro@gmail.com> - 3.8.3-1
 - Update to 3.8.3
 

gdal_incompatible-pointer-types.patch

@@ -0,0 +1,12 @@
+diff -rupN --no-dereference gdal-3.8.4-fedora/port/cpl_vsil_win32.cpp gdal-3.8.4-fedora-new/port/cpl_vsil_win32.cpp
+--- gdal-3.8.4-fedora/port/cpl_vsil_win32.cpp	2024-02-08 20:16:25.000000000 +0100
++++ gdal-3.8.4-fedora-new/port/cpl_vsil_win32.cpp	2024-02-18 23:38:43.682963451 +0100
+@@ -812,7 +812,7 @@ int VSIWin32FilesystemHandler::Stat(cons
+         }
+         else
+         {
+-            nResult = _wstat64(pwszFilename, pStatBuf);
++            nResult = _wstat64(pwszFilename, reinterpret_cast<struct _stat64 *>(pStatBuf));
+             if (nResult < 0)
+             {
+                 DWORD nLastError = GetLastError();

gdal_utils.patch

@@ -1,6 +1,6 @@
-diff -rupN --no-dereference gdal-3.8.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.8.3-fedora-new/frmts/iso8211/CMakeLists.txt
---- gdal-3.8.3-fedora/frmts/iso8211/CMakeLists.txt	2024-01-04 19:08:59.000000000 +0100
-+++ gdal-3.8.3-fedora-new/frmts/iso8211/CMakeLists.txt	2024-01-08 22:30:01.000874184 +0100
+diff -rupN --no-dereference gdal-3.8.4-fedora/frmts/iso8211/CMakeLists.txt gdal-3.8.4-fedora-new/frmts/iso8211/CMakeLists.txt
+--- gdal-3.8.4-fedora/frmts/iso8211/CMakeLists.txt	2024-02-08 20:16:25.000000000 +0100
++++ gdal-3.8.4-fedora-new/frmts/iso8211/CMakeLists.txt	2024-02-18 23:38:43.387970571 +0100
 @@ -15,15 +15,18 @@ gdal_standard_includes(gdal_iso8211)
  
  # Because linking an OBJECT library
@@ -23,9 +23,9 @@ diff -rupN --no-dereference gdal-3.8.3-fedora/frmts/iso8211/CMakeLists.txt gdal-
      target_link_libraries(8211createfromxml PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
 +    install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
  endif ()
-diff -rupN --no-dereference gdal-3.8.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.8.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
---- gdal-3.8.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2024-01-04 19:08:59.000000000 +0100
-+++ gdal-3.8.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2024-01-08 22:30:01.005874179 +0100
+diff -rupN --no-dereference gdal-3.8.4-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.8.4-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
+--- gdal-3.8.4-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt	2024-02-08 20:16:25.000000000 +0100
++++ gdal-3.8.4-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt	2024-02-18 23:38:43.391970475 +0100
 @@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA
  gdal_standard_includes(ogr_S57)
  

sources

@@ -1,2 +1,2 @@
-SHA512 (gdal-3.8.3-fedora.tar.xz) = ccd8682a2ab837f23923281a4ff2c539b359dfcf91f3def1f08b2c4267545e3cb72bb1818f9bfc972e3ec2db3e0124a648a29f7317b1637129a27ce58b018d19
-SHA512 (gdalautotest-3.8.3.tar.gz) = 02f80acac170ab46878875dd5ee5d9956c940defcdad9fca14a38781ad7696d0117e63baefc36de370780999ae7ec3ff2ec4cb4a2c37c202365a852c7d01ebc3
+SHA512 (gdal-3.8.4-fedora.tar.xz) = 4acfe6f7bc980edf928b9244c103df1eb38858c052b90b4270b20362998bc4c597c24e2ec1df713f3f4890d82330667f43dc65a9c5f5779a3ee1a910c449bd26
+SHA512 (gdalautotest-3.8.4.tar.gz) = 582a67bfabfa98e552d8c6ad6a1666ab770534c74d982f44714223c7dc98fba2854b266fc84d58191db54e4cc859eaf91426c2b738bee228918f730057ded751