Compare commits
87 Commits
Author | SHA1 | Date |
---|---|---|
Sandro Mani | 0c0a9d2f7b | |
Sandro Mani | 4bde9e154e | |
Sandro Mani | a625e0934f | |
Sandro Mani | 024ed5a815 | |
Sandro Mani | b39c5fed7c | |
Sandro Mani | 9133862397 | |
Fedora Release Engineering | ab64b86043 | |
Sandro Mani | 7e04f460b2 | |
Sandro Mani | 25e2169437 | |
Python Maint | 66fa4e0505 | |
Jitka Plesnikova | 8ca3f7888d | |
Sandro Mani | 1afc975964 | |
Sandro Mani | ff794792ae | |
Sandro Mani | 51eca1bf7b | |
Sandro Mani | 0232d4b243 | |
Sandro Mani | 74c97a98c3 | |
Sandro Mani | 0b81415efd | |
Sandro Mani | 6ff18a28cc | |
Sandro Mani | dcc248aeef | |
Josef Řídký | 5b7635b54a | |
Jiri | 24b9641de7 | |
Fedora Release Engineering | d2a9bdefc9 | |
Sandro Mani | 35e7c63e8b | |
Sandro Mani | fd018d2f1a | |
Orion Poplawski | 6aeff86eb7 | |
Sandro Mani | 53151cf9ac | |
Sandro Mani | ca7574ff6f | |
Sandro Mani | 1b155f18db | |
Sahana Prasad | 3708118613 | |
Sandro Mani | 3e685b82b4 | |
Orion Poplawski | 2add6bb7cb | |
Sandro Mani | b9037a9bc1 | |
Sandro Mani | 26b8c01dd0 | |
Fedora Release Engineering | b23e54713a | |
Björn Esser | 6379af6307 | |
Sandro Mani | d225d9d53e | |
Python Maint | d4edddc39f | |
Jitka Plesnikova | ec7c5d35ff | |
Sandro Mani | d222a45ad4 | |
Jitka Plesnikova | 3fd9070810 | |
Richard Shaw | 74fa4dd644 | |
Sandro Mani | 9216c1befe | |
Sandro Mani | 4a9546778f | |
Sandro Mani | 95a4909377 | |
Sandro Mani | d3da6379a7 | |
Sandro Mani | df8e45a77b | |
Sandro Mani | 0edd6b096a | |
Elliott Sales de Andrade | cf5488942a | |
Sandro Mani | f4ca21d0d9 | |
Sandro Mani | 05e7db60a2 | |
Sandro Mani | 3e7adbfd88 | |
Pavel Raiskup | 55b5b8a02b | |
Elliott Sales de Andrade | 55f32a4651 | |
Elliott Sales de Andrade | 03bbe34e30 | |
Orion Poplawski | b8d18dc3e5 | |
Sandro Mani | 8970e29c1d | |
Fedora Release Engineering | 16b7b80266 | |
Sandro Mani | 638c0bff66 | |
José Matos | ead8b240e6 | |
Sandro Mani | 38fa95eb78 | |
Tom Stellard | ebee805e37 | |
Timm Bäder | 8cfdc63e75 | |
Sandro Mani | 06a5516507 | |
Sandro Mani | 58a4d06d29 | |
Sandro Mani | 4b2f3f618e | |
Jeff Law | 90905d440c | |
Sandro Mani | f465375f88 | |
Sandro Mani | 8107c2c0ef | |
Sandro Mani | a4d8e114bf | |
Fedora Release Engineering | e7ebba872a | |
Sandro Mani | ddfbc54eb4 | |
Sandro Mani | 84d61b00f4 | |
Orion Poplawski | 3401ae59d5 | |
Jiri | d588d2a7f7 | |
Sandro Mani | 027c7029c0 | |
Jiri | 619901b075 | |
Sandro Mani | cf21b89def | |
Sandro Mani | 7bccf86956 | |
Sandro Mani | db9f8bec75 | |
Sandro Mani | 2cd6c65bdd | |
Sandro Mani | acf712226b | |
Jitka Plesnikova | 167d24a476 | |
Orion Poplawski | d30a0769d4 | |
Jitka Plesnikova | 539576a433 | |
Miro Hrončok | 1f9c557750 | |
Sandro Mani | fb4c3272a4 | |
Markus | 1118824b6a |
|
@ -43,3 +43,41 @@ gdalautotest-1.7.0.tar.gz
|
||||||
/gdal-2.3.2-fedora.tar.xz
|
/gdal-2.3.2-fedora.tar.xz
|
||||||
/gdalautotest-3.0.1.zip
|
/gdalautotest-3.0.1.zip
|
||||||
/gdal-3.0.1-fedora.tar.xz
|
/gdal-3.0.1-fedora.tar.xz
|
||||||
|
/gdal-3.1.0-fedora.tar.xz
|
||||||
|
/gdalautotest-3.1.0.tar.gz
|
||||||
|
/gdal-3.1.1-fedora.tar.xz
|
||||||
|
/gdalautotest-3.1.1.tar.gz
|
||||||
|
/gdal-3.1.2-fedora.tar.xz
|
||||||
|
/gdalautotest-3.1.2.tar.gz
|
||||||
|
/gdal-3.1.3-fedora.tar.xz
|
||||||
|
/gdalautotest-3.1.3.tar.gz
|
||||||
|
/gdal-3.1.4-fedora.tar.xz
|
||||||
|
/gdalautotest-3.1.4.tar.gz
|
||||||
|
/gdalautotest-3.2.0.tar.gz
|
||||||
|
/gdal-3.2.0-fedora.tar.xz
|
||||||
|
/gdal-3.2.1-fedora.tar.xz
|
||||||
|
/gdalautotest-3.2.1.tar.gz
|
||||||
|
/gdalautotest-3.2.2.tar.gz
|
||||||
|
/gdal-3.2.2-fedora.tar.xz
|
||||||
|
/gdalautotest-3.3.0.tar.gz
|
||||||
|
/gdal-3.3.0-fedora.tar.xz
|
||||||
|
/gdal-3.3.1-fedora.tar.xz
|
||||||
|
/gdalautotest-3.3.1.tar.gz
|
||||||
|
/gdal-3.3.2-fedora.tar.xz
|
||||||
|
/gdalautotest-3.3.2.tar.gz
|
||||||
|
/gdal-3.3.3-fedora.tar.xz
|
||||||
|
/gdalautotest-3.3.3.tar.gz
|
||||||
|
/gdal-3.4.0-fedora.tar.xz
|
||||||
|
/gdalautotest-3.4.0.tar.gz
|
||||||
|
/gdal-3.4.1-fedora.tar.xz
|
||||||
|
/gdalautotest-3.4.1.tar.gz
|
||||||
|
/gdal-3.4.2-fedora.tar.xz
|
||||||
|
/gdalautotest-3.4.2.tar.gz
|
||||||
|
/gdal-3.4.3-fedora.tar.xz
|
||||||
|
/gdalautotest-3.4.3.tar.gz
|
||||||
|
/gdalautotest-3.5.0.tar.gz
|
||||||
|
/gdal-3.5.0-fedora.tar.xz
|
||||||
|
/gdalautotest-3.5.1.tar.gz
|
||||||
|
/gdal-3.5.1-fedora.tar.xz
|
||||||
|
/gdal-3.5.2-fedora.tar.xz
|
||||||
|
/gdalautotest-3.5.2.tar.gz
|
||||||
|
|
|
@ -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
|
|
@ -1,11 +0,0 @@
|
||||||
diff -rupN --no-dereference gdal-3.0.4-fedora/swig/java/java.opt gdal-3.0.4-fedora-new/swig/java/java.opt
|
|
||||||
--- gdal-3.0.4-fedora/swig/java/java.opt 2020-01-28 11:13:12.000000000 +0100
|
|
||||||
+++ gdal-3.0.4-fedora-new/swig/java/java.opt 2020-02-06 00:23:36.321286290 +0100
|
|
||||||
@@ -7,6 +7,6 @@ JAVADOC=$(JAVA_HOME)/bin/javadoc
|
|
||||||
JAVAC=$(JAVA_HOME)/bin/javac
|
|
||||||
JAVA=$(JAVA_HOME)/bin/java
|
|
||||||
JAR=$(JAVA_HOME)/bin/jar
|
|
||||||
-JAVA_INCLUDE=-I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
|
|
||||||
+JAVA_INCLUDE=-I/usr/lib/jvm/java/include/ -I/usr/lib/jvm/java/include/linux
|
|
||||||
|
|
||||||
|
|
|
@ -1,22 +1,37 @@
|
||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
VERSION="3.0.4"
|
|
||||||
|
|
||||||
tar xvf gdal-"${VERSION}".tar.xz
|
if [ $# -lt 1 ]; then
|
||||||
|
echo "Usage: $0 version"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
VERSION="$1"
|
||||||
|
PRE="$2"
|
||||||
|
|
||||||
|
if [ ! -f "gdal-"${VERSION}${PRE}".tar.xz" ]; then
|
||||||
|
wget https://download.osgeo.org/gdal/${VERSION}/gdal-${VERSION}${PRE}.tar.xz
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ -d gdal-"${VERSION}" ] || [ -d gdal-"${VERSION}"-fedora ]; then
|
||||||
|
echo "gdal-${VERSION} or gdal-${VERSION}-fedora in the way, please remove and rerun this script"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
tar xvf gdal-"${VERSION}${PRE}".tar.xz
|
||||||
mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora
|
mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora
|
||||||
|
|
||||||
rm data/cubewerx_extra.wkt
|
rm data/cubewerx_extra.wkt
|
||||||
rm data/esri_extra.wkt
|
|
||||||
rm data/esri_Wisconsin_extra.wkt
|
|
||||||
rm data/esri_StatePlane_extra.wkt
|
rm data/esri_StatePlane_extra.wkt
|
||||||
rm data/ecw_cs.wkt
|
rm data/ecw_cs.wkt
|
||||||
|
|
||||||
#Really necessary?
|
|
||||||
rm -r swig/php
|
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
|
popd
|
||||||
|
|
||||||
|
|
||||||
#TODO: Insert Provenance file
|
#TODO: Insert Provenance file
|
||||||
|
|
||||||
tar cvfJ gdal-"${VERSION}"-fedora.tar.xz gdal-"${VERSION}"-fedora
|
tar cvfJ gdal-"${VERSION}${PRE}"-fedora.tar.xz gdal-"${VERSION}"-fedora
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
diff -rupN --no-dereference gdal-3.0.4-fedora/scripts/GNUmakefile gdal-3.0.4-fedora-new/scripts/GNUmakefile
|
|
||||||
--- gdal-3.0.4-fedora/scripts/GNUmakefile 2020-01-28 11:13:13.000000000 +0100
|
|
||||||
+++ gdal-3.0.4-fedora-new/scripts/GNUmakefile 2020-02-06 00:23:36.089287463 +0100
|
|
||||||
@@ -5,6 +5,6 @@ completion:
|
|
||||||
|
|
||||||
install:
|
|
||||||
if test "x`pkg-config --version 2>/dev/null`" != "x" -a "x`pkg-config --variable=compatdir bash-completion`" != "x"; then \
|
|
||||||
- $(INSTALL_DIR) $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion` ; \
|
|
||||||
- cp gdal-bash-completion.sh $(DESTDIR)${prefix}`pkg-config --variable=compatdir bash-completion`; \
|
|
||||||
+ $(INSTALL_DIR) $(DESTDIR)`pkg-config --variable=compatdir bash-completion` ; \
|
|
||||||
+ $(INSTALL_DATA) gdal-bash-completion.sh $(DESTDIR)`pkg-config --variable=compatdir bash-completion`/gdal; \
|
|
||||||
fi
|
|
|
@ -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
|
|
@ -1,11 +0,0 @@
|
||||||
diff -rupN --no-dereference gdal-3.0.4-fedora/apps/GNUmakefile gdal-3.0.4-fedora-new/apps/GNUmakefile
|
|
||||||
--- gdal-3.0.4-fedora/apps/GNUmakefile 2020-01-28 11:13:12.000000000 +0100
|
|
||||||
+++ gdal-3.0.4-fedora-new/apps/GNUmakefile 2020-03-03 23:17:41.032487778 +0100
|
|
||||||
@@ -216,6 +216,7 @@ gdal-config-inst: gdal-config.in ../GDAL
|
|
||||||
|
|
||||||
install: default
|
|
||||||
for f in $(BIN_LIST) ; do $(INSTALL) $$f $(DESTDIR)$(INST_BIN) ; done
|
|
||||||
+ for f in $(BIN_LIST) ; do $(INSTALL) .libs/$$f $(DESTDIR)$(INST_BIN) ; done
|
|
||||||
$(INSTALL_DATA) gdal_utils.h $(DESTDIR)$(INST_INCLUDE)
|
|
||||||
$(INSTALL) gdal-config-inst $(DESTDIR)$(INST_BIN)/gdal-config
|
|
||||||
|
|
|
@ -1,13 +0,0 @@
|
||||||
diff -rupN gdal-3.0.4-fedora/frmts/iso8211/GNUmakefile gdal-3.0.4-fedora-new/frmts/iso8211/GNUmakefile
|
|
||||||
--- gdal-3.0.4-fedora/frmts/iso8211/GNUmakefile 2020-01-28 11:13:11.000000000 +0100
|
|
||||||
+++ gdal-3.0.4-fedora-new/frmts/iso8211/GNUmakefile 2020-02-06 00:24:10.382117696 +0100
|
|
||||||
@@ -23,8 +23,7 @@ dist-clean: clean
|
|
||||||
rm -rf $(DISTDIR)
|
|
||||||
|
|
||||||
$(ISOLIB): $(OBJ:.o=.$(OBJ_EXT))
|
|
||||||
- $(AR) r $(ISOLIB) $?
|
|
||||||
- $(RANLIB) $(ISOLIB)
|
|
||||||
+ $(SHELL) $(top_builddir)/libtool --mode=link gcc -static -o $(ISOLIB) $?
|
|
||||||
|
|
||||||
8211createfromxml$(EXE): 8211createfromxml.$(OBJ_EXT)
|
|
||||||
$(LD) $(LDFLAGS) 8211createfromxml.$(OBJ_EXT) $(CONFIG_LIBS) -o 8211createfromxml$(EXE)
|
|
|
@ -1,24 +0,0 @@
|
||||||
diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/dods/GNUmakefile gdal-3.0.4-fedora-new/frmts/dods/GNUmakefile
|
|
||||||
--- gdal-3.0.4-fedora/frmts/dods/GNUmakefile 2020-01-28 11:13:11.000000000 +0100
|
|
||||||
+++ gdal-3.0.4-fedora-new/frmts/dods/GNUmakefile 2020-02-06 00:23:36.543285168 +0100
|
|
||||||
@@ -4,7 +4,7 @@ include ../../GDALmake.opt
|
|
||||||
|
|
||||||
OBJ = dodsdataset2.o
|
|
||||||
|
|
||||||
-CPPFLAGS := $(CPPFLAGS) $(DODS_INC)
|
|
||||||
+CPPFLAGS := $(CPPFLAGS) $(DODS_INC) -I/usr/include/tirpc
|
|
||||||
|
|
||||||
default: $(OBJ:.o=.$(OBJ_EXT))
|
|
||||||
|
|
||||||
diff -rupN --no-dereference gdal-3.0.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.0.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
|
|
||||||
--- gdal-3.0.4-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-01-28 11:13:11.000000000 +0100
|
|
||||||
+++ gdal-3.0.4-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-02-06 00:23:36.543285168 +0100
|
|
||||||
@@ -5,7 +5,7 @@ include ../../../GDALmake.opt
|
|
||||||
OBJ = ogrdodsdriver.o ogrdodsdatasource.o ogrdodslayer.o \
|
|
||||||
ogrdodssequencelayer.o ogrdodsfielddefn.o ogrdodsgrid.o
|
|
||||||
|
|
||||||
-CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL
|
|
||||||
+CPPFLAGS := -I.. $(CPPFLAGS) $(DODS_INC) -DDO_NOT_USE_DEBUG_BOOL -I/usr/include/tirpc
|
|
||||||
|
|
||||||
default: $(O_OBJ:.o=.$(OBJ_EXT))
|
|
||||||
|
|
|
@ -0,0 +1,39 @@
|
||||||
|
diff -rupN --no-dereference gdal-3.5.1-fedora/frmts/iso8211/CMakeLists.txt gdal-3.5.1-fedora-new/frmts/iso8211/CMakeLists.txt
|
||||||
|
--- gdal-3.5.1-fedora/frmts/iso8211/CMakeLists.txt 2022-06-30 11:26:28.000000000 +0200
|
||||||
|
+++ gdal-3.5.1-fedora-new/frmts/iso8211/CMakeLists.txt 2022-07-06 13:21:14.754014199 +0200
|
||||||
|
@@ -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.5.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt gdal-3.5.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt
|
||||||
|
--- gdal-3.5.1-fedora/ogr/ogrsf_frmts/s57/CMakeLists.txt 2022-06-30 11:26:28.000000000 +0200
|
||||||
|
+++ gdal-3.5.1-fedora-new/ogr/ogrsf_frmts/s57/CMakeLists.txt 2022-07-06 13:21:14.754014199 +0200
|
||||||
|
@@ -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 ()
|
4
sources
4
sources
|
@ -1,2 +1,2 @@
|
||||||
SHA512 (gdal-3.0.4-fedora.tar.xz) = f880a763cbf3e846789df4c45a68be11121fdc66252dab126d95b79141589435ef7712ed0efcb7d633643f2c82cde88f9663bb15b624e69f362ed2e10a79a110
|
SHA512 (gdal-3.5.2-fedora.tar.xz) = ed6f2a5d370bfaed7266937e018abbafc60468c486699681a84be623b1b5ef20781973589f8840553d532b5e4a8a3d1691b7c6ab48a4e5ee714820abbaac391f
|
||||||
SHA512 (gdalautotest-3.0.4.tar.gz) = d205c6eba1c68ade3cd55b9ae77c9a885f1ff87f6964ea4e71799bc98393ddcf92081a5319afd3d0d9d0cf8862d140eb59ad2ccf7e70a955cad2732f55c28e72
|
SHA512 (gdalautotest-3.5.2.tar.gz) = 92017d76dc9523b7e24c50dc54b1b1d8856cb4be8a3c8d4fc23bd8a5abaad46c758d606a743cfc30aa4c74a876f203ae105f7e06b66b2873d06de70c2edd1cc2
|
||||||
|
|
Loading…
Reference in New Issue