Compare commits
No commits in common. "rawhide" and "f40" have entirely different histories.
7 changed files with 288 additions and 733 deletions
27
.gitignore
vendored
27
.gitignore
vendored
|
|
@ -114,30 +114,3 @@ gdalautotest-1.7.0.tar.gz
|
|||
/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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
12
gdal_incompatible-pointer-types.patch
Normal file
12
gdal_incompatible-pointer-types.patch
Normal file
|
|
@ -0,0 +1,12 @@
|
|||
diff -rupN --no-dereference gdal-3.8.5-fedora/port/cpl_vsil_win32.cpp gdal-3.8.5-fedora-new/port/cpl_vsil_win32.cpp
|
||||
--- gdal-3.8.5-fedora/port/cpl_vsil_win32.cpp 2024-04-02 12:05:54.000000000 +0200
|
||||
+++ gdal-3.8.5-fedora-new/port/cpl_vsil_win32.cpp 2024-04-08 09:44:28.226414023 +0200
|
||||
@@ -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();
|
||||
21
gdal_java8.patch
Normal file
21
gdal_java8.patch
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
diff -rupN --no-dereference gdal-3.8.5-fedora/swig/java/build.xml gdal-3.8.5-fedora-new/swig/java/build.xml
|
||||
--- gdal-3.8.5-fedora/swig/java/build.xml 2024-04-02 12:05:54.000000000 +0200
|
||||
+++ gdal-3.8.5-fedora-new/swig/java/build.xml 2024-04-08 09:44:28.451386861 +0200
|
||||
@@ -21,7 +21,7 @@
|
||||
<target name="compile" depends="init" description="Compile the source files.">
|
||||
<mkdir dir="${build_dir}/build/classes"/>
|
||||
<javac srcdir="${build_dir}/org" destdir="${build_dir}/build/classes"
|
||||
- debug="on" source="7" target="7"
|
||||
+ debug="on" source="8" target="8"
|
||||
includeantruntime="false" deprecation="true">
|
||||
</javac>
|
||||
<echo>compilation complete</echo>
|
||||
@@ -38,7 +38,7 @@
|
||||
<target name="compile_tests" depends="archive" description="Compile the tests files.">
|
||||
<mkdir dir="${build_dir}/build/apps"/>
|
||||
<javac srcdir="${source_apps}" destdir="${build_dir}/build/apps"
|
||||
- debug="on" source="7" target="7"
|
||||
+ debug="on" source="8" target="8"
|
||||
includeantruntime="false" deprecation="true" classpath="${build_dir}/gdal.jar">
|
||||
</javac>
|
||||
<echo>compilation of tests complete</echo>
|
||||
|
|
@ -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.8.5-fedora/frmts/iso8211/CMakeLists.txt gdal-3.8.5-fedora-new/frmts/iso8211/CMakeLists.txt
|
||||
--- gdal-3.8.5-fedora/frmts/iso8211/CMakeLists.txt 2024-04-02 12:05:54.000000000 +0200
|
||||
+++ gdal-3.8.5-fedora-new/frmts/iso8211/CMakeLists.txt 2024-04-08 09:44:27.994442034 +0200
|
||||
@@ -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.8.5-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.8.5-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
|
||||
--- gdal-3.8.5-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2024-04-02 12:05:54.000000000 +0200
|
||||
+++ gdal-3.8.5-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2024-04-08 09:44:27.994442034 +0200
|
||||
@@ -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 ()
|
||||
|
|
|
|||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
|||
SHA512 (gdal-3.12.1-fedora.tar.xz) = 311005e3f577b09360b2a0bb9f6e3b97668f320a5833fe27753690f9067620460b1317ba615c7e59c01047782507ed7ebadf696ed951b477e4f53d0a4a402fc5
|
||||
SHA512 (gdalautotest-3.12.1.zip) = fb54eddf8b34d4bd9d308ec0e7b3b9947e07b4a0615f688daf933668b0faf4fd44c2bc716cce8045433ca894ff5dde60e75acd42d5a4aa5e2999b9fd5cd4d6a5
|
||||
SHA512 (gdal-3.8.5-fedora.tar.xz) = b7d85884a70ef063c955010b9d592174f887908da22d4512656155c37a284c02dad5835fcaef05b6b83c4dcf4b69a7dc7af430dce28828da9ef4b5880c660b04
|
||||
SHA512 (gdalautotest-3.8.5.tar.gz) = 18251e2fe5870bcbbde9c4278d7ce969feb6397a727679f56e6cf051cf5a3ded29217c034566cb9c5ebb02d51ad4d12933ab918eeadb0017c78859892bbf4f19
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue