Merge remote-tracking branch 'up/main' into main-riscv64

Signed-off-by: David Abdurachmanov <davidlt@rivosinc.com>
This commit is contained in:
David Abdurachmanov 2023-12-30 18:41:47 +02:00
commit 7f1dd617a8
Signed by: davidlt
GPG Key ID: 7A5F42FAF91FACC3
4 changed files with 22 additions and 14 deletions

2
.gitignore vendored
View File

@ -106,3 +106,5 @@ gdalautotest-1.7.0.tar.gz
/gdalautotest-3.8.0.tar.gz /gdalautotest-3.8.0.tar.gz
/gdal-3.8.1-fedora.tar.xz /gdal-3.8.1-fedora.tar.xz
/gdalautotest-3.8.1.tar.gz /gdalautotest-3.8.1.tar.gz
/gdal-3.8.2-fedora.tar.xz
/gdalautotest-3.8.2.tar.gz

View File

@ -50,8 +50,8 @@
Name: gdal Name: gdal
Version: 3.8.1 Version: 3.8.2
Release: 1.1.riscv64%{?dist} Release: 2.0.riscv64%{?dist}
Summary: GIS file format library Summary: GIS file format library
License: MIT License: MIT
URL: http://www.gdal.org URL: http://www.gdal.org
@ -572,12 +572,18 @@ cp -a %{SOURCE3} %{buildroot}%{_bindir}/%{name}-config
%changelog %changelog
* Mon Dec 18 2023 David Abdurachmanov <davidlt@rivosinc.com> - 3.8.1-1.1.riscv64 * Sat Dec 30 2023 David Abdurachmanov <davidlt@rivosinc.com> - 3.8.2-2.0.riscv64
- Rebuild for qhull
* Mon Dec 04 2023 David Abdurachmanov <davidlt@rivosinc.com> - 3.8.1-1.0.riscv64
- Add riscv64 to gdal-config - Add riscv64 to gdal-config
* Thu Dec 21 2023 Sandro Mani <manisandro@gmail.com> - 3.8.2-2
- Rebuild (armadillo)
* Wed Dec 20 2023 Sandro Mani <manisandro@gmail.com> - 3.8.2-1
- Update to 3.8.2
* Wed Dec 20 2023 Sandro Mani <manisandro@gmail.com> - 3.8.1-2
- Rebuild (armadillo)
* Thu Nov 30 2023 Sandro Mani <manisandro@gmail.com> - 3.8.1-1 * Thu Nov 30 2023 Sandro Mani <manisandro@gmail.com> - 3.8.1-1
- Update to 3.8.1 - Update to 3.8.1

View File

@ -1,6 +1,6 @@
diff -rupN --no-dereference gdal-3.8.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.8.1-fedora-new/frmts/iso8211/CMakeLists.txt diff -rupN --no-dereference gdal-3.8.2-fedora/frmts/iso8211/CMakeLists.txt gdal-3.8.2-fedora-new/frmts/iso8211/CMakeLists.txt
--- gdal-3.8.1-fedora/frmts/iso8211/CMakeLists.txt 2023-11-28 16:21:30.000000000 +0100 --- gdal-3.8.2-fedora/frmts/iso8211/CMakeLists.txt 2023-12-16 14:40:35.000000000 +0100
+++ gdal-3.8.1-fedora-new/frmts/iso8211/CMakeLists.txt 2023-11-30 21:41:54.822089877 +0100 +++ gdal-3.8.2-fedora-new/frmts/iso8211/CMakeLists.txt 2023-12-20 14:28:50.710321058 +0100
@@ -15,15 +15,18 @@ gdal_standard_includes(gdal_iso8211) @@ -15,15 +15,18 @@ gdal_standard_includes(gdal_iso8211)
# Because linking an OBJECT library # Because linking an OBJECT library
@ -23,9 +23,9 @@ diff -rupN --no-dereference gdal-3.8.1-fedora/frmts/iso8211/CMakeLists.txt gdal-
target_link_libraries(8211createfromxml PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211) target_link_libraries(8211createfromxml PRIVATE $<TARGET_NAME:${GDAL_LIB_TARGET_NAME}> gdal_iso8211)
+ install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) + install(TARGETS 8211createfromxml RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
endif () endif ()
diff -rupN --no-dereference gdal-3.8.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.8.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt diff -rupN --no-dereference gdal-3.8.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.8.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
--- gdal-3.8.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-11-28 16:21:30.000000000 +0100 --- gdal-3.8.2-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-12-16 14:40:35.000000000 +0100
+++ gdal-3.8.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-11-30 21:41:54.822089877 +0100 +++ gdal-3.8.2-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-12-20 14:28:50.717321391 +0100
@@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA @@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA
gdal_standard_includes(ogr_S57) gdal_standard_includes(ogr_S57)

View File

@ -1,2 +1,2 @@
SHA512 (gdal-3.8.1-fedora.tar.xz) = 1e90628c4e5816031bbb92379c283567c6e863775e00e7128d7ceaa4725e9502b6d42e049414c1f4ed21aed7968925b02e9d2e688d48f71c2aa193adbda4282f SHA512 (gdal-3.8.2-fedora.tar.xz) = fbb01257db8a48f1c42d95c05d2a1312ef6a6b730c51fe87fa78b2ec4870e2ef59199d6334ce5034f92ee62de7906a631711151d86d5e370d180331662f4f289
SHA512 (gdalautotest-3.8.1.tar.gz) = fea3a5ff76182427df0af8fb42b7098bd8461854d0ca403445a26e907966fb5c186681cf0b2b8a6486ecefb0a4619d9cf2b3603e7028cb3e3fa496830d94797c SHA512 (gdalautotest-3.8.2.tar.gz) = e1b6f3f4bda081e0fdefd8ae1f02c3c712d55a310c9e474b1e454332965db7ce239d85a40479cde335fba204aabf13aac8076aa10afe9aa3367a0a6b87f2a10e