BR: libarchive

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

.gitignore

@@ -43,3 +43,72 @@ gdalautotest-1.7.0.tar.gz
 /gdal-2.3.2-fedora.tar.xz
 /gdalautotest-3.0.1.zip
 /gdal-3.0.1-fedora.tar.xz
+/gdal-3.1.0-fedora.tar.xz
+/gdalautotest-3.1.0.tar.gz
+/gdal-3.1.1-fedora.tar.xz
+/gdalautotest-3.1.1.tar.gz
+/gdal-3.1.2-fedora.tar.xz
+/gdalautotest-3.1.2.tar.gz
+/gdal-3.1.3-fedora.tar.xz
+/gdalautotest-3.1.3.tar.gz
+/gdal-3.1.4-fedora.tar.xz
+/gdalautotest-3.1.4.tar.gz
+/gdalautotest-3.2.0.tar.gz
+/gdal-3.2.0-fedora.tar.xz
+/gdal-3.2.1-fedora.tar.xz
+/gdalautotest-3.2.1.tar.gz
+/gdalautotest-3.2.2.tar.gz
+/gdal-3.2.2-fedora.tar.xz
+/gdalautotest-3.3.0.tar.gz
+/gdal-3.3.0-fedora.tar.xz
+/gdal-3.3.1-fedora.tar.xz
+/gdalautotest-3.3.1.tar.gz
+/gdal-3.3.2-fedora.tar.xz
+/gdalautotest-3.3.2.tar.gz
+/gdal-3.3.3-fedora.tar.xz
+/gdalautotest-3.3.3.tar.gz
+/gdal-3.4.0-fedora.tar.xz
+/gdalautotest-3.4.0.tar.gz
+/gdal-3.4.1-fedora.tar.xz
+/gdalautotest-3.4.1.tar.gz
+/gdal-3.4.2-fedora.tar.xz
+/gdalautotest-3.4.2.tar.gz
+/gdal-3.4.3-fedora.tar.xz
+/gdalautotest-3.4.3.tar.gz
+/gdalautotest-3.5.0.tar.gz
+/gdal-3.5.0-fedora.tar.xz
+/gdalautotest-3.5.1.tar.gz
+/gdal-3.5.1-fedora.tar.xz
+/gdal-3.5.2-fedora.tar.xz
+/gdalautotest-3.5.2.tar.gz
+/gdal-3.5.3-fedora.tar.xz
+/gdalautotest-3.5.3.tar.gz
+/gdal-3.6.0-fedora.tar.xz
+/gdalautotest-3.6.0.tar.gz
+/gdalautotest-3.6.1.tar.gz
+/gdal-3.6.1.tar.xz
+/gdal-3.6.1-fedora.tar.xz
+/gdal-3.6.2-fedora.tar.xz
+/gdalautotest-3.6.2.tar.gz
+/gdal-3.6.3-fedora.tar.xz
+/gdalautotest-3.6.3.tar.gz
+/gdal-3.6.4-fedora.tar.xz
+/gdalautotest-3.6.4.tar.gz
+/gdal-3.7.0-fedora.tar.xz
+/gdalautotest-3.7.0.tar.gz
+/gdal-3.7.1-fedora.tar.xz
+/gdalautotest-3.7.1.tar.gz
+/gdal-3.7.2-fedora.tar.xz
+/gdalautotest-3.7.2.tar.gz
+/gdal-3.7.3-fedora.tar.xz
+/gdalautotest-3.7.3.tar.gz
+/gdal-3.8.0-fedora.tar.xz
+/gdalautotest-3.8.0.tar.gz
+/gdal-3.8.1-fedora.tar.xz
+/gdalautotest-3.8.1.tar.gz
+/gdal-3.8.2-fedora.tar.xz
+/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

cpl-config.h

@@ -0,0 +1,11 @@
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+#include "gdal/cpl_config-32.h"
+#else
+#if __WORDSIZE == 64
+#include "gdal/cpl_config-64.h"
+#else
+#error "Unknown word size"
+#endif
+#endif

gdal-1.9.0-java.patch

@@ -1,11 +0,0 @@
-diff -rupN --no-dereference gdal-3.0.4-fedora/swig/java/java.opt gdal-3.0.4-fedora-new/swig/java/java.opt
---- gdal-3.0.4-fedora/swig/java/java.opt	2020-01-28 11:13:12.000000000 +0100
-+++ gdal-3.0.4-fedora-new/swig/java/java.opt	2020-02-06 00:23:36.321286290 +0100
-@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
- JAVAC=$(JAVA_HOME)/bin/javac
- JAVA=$(JAVA_HOME)/bin/java
- JAR=$(JAVA_HOME)/bin/jar
--JAVA_INCLUDE=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
-+JAVA_INCLUDE=-I/usr/lib/jvm/java/include/ -I/usr/lib/jvm/java/include/linux
- 
- 

gdal-cleaner.sh

@@ -1,22 +1,37 @@
 #!/bin/bash
-VERSION="3.0.4"
 
-tar xvf gdal-"${VERSION}".tar.xz
+if [ $# -lt 1 ]; then
+	echo "Usage: $0 version"
+	exit 1
+fi
 
+VERSION="$1"
+PRE="$2"
+
+if [ ! -f "gdal-"${VERSION}${PRE}".tar.xz" ]; then
+    wget https://download.osgeo.org/gdal/${VERSION}/gdal-${VERSION}${PRE}.tar.xz
+fi
+
+if [ -d gdal-"${VERSION}" ] || [ -d gdal-"${VERSION}"-fedora ]; then
+    echo "gdal-${VERSION} or gdal-${VERSION}-fedora in the way, please remove and rerun this script"
+    exit 1
+fi
+
+tar xvf gdal-"${VERSION}${PRE}".tar.xz
 mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora
 
 rm data/cubewerx_extra.wkt
-rm data/esri_extra.wkt
-rm data/esri_Wisconsin_extra.wkt
 rm data/esri_StatePlane_extra.wkt
 rm data/ecw_cs.wkt
 
-#Really necessary?
-rm -r swig/php
+
+sed -i 's|data/cubewerx_extra.wkt||' gdal.cmake
+sed -i 's|data/esri_StatePlane_extra.wkt||' gdal.cmake
+sed -i 's|data/ecw_cs.wkt||' gdal.cmake
 
 popd
 
 
 #TODO: Insert Provenance file
 
-tar cvfJ gdal-"${VERSION}"-fedora.tar.xz gdal-"${VERSION}"-fedora
+tar cvfJ gdal-"${VERSION}${PRE}"-fedora.tar.xz gdal-"${VERSION}"-fedora

gdal-completion.patch

@@ -1,12 +0,0 @@
-diff -rupN --no-dereference gdal-3.0.4-fedora/scripts/GNUmakefile gdal-3.0.4-fedora-new/scripts/GNUmakefile
---- gdal-3.0.4-fedora/scripts/GNUmakefile	2020-01-28 11:13:13.000000000 +0100
-+++ gdal-3.0.4-fedora-new/scripts/GNUmakefile	2020-02-06 00:23:36.089287463 +0100
-@@ -5,6 +5,6 @@ completion:
- 
- install:
- 	if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
--		$(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
--		cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
-+		$(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=compatdir bash-completion` ; \
-+		$(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)`pkg-config --variable=compatdir bash-completion`/gdal; \
- 	fi

gdal-config

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+ARCH=$(uname -m)
+case $ARCH in
+x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 | riscv64 )
+gdal-config-64 ${*}
+;;
+*)
+gdal-config-32 ${*}
+;;
+esac

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_installapps.patch

@@ -1,11 +0,0 @@
-diff -rupN --no-dereference gdal-3.0.4-fedora/apps/GNUmakefile gdal-3.0.4-fedora-new/apps/GNUmakefile
---- gdal-3.0.4-fedora/apps/GNUmakefile	2020-01-28 11:13:12.000000000 +0100
-+++ gdal-3.0.4-fedora-new/apps/GNUmakefile	2020-03-03 23:17:41.032487778 +0100
-@@ -216,6 +216,7 @@ gdal-config-inst:	gdal-config.in ../GDAL
- 
- install: default
- 	for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
-+	for f in $(BIN_LIST) ; do $(INSTALL) .libs/$$f $(DESTDIR)$(INST_BIN) ; done
- 	$(INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
- 	$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
- 

gdal_iso8211.patch

@@ -1,13 +0,0 @@
-diff -rupN gdal-3.0.4-fedora/frmts/iso8211/GNUmakefile gdal-3.0.4-fedora-new/frmts/iso8211/GNUmakefile
---- gdal-3.0.4-fedora/frmts/iso8211/GNUmakefile	2020-01-28 11:13:11.000000000 +0100
-+++ gdal-3.0.4-fedora-new/frmts/iso8211/GNUmakefile	2020-02-06 00:24:10.382117696 +0100
-@@ -23,8 +23,7 @@ dist-clean:	clean
- 	rm -rf $(DISTDIR)
- 
- $(ISOLIB):	$(OBJ:.o=.$(OBJ_EXT))
--	$(AR) r $(ISOLIB) $?
--	$(RANLIB) $(ISOLIB)
-+	$(SHELL) $(top_builddir)/libtool --mode=link gcc -static -o $(ISOLIB) $?
- 
- 8211createfromxml$(EXE):	8211createfromxml.$(OBJ_EXT)
- 	$(LD) $(LDFLAGS) 8211createfromxml.$(OBJ_EXT) $(CONFIG_LIBS) -o 8211createfromxml$(EXE)

gdal_tirpcinc.patch

@@ -1,24 +0,0 @@
-diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/dods/GNUmakefile gdal-3.0.4-fedora-new/frmts/dods/GNUmakefile
---- gdal-3.0.4-fedora/frmts/dods/GNUmakefile	2020-01-28 11:13:11.000000000 +0100
-+++ gdal-3.0.4-fedora-new/frmts/dods/GNUmakefile	2020-02-06 00:23:36.543285168 +0100
-@@ -4,7 +4,7 @@ include ../../GDALmake.opt
- 
- OBJ	=	dodsdataset2.o
- 
--CPPFLAGS	:=	 $(CPPFLAGS) $(DODS_INC)
-+CPPFLAGS	:=	 $(CPPFLAGS) $(DODS_INC) -I/usr/include/tirpc
- 
- default:	$(OBJ:.o=.$(OBJ_EXT))
- 
-diff -rupN --no-dereference gdal-3.0.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.0.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
---- gdal-3.0.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile	2020-01-28 11:13:11.000000000 +0100
-+++ gdal-3.0.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile	2020-02-06 00:23:36.543285168 +0100
-@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
- OBJ	=	ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
- 		ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o
- 
--CPPFLAGS	:=	-I..  $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL
-+CPPFLAGS	:=	-I..  $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL -I/usr/include/tirpc
- 
- default:	$(O_OBJ:.o=.$(OBJ_EXT))
- 

gdal_utils.patch

@@ -0,0 +1,39 @@
+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
+ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
+-    add_executable(8211dump EXCLUDE_FROM_ALL 8211dump.cpp)
++    add_executable(8211dump 8211dump.cpp)
+     target_include_directories(8211dump PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
+     target_link_libraries(8211dump PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
++    install(TARGETS 8211dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+-    add_executable(8211view EXCLUDE_FROM_ALL 8211view.cpp)
++    add_executable(8211view 8211view.cpp)
+     target_include_directories(8211view PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
+     target_link_libraries(8211view PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
++    install(TARGETS 8211view RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+-    add_executable(8211createfromxml EXCLUDE_FROM_ALL 8211createfromxml.cpp)
++    add_executable(8211createfromxml 8211createfromxml.cpp)
+     target_include_directories(8211createfromxml PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
+     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.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)
+ 
+ if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.12)
+-  add_executable(s57dump EXCLUDE_FROM_ALL s57dump.cpp)
++  add_executable(s57dump s57dump.cpp)
+   gdal_standard_includes(s57dump)
+   target_include_directories(s57dump PRIVATE $<TARGET_PROPERTY:gdal_iso8211,SOURCE_DIR>)
+   target_link_libraries(s57dump PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> ogr_S57 gdal_iso8211)
++  install(TARGETS s57dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+ endif ()

sources

@@ -1,2 +1,2 @@
-SHA512 (gdal-3.0.4-fedora.tar.xz) = f880a763cbf3e846789df4c45a68be11121fdc66252dab126d95b79141589435ef7712ed0efcb7d633643f2c82cde88f9663bb15b624e69f362ed2e10a79a110
-SHA512 (gdalautotest-3.0.4.tar.gz) = d205c6eba1c68ade3cd55b9ae77c9a885f1ff87f6964ea4e71799bc98393ddcf92081a5319afd3d0d9d0cf8862d140eb59ad2ccf7e70a955cad2732f55c28e72
+SHA512 (gdal-3.8.4-fedora.tar.xz) = 4acfe6f7bc980edf928b9244c103df1eb38858c052b90b4270b20362998bc4c597c24e2ec1df713f3f4890d82330667f43dc65a9c5f5779a3ee1a910c449bd26
+SHA512 (gdalautotest-3.8.4.tar.gz) = 582a67bfabfa98e552d8c6ad6a1666ab770534c74d982f44714223c7dc98fba2854b266fc84d58191db54e4cc859eaf91426c2b738bee228918f730057ded751