Update gdal_jasper.patch

Fix build against jasper 2.0.22
rebuild for armadillo 10
2021-01-15 19:43:50 +01:00 · 2021-01-15 11:46:36 +01:00 · 2021-01-06 09:26:59 +00:00
13 changed files with 606 additions and 1385 deletions
--- a/.gitignore
+++ b/.gitignore
@ -43,101 +43,3 @@ gdalautotest-1.7.0.tar.gz
 /gdal-2.3.2-fedora.tar.xz
 /gdalautotest-3.0.1.zip
 /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
-/gdal-3.5.3-fedora.tar.xz
-/gdalautotest-3.5.3.tar.gz
-/gdal-3.6.0-fedora.tar.xz
-/gdalautotest-3.6.0.tar.gz
-/gdalautotest-3.6.1.tar.gz
-/gdal-3.6.1.tar.xz
-/gdal-3.6.1-fedora.tar.xz
-/gdal-3.6.2-fedora.tar.xz
-/gdalautotest-3.6.2.tar.gz
-/gdal-3.6.3-fedora.tar.xz
-/gdalautotest-3.6.3.tar.gz
-/gdal-3.6.4-fedora.tar.xz
-/gdalautotest-3.6.4.tar.gz
-/gdal-3.7.0-fedora.tar.xz
-/gdalautotest-3.7.0.tar.gz
-/gdal-3.7.1-fedora.tar.xz
-/gdalautotest-3.7.1.tar.gz
-/gdal-3.7.2-fedora.tar.xz
-/gdalautotest-3.7.2.tar.gz
-/gdal-3.7.3-fedora.tar.xz
-/gdalautotest-3.7.3.tar.gz
-/gdal-3.8.0-fedora.tar.xz
-/gdalautotest-3.8.0.tar.gz
-/gdal-3.8.1-fedora.tar.xz
-/gdalautotest-3.8.1.tar.gz
-/gdal-3.8.2-fedora.tar.xz
-/gdalautotest-3.8.2.tar.gz
-/gdal-3.8.3-fedora.tar.xz
-/gdalautotest-3.8.3.tar.gz
-/gdal-3.8.4-fedora.tar.xz
-/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
--- a/cpl-config.h
+++ b/cpl-config.h
@ -1,11 +0,0 @@
-#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
--- a/gdal-1.9.0-java.patch
+++ b/gdal-1.9.0-java.patch
@ -0,0 +1,11 @@
+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
+ 
+ 
--- a/gdal-cleaner.sh
+++ b/gdal-cleaner.sh
@ -1,38 +1,22 @@
 #!/bin/bash
-set -e
+VERSION="3.0.4"

-if [ $# -lt 1 ]; then
-	echo "Usage: $0 version pre"
-	exit 1
-fi
+tar xvf gdal-"${VERSION}".tar.xz

-VERSION="$1"
-PRE="$2"
+mv gdal-"${VERSION}"{,-fedora} && pushd gdal-"${VERSION}"-fedora

-if [ ! -f "gdal-"${VERSION}${PRE}".tar.xz" ]; then
-    wget https://download.osgeo.org/gdal/${VERSION}/gdal-${VERSION}${PRE}.tar.xz
-fi
+rm data/cubewerx_extra.wkt
+rm data/esri_extra.wkt
+rm data/esri_Wisconsin_extra.wkt
+rm data/esri_StatePlane_extra.wkt
+rm data/ecw_cs.wkt

-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}${PRE}"{,-fedora} && pushd gdal-"${VERSION}${PRE}"-fedora
-
-rm ogr/data/cubewerx_extra.wkt
-rm ogr/data/esri_StatePlane_extra.wkt
-rm ogr/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
+#Really necessary?
+rm -r swig/php

 popd


 #TODO: Insert Provenance file

-tar cvfJ gdal-"${VERSION}${PRE}"-fedora.tar.xz gdal-"${VERSION}${PRE}"-fedora
+tar cvfJ gdal-"${VERSION}"-fedora.tar.xz gdal-"${VERSION}"-fedora
--- a/gdal-completion.patch
+++ b/gdal-completion.patch
@ -0,0 +1,12 @@
+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
--- a/11
+++ b/11
@ -1,11 +0,0 @@
-#!/bin/bash
-
-ARCH=$(uname -m)
-case $ARCH in
-x86_64 | ppc64 | ppc64le | ia64 | s390x | sparc64 | alpha | alphaev6 | aarch64 | riscv64 )
-gdal-config-64 ${*}
-;;
-*)
-gdal-config-32 ${*}
-;;
-esac
--- a/gdal.spec
+++ b/gdal.spec
--- a/gdal_installapps.patch
+++ b/gdal_installapps.patch
@ -0,0 +1,11 @@
+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
+ 
--- a/gdal_iso8211.patch
+++ b/gdal_iso8211.patch
@ -0,0 +1,13 @@
+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)
--- a/gdal_jasper.patch
+++ b/gdal_jasper.patch
@ -0,0 +1,31 @@
+diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/jpeg2000/jpeg2000dataset.cpp gdal-3.0.4-fedora-new/frmts/jpeg2000/jpeg2000dataset.cpp
+--- gdal-3.0.4-fedora/frmts/jpeg2000/jpeg2000dataset.cpp	2020-01-28 11:17:22.000000000 +0100
+++ gdal-3.0.4-fedora-new/frmts/jpeg2000/jpeg2000dataset.cpp	2021-01-15 11:45:46.293701348 +0100
+@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDAL
+ 
+ {
+     int         iFormat;
+-    char        *pszFormatName = nullptr;
+    const char        *pszFormatName = nullptr;
+ 
+     if (!Identify(poOpenInfo))
+         return nullptr;
+diff -rupN --no-dereference gdal-3.0.4-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp gdal-3.0.4-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp
+--- gdal-3.0.4-fedora/frmts/jpeg2000/jpeg2000_vsil_io.cpp	2020-01-28 11:17:22.000000000 +0100
+++ gdal-3.0.4-fedora-new/frmts/jpeg2000/jpeg2000_vsil_io.cpp	2021-01-15 11:45:46.294701417 +0100
+@@ -94,13 +94,13 @@ typedef struct {
+ * File stream object.
+ \******************************************************************************/
+ 
+-static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
+ {
+     jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
+     return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
+ }
+ 
+-static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
+ {
+     jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
+     return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
--- a/gdal_tirpcinc.patch
+++ b/gdal_tirpcinc.patch
@ -0,0 +1,24 @@
+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))
+ 
--- a/gdal_utils.patch
+++ b/gdal_utils.patch
@ -1,37 +0,0 @@
-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)
- 
- # 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})
- 
-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(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})
--- a/4
+++ b/4
@ -1,2 +1,2 @@
-SHA512 (gdal-3.12.1-fedora.tar.xz) = 311005e3f577b09360b2a0bb9f6e3b97668f320a5833fe27753690f9067620460b1317ba615c7e59c01047782507ed7ebadf696ed951b477e4f53d0a4a402fc5
-SHA512 (gdalautotest-3.12.1.zip) = fb54eddf8b34d4bd9d308ec0e7b3b9947e07b4a0615f688daf933668b0faf4fd44c2bc716cce8045433ca894ff5dde60e75acd42d5a4aa5e2999b9fd5cd4d6a5
+SHA512 (gdal-3.0.4-fedora.tar.xz) = f880a763cbf3e846789df4c45a68be11121fdc66252dab126d95b79141589435ef7712ed0efcb7d633643f2c82cde88f9663bb15b624e69f362ed2e10a79a110
+SHA512 (gdalautotest-3.0.4.tar.gz) = d205c6eba1c68ade3cd55b9ae77c9a885f1ff87f6964ea4e71799bc98393ddcf92081a5319afd3d0d9d0cf8862d140eb59ad2ccf7e70a955cad2732f55c28e72
Author	SHA1	Message	Date
Sandro Mani	e1b3cd4abd	Update gdal_jasper.patch	2021-01-15 19:43:50 +01:00
Sandro Mani	299be18f74	Fix build against jasper 2.0.22	2021-01-15 11:46:36 +01:00
José Matos	21cf53fd11	rebuild for armadillo 10	2021-01-06 09:26:59 +00:00