Compare commits

..

3 commits

Author SHA1 Message Date
Sandro Mani
0cb023e485 Downgrade to 3.5.3 2023-11-07 14:32:09 +01:00
Sandro Mani
3a572d9f94 Rebuild (mingw-xerces-c) 2023-10-23 12:07:31 +02:00
Sandro Mani
8d9ff61996 Revert "Update to 3.6.3"
This reverts commit f9c99ced77.
2023-03-15 08:53:13 +01:00
7 changed files with 259 additions and 899 deletions

51
.gitignore vendored
View file

@ -90,54 +90,3 @@ gdalautotest-1.7.0.tar.gz
/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
/gdal-3.8.5-fedora.tar.xz
/gdalautotest-3.8.5.tar.gz
/gdal-3.9.0-fedora.tar.xz
/gdalautotest-3.9.0.tar.gz
/gdal-3.9.1-fedora.tar.xz
/gdalautotest-3.9.1.tar.gz
/gdal-3.9.2-fedora.tar.xz
/gdalautotest-3.9.2.tar.gz
/gdalautotest-3.9.3.tar.gz
/gdal-3.9.3-fedora.tar.xz
/gdal-3.10.0-fedora.tar.xz
/gdalautotest-3.10.0.tar.gz
/gdal-3.10.1-fedora.tar.xz
/gdalautotest-3.10.1.tar.gz
/gdal-3.10.2-fedora.tar.xz
/gdalautotest-3.10.2.tar.gz
/gdal-3.10.3-fedora.tar.xz
/gdalautotest-3.10.3.tar.gz
/gdal-3.11.3-fedora.tar.xz
/gdalautotest-3.11.3.tar.gz
/gdal-3.11.4-fedora.tar.xz
/gdalautotest-3.11.4.tar.gz
/gdal-3.11.5-fedora.tar.xz
/gdalautotest-3.11.5.tar.gz
/gdal-3.12.0-fedora.tar.xz
/gdal-3.12.0.tar.xz
/gdalautotest-3.12.0.zip
/gdal-3.12.1-fedora.tar.xz
/gdalautotest-3.12.1.zip

View file

@ -1,8 +1,7 @@
#!/bin/bash
set -e
if [ $# -lt 1 ]; then
echo "Usage: $0 version pre"
echo "Usage: $0 version"
exit 1
fi
@ -19,20 +18,20 @@ if [ -d gdal-"${VERSION}" ] || [ -d gdal-"${VERSION}"-fedora ]; then
fi
tar xvf gdal-"${VERSION}${PRE}".tar.xz
mv gdal-"${VERSION}${PRE}"{,-fedora} && pushd gdal-"${VERSION}${PRE}"-fedora
mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora
rm ogr/data/cubewerx_extra.wkt
rm ogr/data/esri_StatePlane_extra.wkt
rm ogr/data/ecw_cs.wkt
rm data/cubewerx_extra.wkt
rm data/esri_StatePlane_extra.wkt
rm data/ecw_cs.wkt
sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/cubewerx_extra.wkt||' ogr/CMakeLists.txt
sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/esri_StatePlane_extra.wkt||' ogr/CMakeLists.txt
sed -i 's|${CMAKE_CURRENT_SOURCE_DIR}/data/ecw_cs.wkt||' ogr/CMakeLists.txt
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}${PRE}"-fedora.tar.xz gdal-"${VERSION}${PRE}"-fedora
tar cvfJ gdal-"${VERSION}${PRE}"-fedora.tar.xz gdal-"${VERSION}"-fedora

View file

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

21
gdal-fortify-source.patch Normal file
View file

@ -0,0 +1,21 @@
diff -rupN --no-dereference gdal-3.5.3-fedora/port/vsipreload.cpp gdal-3.5.3-fedora-new/port/vsipreload.cpp
--- gdal-3.5.3-fedora/port/vsipreload.cpp 2022-10-21 16:57:18.000000000 +0200
+++ gdal-3.5.3-fedora-new/port/vsipreload.cpp 2023-11-07 11:43:16.562899886 +0100
@@ -46,6 +46,17 @@
// LD_PRELOAD=./vsipreload.so ls -al /vsicurl/http://download.osgeo.org/gdal/data/sqlite3
// LD_PRELOAD=./vsipreload.so find /vsicurl/http://download.osgeo.org/gdal/data/sqlite3
+
+/*
+ * We need to export open* etc., but _FORTIFY_SOURCE defines conflicting
+ * always_inline versions. Disable _FORTIFY_SOURCE for this file, so we
+ * can define our overrides.
+ */
+#ifdef _FORTIFY_SOURCE
+#undef _FORTIFY_SOURCE
+#endif
+
+
#define _GNU_SOURCE 1
#define _LARGEFILE64_SOURCE 1
#include <stdio.h>

995
gdal.spec

File diff suppressed because it is too large Load diff

View file

@ -1,37 +1,39 @@
diff -rupN --no-dereference gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.12.1-fedora-new/frmts/iso8211/CMakeLists.txt
--- gdal-3.12.1-fedora/frmts/iso8211/CMakeLists.txt 2025-12-18 15:15:18.000000000 +0100
+++ gdal-3.12.1-fedora-new/frmts/iso8211/CMakeLists.txt 2025-12-18 16:35:42.369730740 +0100
@@ -14,14 +14,17 @@ target_sources(${GDAL_LIB_TARGET_NAME} P
gdal_standard_includes(gdal_iso8211)
diff -rupN --no-dereference gdal-3.5.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.5.3-fedora-new/frmts/iso8211/CMakeLists.txt
--- gdal-3.5.3-fedora/frmts/iso8211/CMakeLists.txt 2022-10-21 16:57:17.000000000 +0200
+++ gdal-3.5.3-fedora-new/frmts/iso8211/CMakeLists.txt 2023-11-07 11:43:16.335937254 +0100
@@ -15,15 +15,18 @@ gdal_standard_includes(gdal_iso8211)
# Because linking an OBJECT library
-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})
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(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})
diff -rupN --no-dereference gdal-3.12.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.12.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
--- gdal-3.12.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-12-18 15:15:18.000000000 +0100
+++ gdal-3.12.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-12-18 16:35:42.369966573 +0100
@@ -38,7 +38,8 @@ if (USE_ONLY_EMBEDDED_RESOURCE_FILES)
target_compile_definitions(ogr_S57 PRIVATE USE_ONLY_EMBEDDED_RESOURCE_FILES)
endif()
- 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.5.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.5.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
--- gdal-3.5.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2022-10-21 16:57:17.000000000 +0200
+++ gdal-3.5.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-11-07 11:43:16.335937254 +0100
@@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA
gdal_standard_includes(ogr_S57)
-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})
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 ()

View file

@ -1,2 +1,2 @@
SHA512 (gdal-3.12.1-fedora.tar.xz) = 311005e3f577b09360b2a0bb9f6e3b97668f320a5833fe27753690f9067620460b1317ba615c7e59c01047782507ed7ebadf696ed951b477e4f53d0a4a402fc5
SHA512 (gdalautotest-3.12.1.zip) = fb54eddf8b34d4bd9d308ec0e7b3b9947e07b4a0615f688daf933668b0faf4fd44c2bc716cce8045433ca894ff5dde60e75acd42d5a4aa5e2999b9fd5cd4d6a5
SHA512 (gdal-3.5.3-fedora.tar.xz) = da205c1a23cb076b904046d5a9cc8902933abd3e790aed4fb3e60ba39104035e478465eca2ea44b5c9d3e217580d124de4d6e6a6e7d5ac37b91e644beb9cab18
SHA512 (gdalautotest-3.5.3.tar.gz) = 3b18c94d0b0e1d6d2d38ca82cddc8e69f2acf800fa1b4e7fbabaf112e9ad69fa807b92e652b43ebd122e3b5e8d6cc0d5644e92127a673676bc7df396720dab5e