Add gdal package to specs-extended (#6230)
* Adds package gdal * Adds license info * Update cgmanifest * Update license map * Refactor spec file
This commit is contained in:
Родитель
7a79706489
Коммит
aa5a23f030
|
@ -0,0 +1,11 @@
|
|||
#include <bits/wordsize.h>
|
||||
|
||||
#if __WORDSIZE == 32
|
||||
#include "gdal/cpl_config-32.h"
|
||||
#else
|
||||
#if __WORDSIZE == 64
|
||||
#include "gdal/cpl_config-64.h"
|
||||
#else
|
||||
#error "Unknown word size"
|
||||
#endif
|
||||
#endif
|
|
@ -0,0 +1,11 @@
|
|||
#!/bin/bash
|
||||
|
||||
ARCH=$(uname -m)
|
||||
case $ARCH in
|
||||
x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 )
|
||||
gdal-config-64 ${*}
|
||||
;;
|
||||
*)
|
||||
gdal-config-32 ${*}
|
||||
;;
|
||||
esac
|
|
@ -0,0 +1,8 @@
|
|||
{
|
||||
"Signatures": {
|
||||
"cpl-config.h": "a59d47f3092bf0026a982b90a18d9b99c4a089c7651544d398a403947d198b9c",
|
||||
"gdal-3.6.3.tar.gz": "1c271c08b7161227384833ddc24febd8d012a44c6de93a5912051784e3247506",
|
||||
"gdal-config": "696f44e42c98aa369c96418a9ebf497aa854ca9f6a45dfd55e4f231bae7b193f",
|
||||
"gdalautotest-3.6.3.tar.gz": "44299ceae9066d8518441dad729eaf05f6dd996c4dbe4719015a63495860270d"
|
||||
}
|
||||
}
|
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -0,0 +1,39 @@
|
|||
diff -rupN --no-dereference gdal-3.6.3-fedora/frmts/iso8211/CMakeLists.txt gdal-3.6.3-fedora-new/frmts/iso8211/CMakeLists.txt
|
||||
--- gdal-3.6.3-fedora/frmts/iso8211/CMakeLists.txt 2023-03-07 18:14:55.000000000 +0100
|
||||
+++ gdal-3.6.3-fedora-new/frmts/iso8211/CMakeLists.txt 2023-03-14 09:21:05.455845507 +0100
|
||||
@@ -15,15 +15,18 @@ 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_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(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.6.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.6.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
|
||||
--- gdal-3.6.3-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-03-07 18:14:55.000000000 +0100
|
||||
+++ gdal-3.6.3-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2023-03-14 09:21:05.455845507 +0100
|
||||
@@ -17,8 +17,9 @@ target_include_directories(ogr_S57 PRIVA
|
||||
gdal_standard_includes(ogr_S57)
|
||||
|
||||
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 ()
|
Различия файлов скрыты, потому что одна или несколько строк слишком длинны
|
@ -257,6 +257,7 @@
|
|||
"GConf2",
|
||||
"gcovr",
|
||||
"gcr",
|
||||
"gdal",
|
||||
"gdisk",
|
||||
"gdk-pixbuf2",
|
||||
"generic-logos",
|
||||
|
|
|
@ -4165,6 +4165,16 @@
|
|||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "other",
|
||||
"other": {
|
||||
"name": "gdal",
|
||||
"version": "3.6.3",
|
||||
"downloadUrl": "https://github.com/OSGeo/gdal/releases/download/v3.6.3/gdal-3.6.3.tar.gz"
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"component": {
|
||||
"type": "other",
|
||||
|
|
Загрузка…
Ссылка в новой задаче