diff --git a/gdal-3.10.2-integer-types.patch b/gdal-3.10.2-integer-types.patch new file mode 100644 index 0000000000000000000000000000000000000000..dfad44c26bddd0b8cac29899badaa805a951221f --- /dev/null +++ b/gdal-3.10.2-integer-types.patch @@ -0,0 +1,11 @@ +diff -rupN --no-dereference gdal-3.10.3-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp +--- gdal-3.10.3-fedora/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2025-04-01 13:03:21.000000000 +0200 ++++ gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp 2025-04-07 13:39:47.674069257 +0200 +@@ -23,6 +23,7 @@ + #include + #include + #include ++#include + + #if ((defined(__sun__) || defined(__FreeBSD__)) && __GNUC__ == 4 && __GNUC_MINOR__ == 8) || defined(__ANDROID__) + // gcc 4.8 on Solaris 11.3 or FreeBSD 11 doesn't have std::string diff --git a/gdal-3.7.0.tar.xz b/gdal-3.10.3.tar.xz similarity index 46% rename from gdal-3.7.0.tar.xz rename to gdal-3.10.3.tar.xz index 633622d01f8f9c3a8ba2eec13d208651a7fa05e5..e6ed5b0c0f5d0dedbd22801dec9543185050ae5c 100644 Binary files a/gdal-3.7.0.tar.xz and b/gdal-3.10.3.tar.xz differ diff --git a/gdal-config b/gdal-config index 37a3f6635585d25cd706239c4931191c1a37746a..0a258a755aa94d55775022fb480b28b036dc6987 100755 --- a/gdal-config +++ b/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 ${*} ;; *) diff --git a/gdal.spec b/gdal.spec index 15bad66edeadb662df83e2ffc8b555bb5f66d1ba..bc1096ac57b43d3190dc5f0d54235a4309145450 100644 --- a/gdal.spec +++ b/gdal.spec @@ -1,4 +1,5 @@ -%global run_tests 0 +%define anolis_release 1 +%global run_tests 0 %global bashcompletiondir %(pkg-config --variable=compatdir bash-completion) @@ -25,14 +26,16 @@ %bcond_with mingw +ExcludeArch: loongarch64 + Name: gdal -Version: 3.7.0 -Release: 1%{?dist} +Version: 3.10.3 +Release: %{anolis_release}%{?dist} Summary: GIS file format library License: MIT URL: http://www.gdal.org -Source0: %{name}-%{version}.tar.xz +Source0: http://download.osgeo.org/%{name}/%{version}/%{name}-%{version}.tar.xz Source1: http://download.osgeo.org/%{name}/%{version}/%{name}autotest-%{version}.tar.gz Source2: cpl-config.h Source3: gdal-config @@ -40,9 +43,12 @@ Source3: gdal-config Source5: %{name}-cleaner.sh Patch0: gdal_utils.patch +Patch1: gdal_incompatible-pointer-types.patch +Patch2: gdal-3.10.2-integer-types.patch BuildRequires: cmake BuildRequires: gcc-c++ +BuildRequires: libarchive-devel BuildRequires: armadillo-devel BuildRequires: bison @@ -80,6 +86,7 @@ BuildRequires: ogdi-devel BuildRequires: OpenEXR-devel BuildRequires: openjpeg2-devel BuildRequires: pcre2-devel +BuildRequires: parquet-libs-devel %if 0%{?with_poppler} BuildRequires: poppler-devel %endif @@ -91,6 +98,8 @@ BuildRequires: unixODBC-devel BuildRequires: xerces-c-devel BuildRequires: xz-devel BuildRequires: zlib-devel +BuildRequires: libjpeg-turbo-devel +BuildRequires: openssl-devel %if %{with mingw} BuildRequires: mingw32-filesystem >= 102 @@ -102,6 +111,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 @@ -157,6 +167,7 @@ BuildRequires: mingw64-zstd # Python %if %{with python3} BuildRequires: python3-devel +BuildRequires: python3-filelock BuildRequires: python3-numpy BuildRequires: python3-setuptools BuildRequires: python3dist(pytest) >= 3.6 @@ -347,6 +358,7 @@ mv %{name}autotest-%{version} autotest %cmake \ -DCMAKE_INSTALL_INCLUDEDIR=include/gdal \ -DGDAL_JAVA_INSTALL_DIR=%{_jnidir}/%{name} \ + -DGDAL_JAVA_JNI_INSTALL_DIR=%{_jnidir}/%{name} \ -DGDAL_USE_JPEG12_INTERNAL=OFF \ -DBUILD_TESTING=OFF \ -DENABLE_DEFLATE64=OFF @@ -404,6 +416,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{_bindir}/8211* %{_bindir}/gdal_contour %{_bindir}/gdal_create +%{_bindir}/gdal_footprint %{_bindir}/gdal_grid %{_bindir}/gdal_rasterize %{_bindir}/gdal_translate @@ -430,6 +443,24 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %{_bindir}/ogrtindex %{_bindir}/s57dump %{_bindir}/sozip +%{_bindir}/gdal2tiles +%{_bindir}/gdal2xyz +%{_bindir}/gdal_calc +%{_bindir}/gdal_edit +%{_bindir}/gdal_fillnodata +%{_bindir}/gdal_merge +%{_bindir}/gdal_pansharpen +%{_bindir}/gdal_polygonize +%{_bindir}/gdal_proximity +%{_bindir}/gdal_retile +%{_bindir}/gdal_sieve +%{_bindir}/gdalattachpct +%{_bindir}/gdalcompare +%{_bindir}/gdalmove +%{_bindir}/ogr_layer_algebra +%{_bindir}/ogrmerge +%{_bindir}/pct2rgb +%{_bindir}/rgb2pct %{_datadir}/bash-completion/completions/* %exclude %{_datadir}/bash-completion/completions/*.py %{_mandir}/man1/* @@ -439,8 +470,8 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %files libs %license LICENSE.TXT %doc NEWS.md PROVENANCE.TXT COMMITTERS -%{_libdir}/libgdal.so.33 -%{_libdir}/libgdal.so.33.* +%{_libdir}/libgdal.so.36 +%{_libdir}/libgdal.so.36.* %{_datadir}/%{name}/ %{_libdir}/gdalplugins/ @@ -456,7 +487,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %if %{with mingw} %files -n mingw32-%{name} %license LICENSE.TXT -%{mingw32_bindir}/libgdal-33.dll +%{mingw32_bindir}/libgdal-36.dll %{mingw32_bindir}/gdal-config %{mingw32_libdir}/libgdal.dll.a %{mingw32_libdir}/cmake/gdal/ @@ -469,7 +500,7 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %files -n mingw64-%{name} %license LICENSE.TXT -%{mingw64_bindir}/libgdal-33.dll +%{mingw64_bindir}/libgdal-36.dll %{mingw64_bindir}/gdal-config %{mingw64_libdir}/libgdal.dll.a %{mingw64_libdir}/cmake/gdal/ @@ -537,5 +568,8 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config %changelog +* Thu Aug 07 2025 wenxin - 3.10.3-1 +- Update to 3.10.3 + * Fri Jun 16 2023 forrest_ly - 3.7.0-1 - init for anolis 23 diff --git a/gdal_incompatible-pointer-types.patch b/gdal_incompatible-pointer-types.patch new file mode 100644 index 0000000000000000000000000000000000000000..f70e12e1e2e8e8e45d847f4d6cefd1217588c1b5 --- /dev/null +++ b/gdal_incompatible-pointer-types.patch @@ -0,0 +1,21 @@ +diff -rupN --no-dereference gdal-3.10.3-fedora/port/cpl_vsil_win32.cpp gdal-3.10.3-fedora-new/port/cpl_vsil_win32.cpp +--- gdal-3.10.3-fedora/port/cpl_vsil_win32.cpp 2025-04-01 13:03:22.000000000 +0200 ++++ gdal-3.10.3-fedora-new/port/cpl_vsil_win32.cpp 2025-04-07 13:39:47.318116680 +0200 +@@ -896,7 +896,7 @@ int VSIWin32FilesystemHandler::Stat(cons + pwszFilename[nLen - 1] = 0; + #endif + +- int nResult = _wstat64(pwszFilename, pStatBuf); ++ int nResult = _wstat64(pwszFilename, reinterpret_cast(pStatBuf)); + + // If _wstat64() fails and the original name is not an extended one, + // then retry with an extended filename +@@ -907,7 +907,7 @@ int VSIWin32FilesystemHandler::Stat(cons + nLastError == ERROR_FILENAME_EXCED_RANGE) + { + VSIWin32TryLongFilename(pwszFilename); +- nResult = _wstat64(pwszFilename, pStatBuf); ++ nResult = _wstat64(pwszFilename, reinterpret_cast(pStatBuf)); + } + } + diff --git a/gdal_utils.patch b/gdal_utils.patch index 686f61b5c482cdf2b7d1399234071fad51c8bef1..3128ebaf11ef734bb97a8c3c4741a533f2ad6802 100644 --- a/gdal_utils.patch +++ b/gdal_utils.patch @@ -1,39 +1,37 @@ -diff -rupN --no-dereference gdal-3.6.4-fedora/frmts/iso8211/CMakeLists.txt gdal-3.6.4-fedora-new/frmts/iso8211/CMakeLists.txt ---- gdal-3.6.4-fedora/frmts/iso8211/CMakeLists.txt 2023-04-17 13:50:19.000000000 +0200 -+++ gdal-3.6.4-fedora-new/frmts/iso8211/CMakeLists.txt 2023-04-22 14:48:30.133740745 +0200 -@@ -15,15 +15,18 @@ gdal_standard_includes(gdal_iso8211) +diff -rupN --no-dereference gdal-3.10.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.10.3-fedora-new/frmts/iso8211/CMakeLists.txt +--- gdal-3.10.3-fedora/frmts/iso8211/CMakeLists.txt 2025-04-01 13:03:21.000000000 +0200 ++++ gdal-3.10.3-fedora-new/frmts/iso8211/CMakeLists.txt 2025-04-07 13:39:46.951980413 +0200 +@@ -14,14 +14,17 @@ target_sources(${GDAL_LIB_TARGET_NAME} P + 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_link_libraries(8211dump PRIVATE $ gdal_iso8211) -+ install(TARGETS 8211dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +-add_executable(8211dump EXCLUDE_FROM_ALL 8211dump.cpp) ++add_executable(8211dump 8211dump.cpp) + target_include_directories(8211dump PRIVATE $) + target_link_libraries(8211dump PRIVATE $ 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_link_libraries(8211view PRIVATE $ 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_link_libraries(8211view PRIVATE $ 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_link_libraries(8211createfromxml PRIVATE $ gdal_iso8211) -+ install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif () -diff -rupN --no-dereference gdal-3.6.4-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.6.4-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt ---- gdal-3.6.4-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-04-17 13:50:19.000000000 +0200 -+++ gdal-3.6.4-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-04-22 14:48:30.134740600 +0200 -@@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA - gdal_standard_includes(ogr_S57) +-add_executable(8211createfromxml EXCLUDE_FROM_ALL 8211createfromxml.cpp) ++add_executable(8211createfromxml 8211createfromxml.cpp) + target_include_directories(8211createfromxml PRIVATE $) + target_link_libraries(8211createfromxml PRIVATE $ gdal_iso8211) ++install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) +diff -rupN --no-dereference gdal-3.10.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt +--- gdal-3.10.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-04-01 13:03:22.000000000 +0200 ++++ gdal-3.10.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2025-04-07 13:39:46.952461833 +0200 +@@ -27,7 +27,8 @@ set_property( + APPEND + PROPERTY RESOURCE "${GDAL_DATA_FILES}") - 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_link_libraries(s57dump PRIVATE $ ogr_S57 gdal_iso8211) -+ install(TARGETS s57dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) - endif () +-add_executable(s57dump EXCLUDE_FROM_ALL s57dump.cpp) ++add_executable(s57dump s57dump.cpp) + gdal_standard_includes(s57dump) + target_include_directories(s57dump PRIVATE $) + target_link_libraries(s57dump PRIVATE $ ogr_S57 gdal_iso8211) ++install(TARGETS s57dump RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) diff --git a/gdalautotest-3.7.0.tar.gz b/gdalautotest-3.10.3.tar.gz similarity index 56% rename from gdalautotest-3.7.0.tar.gz rename to gdalautotest-3.10.3.tar.gz index d21eddd13480e9e00705a89eb56fdd9b646581c9..aa19ca561c3bd60fdcfba0346934599667c01805 100644 Binary files a/gdalautotest-3.7.0.tar.gz and b/gdalautotest-3.10.3.tar.gz differ