Compare commits
49 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
4015c908dd | ||
|
|
fc760216de | ||
|
|
dcd61ee050 | ||
|
|
c006213de0 | ||
|
|
2665a7f24c | ||
|
|
b7e01d9917 |
||
|
|
4fc48a16c4 | ||
|
|
f810f3bd7c | ||
|
|
38126bb718 | ||
|
|
d85d81a7bf | ||
|
|
b1f662fa46 | ||
|
|
d354dcf08c | ||
|
|
d0879d3353 | ||
|
|
53a4cd4851 | ||
|
|
e145220ec5 | ||
|
|
136d07b83f | ||
|
|
377f8594e7 | ||
|
|
bf3daf0173 | ||
|
|
bc3cea3402 | ||
|
|
66ce787be2 | ||
|
|
0086087c35 | ||
|
|
a06f118545 | ||
|
|
196ae48f05 | ||
|
|
c4cc55a181 | ||
|
|
698a044082 | ||
|
|
e95684c34e | ||
|
|
1bfaf55274 | ||
|
|
20fd14c6be | ||
|
|
1eca685c25 | ||
|
|
e70fc9f76d | ||
|
|
8df52d19a3 | ||
|
|
424b52eaac | ||
|
|
1a3603cd22 | ||
|
|
7e82750251 | ||
|
|
529be833d4 | ||
|
|
770433fc76 | ||
|
|
899461ad98 | ||
|
|
db98046d34 | ||
|
|
00acea5160 | ||
|
|
2f7e4bef1f | ||
|
|
8c749deb75 | ||
|
|
c666a69311 | ||
|
|
bf35e9cb08 | ||
|
|
b75d0ec0d4 | ||
|
|
93adb52b9f | ||
|
|
565ce6e053 | ||
|
|
2bc527eb6a | ||
|
|
637386cf97 | ||
|
|
ad3453eb76 |
6 changed files with 642 additions and 311 deletions
17
.gitignore
vendored
17
.gitignore
vendored
|
|
@ -124,3 +124,20 @@ gdalautotest-1.7.0.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
|
||||
|
|
|
|||
|
|
@ -1,7 +1,8 @@
|
|||
#!/bin/bash
|
||||
set -e
|
||||
|
||||
if [ $# -lt 1 ]; then
|
||||
echo "Usage: $0 version"
|
||||
echo "Usage: $0 version pre"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
|
@ -18,20 +19,20 @@ if [ -d gdal-"${VERSION}" ] || [ -d gdal-"${VERSION}"-fedora ]; then
|
|||
fi
|
||||
|
||||
tar xvf gdal-"${VERSION}${PRE}".tar.xz
|
||||
mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora
|
||||
mv gdal-"${VERSION}${PRE}"{,-fedora} && pushd gdal-"${VERSION}${PRE}"-fedora
|
||||
|
||||
rm data/cubewerx_extra.wkt
|
||||
rm data/esri_StatePlane_extra.wkt
|
||||
rm data/ecw_cs.wkt
|
||||
rm ogr/data/cubewerx_extra.wkt
|
||||
rm ogr/data/esri_StatePlane_extra.wkt
|
||||
rm ogr/data/ecw_cs.wkt
|
||||
|
||||
|
||||
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
|
||||
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
|
||||
|
||||
popd
|
||||
|
||||
|
||||
#TODO: Insert Provenance file
|
||||
|
||||
tar cvfJ gdal-"${VERSION}${PRE}"-fedora.tar.xz gdal-"${VERSION}"-fedora
|
||||
tar cvfJ gdal-"${VERSION}${PRE}"-fedora.tar.xz gdal-"${VERSION}${PRE}"-fedora
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
diff -rupN --no-dereference gdal-3.10.0-fedora/port/cpl_vsil_win32.cpp gdal-3.10.0-fedora-new/port/cpl_vsil_win32.cpp
|
||||
--- gdal-3.10.0-fedora/port/cpl_vsil_win32.cpp 2024-11-01 16:47:25.000000000 +0100
|
||||
+++ gdal-3.10.0-fedora-new/port/cpl_vsil_win32.cpp 2024-11-06 16:50:12.824350522 +0100
|
||||
@@ -897,7 +897,7 @@ int VSIWin32FilesystemHandler::Stat(cons
|
||||
pwszFilename[nLen - 1] = 0;
|
||||
#endif
|
||||
|
||||
- int nResult = _wstat64(pwszFilename, pStatBuf);
|
||||
+ int nResult = _wstat64(pwszFilename, reinterpret_cast<struct _stat64 *>(pStatBuf));
|
||||
|
||||
// If _wstat64() fails and the original name is not an extended one,
|
||||
// then retry with an extended filename
|
||||
@@ -908,7 +908,7 @@ int VSIWin32FilesystemHandler::Stat(cons
|
||||
nLastError == ERROR_FILENAME_EXCED_RANGE)
|
||||
{
|
||||
VSIWin32TryLongFilename(pwszFilename);
|
||||
- nResult = _wstat64(pwszFilename, pStatBuf);
|
||||
+ nResult = _wstat64(pwszFilename, reinterpret_cast<struct _stat64 *>(pStatBuf));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
diff -rupN --no-dereference gdal-3.10.0-fedora/frmts/iso8211/CMakeLists.txt gdal-3.10.0-fedora-new/frmts/iso8211/CMakeLists.txt
|
||||
--- gdal-3.10.0-fedora/frmts/iso8211/CMakeLists.txt 2024-11-01 16:47:25.000000000 +0100
|
||||
+++ gdal-3.10.0-fedora-new/frmts/iso8211/CMakeLists.txt 2024-11-06 16:50:12.603332820 +0100
|
||||
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)
|
||||
|
||||
|
|
@ -22,12 +22,12 @@ diff -rupN --no-dereference gdal-3.10.0-fedora/frmts/iso8211/CMakeLists.txt gdal
|
|||
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.10.0-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.10.0-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
|
||||
--- gdal-3.10.0-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2024-11-01 16:47:26.000000000 +0100
|
||||
+++ gdal-3.10.0-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2024-11-06 16:50:12.604332900 +0100
|
||||
@@ -27,7 +27,8 @@ set_property(
|
||||
APPEND
|
||||
PROPERTY RESOURCE "${GDAL_DATA_FILES}")
|
||||
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(s57dump EXCLUDE_FROM_ALL s57dump.cpp)
|
||||
+add_executable(s57dump s57dump.cpp)
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (gdal-3.10.0-fedora.tar.xz) = d17a6d5894847e03c3b8f5de55e87321d1fc848c8b822664b36b28abe1388fffd4288db5798a9261b46aa05d82903724a46af5752c9c7d7a42dfd063df2ee757
|
||||
SHA512 (gdalautotest-3.10.0.tar.gz) = 89ae4dfedb7f86405dc43c6ddeddbba569b050189fc85ae43521a1be4d71dd3fbc8e357b33753786d2ce921eaf9a1e9805d2a79a822885f462c526c4ba43ad00
|
||||
SHA512 (gdal-3.12.1-fedora.tar.xz) = 311005e3f577b09360b2a0bb9f6e3b97668f320a5833fe27753690f9067620460b1317ba615c7e59c01047782507ed7ebadf696ed951b477e4f53d0a4a402fc5
|
||||
SHA512 (gdalautotest-3.12.1.zip) = fb54eddf8b34d4bd9d308ec0e7b3b9947e07b4a0615f688daf933668b0faf4fd44c2bc716cce8045433ca894ff5dde60e75acd42d5a4aa5e2999b9fd5cd4d6a5
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue