[packages/gdal] - started update to 3.10.0
baggins
baggins at pld-linux.org
Fri Dec 6 12:47:13 CET 2024
commit 7d6d8d669622521d188fb76d03cf7b5f163fe830
Author: Jan Rękorajski <baggins at pld-linux.org>
Date: Fri Dec 6 11:50:32 2024 +0100
- started update to 3.10.0
decl.patch | 21 ----
detect_poppler.patch | 26 -----
gcc11.patch | 48 --------
gdal-dds.patch | 14 ---
gdal-libxml2.patch | 22 ----
gdal-pc.patch | 20 ----
gdal-perl.patch | 11 --
gdal-pluginsdir.patch | 38 -------
gdal-poppler.patch | 74 -------------
gdal-rasdaman.patch | 20 ----
gdal.spec | 295 +++++++++++++++-----------------------------------
gdal_tirpcinc.patch | 24 ----
jasper.patch | 128 ----------------------
libx32.patch | 14 ---
14 files changed, 87 insertions(+), 668 deletions(-)
---
diff --git a/gdal.spec b/gdal.spec
index 068794a..f36cdcb 100644
--- a/gdal.spec
+++ b/gdal.spec
@@ -52,25 +52,12 @@
Summary: Geospatial Data Abstraction Library
Summary(pl.UTF-8): Biblioteka abstrakcji danych dotyczących powierzchni Ziemi
Name: gdal
-Version: 3.0.4
-Release: 24
+Version: 3.10.0
+Release: 0.1
License: BSD-like
Group: Libraries
Source0: https://github.com/OSGeo/gdal/releases/download/v%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: c6bbb5caca06e96bd97a32918e0aa9aa
-Patch0: %{name}-perl.patch
-Patch1: %{name}-pc.patch
-Patch2: %{name}-dds.patch
-Patch3: %{name}-rasdaman.patch
-Patch4: %{name}-pluginsdir.patch
-Patch5: libx32.patch
-Patch6: %{name}-poppler.patch
-Patch7: decl.patch
-Patch8: %{name}_tirpcinc.patch
-Patch9: jasper.patch
-Patch10: gcc11.patch
-Patch11: %{name}-libxml2.patch
-Patch12: detect_poppler.patch
+# Source0-md5: 7d199cbd2e95dfb7ccdacd0cd7fb8597
URL: http://www.gdal.org/
# 1.x or 2.x supported
BuildRequires: CharLS-devel
@@ -122,7 +109,6 @@ BuildRequires: ogdi-devel >= 3.1
%{?with_oci:BuildRequires: oracle-instantclient-devel >= 10.0.1}
#BuildRequires: pcidsk-devel > 0.3
BuildRequires: pcre-devel
-BuildRequires: perl-devel
BuildRequires: pkgconfig >= 1:0.21
%{?with_podofo:BuildRequires: podofo-devel}
%{?with_poppler:BuildRequires: poppler-devel >= 0.24}
@@ -139,7 +125,6 @@ BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) >= 2.021
BuildRequires: sed >= 4.0
BuildRequires: sqlite3-devel >= 3.0.0
-BuildRequires: swig-perl
BuildRequires: swig-python >= 1.3
BuildRequires: texlive-dvips
BuildRequires: texlive-latex
@@ -159,6 +144,9 @@ Requires: libtiff >= 4.0
%{?with_openjpeg:Requires: openjpeg2 >= 2.1.0}
Requires: qhull >= 2012
%{?with_xerces:Requires: xerces-c >= 3.1.0}
+Obsoletes: gdal-static < 3.10.0
+Obsoletes: perl-gdal < 3.10.0
+Obsoletes: python-gdal < 3.10.0
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -249,88 +237,45 @@ GDAL static libraries.
%description static -l pl.UTF-8
Statyczne biblioteki GDAL.
-%package -n perl-gdal
-Summary: Perl bindings for GDAL
-Summary(pl.UTF-8): Wiązania Perla do pakietu GDAL
-Group: Development/Languages/Perl
-Requires: %{name} = %{version}-%{release}
-
-%description -n perl-gdal
-Perl bindings for GDAL - Geo::GDAL, Geo::OGR and Geo::OSR modules.
-
-%description -n perl-gdal -l pl.UTF-8
-Wiązania Perla do pakietu GDAL - moduły Geo::GDAL, Geo::OGR, Geo::OSR.
-
-%package -n python-gdal
+%package -n python3-gdal
Summary: GDAL Python module
Summary(pl.UTF-8): Moduł Pythona GDAL
Group: Libraries/Python
Requires: %{name} = %{version}-%{release}
-Requires: python-libs
+Requires: python3-libs
-%description -n python-gdal
+%description -n python3-gdal
GDAL Python module.
-%description -n python-gdal -l pl.UTF-8
+%description -n python3-gdal -l pl.UTF-8
Moduł Pythona GDAL.
%prep
%setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p2
-%patch10 -p2
-%patch11 -p1
-%patch12 -p1
-
-# need to regenerate (old ones don't support perl 5.10)
-%{__rm} swig/perl/{gdal_wrap.cpp,gdalconst_wrap.c,ogr_wrap.cpp,osr_wrap.cpp}
-# our man path
-sed -i -e 's#^mandir=.*##g' configure.ac
-
-%{__rm} -r man
-
-%{__sed} -i -e 's,DODS_INC="-I.*,DODS_INC="$(pkg-config --cflags libdap)",' configure.ac
-
-sed -E -i -e '1s,#!\s*/usr/bin/env\s+python2(\s|$),#!%{__python}\1,' \
- -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python}\1,' \
- -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python}\1,' \
- swig/python/scripts/epsg_tr.py \
- swig/python/scripts/esri2wkt.py \
- swig/python/scripts/gcps2vec.py \
- swig/python/scripts/gcps2wld.py \
- swig/python/scripts/gdal2tiles.py \
- swig/python/scripts/gdal2xyz.py \
- swig/python/scripts/gdal_auth.py \
- swig/python/scripts/gdal_calc.py \
- swig/python/scripts/gdal_edit.py \
- swig/python/scripts/gdal_fillnodata.py \
- swig/python/scripts/gdal_merge.py \
- swig/python/scripts/gdal_pansharpen.py \
- swig/python/scripts/gdal_polygonize.py \
- swig/python/scripts/gdal_proximity.py \
- swig/python/scripts/gdal_retile.py \
- swig/python/scripts/gdal_sieve.py \
- swig/python/scripts/gdalchksum.py \
- swig/python/scripts/gdalcompare.py \
- swig/python/scripts/gdalident.py \
- swig/python/scripts/gdalimport.py \
- swig/python/scripts/gdalmove.py \
- swig/python/scripts/mkgraticule.py \
- swig/python/scripts/ogrmerge.py \
- swig/python/scripts/pct2rgb.py \
- swig/python/scripts/rgb2pct.py
+sed -E -i -e '1s,#!\s*/usr/bin/env\s+python3(\s|$),#!%{__python3}\1,' \
+ -e '1s,#!\s*/usr/bin/env\s+python(\s|$),#!%{__python3}\1,' \
+ -e '1s,#!\s*/usr/bin/python(\s|$),#!%{__python3}\1,' \
+ swig/python/gdal-utils/scripts/gdal2tiles.py \
+ swig/python/gdal-utils/scripts/gdal2xyz.py \
+ swig/python/gdal-utils/scripts/gdal_calc.py \
+ swig/python/gdal-utils/scripts/gdal_edit.py \
+ swig/python/gdal-utils/scripts/gdal_fillnodata.py \
+ swig/python/gdal-utils/scripts/gdal_merge.py \
+ swig/python/gdal-utils/scripts/gdal_pansharpen.py \
+ swig/python/gdal-utils/scripts/gdal_polygonize.py \
+ swig/python/gdal-utils/scripts/gdal_proximity.py \
+ swig/python/gdal-utils/scripts/gdal_retile.py \
+ swig/python/gdal-utils/scripts/gdal_sieve.py \
+ swig/python/gdal-utils/scripts/gdalcompare.py \
+ swig/python/gdal-utils/scripts/gdalmove.py \
+ swig/python/gdal-utils/scripts/ogrmerge.py \
+ swig/python/gdal-utils/scripts/pct2rgb.py \
+ swig/python/gdal-utils/scripts/rgb2pct.py
%build
-cp -f /usr/share/gettext/config.rpath .
+mkdir -p build
+cd build
%if %{with java}
%ifarch %{x8664}
@@ -358,77 +303,57 @@ for jvm_type in server client; do
done
%endif
-%{__libtoolize}
-%{__aclocal} -I m4
-%{__autoconf}
-%{__autoheader}
-%configure \
- PYTHON=%{__python} \
- --includedir=%{_includedir}/gdal \
- --datadir=%{_datadir}/gdal \
- --with-dods-root=/usr \
- %{?with_armadillo:--with-armadillo} \
- %{?with_crnlib:--with-dds} \
- %{?with_epsilon:--with-epsilon} \
- %{?with_grass:--with-grass} \
- %{!?with_gta:--without-gta} \
- --with-hide-internal-symbols \
- %{?with_java:--with-java=%{java_home}} \
- --with-liblzma \
- %{!?with_kea:--without-kea} \
- %{?with_java:--with-mdb --with-jvm-lib-add-rpath --with-jvm-lib="$jvm_lib"} \
- %{?with_mysql:--with-mysql} \
- %{?with_oci:--with-oci --with-oci-include=/usr/include/oracle/client --with-oci-lib=%{_libdir}} \
- %{?with_opencl:--with-opencl} \
- --with-perl \
- %{?with_podofo:--with-podofo} \
- %{?with_poppler:--with-poppler} \
- --with-python \
- %{?with_rasdaman:--with-rasdaman=%{_libdir}/rasdaman} \
- %{?with_fyba:--with-sosi} \
- %{?with_spatialite:--with-spatialite} \
- --with-sqlite3 \
- --with-webp \
- %{?with_xerces:--with-xerces} \
- --with-xerces-inc=/usr/include \
- --with-xerces-lib="-lxerces-c" \
- --without-libgrass
-# --with-pcidsk=/usr (needs > 0.3)
-# csharp builds, but has no configure option nor install target
-
-# regenerate where needed
-%{__make} -j1 -C swig/perl generate
-
-%{__make} \
- CFLAGS="%{rpmcflags}" \
- CXXFLAGS="%{rpmcxxflags} -std=c++20" \
- %{?with_grass:GRASS_INCLUDE="-I/usr/include/grass64"} \
- %{?with_fyba:SOSI_INC="-I/usr/include/fyba"}
-
-%{__make} -j1 docs
-
-%{__make} -j1 man
+%cmake ../ \
+ -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{_includedir}/gdal
+
+# PYTHON=%{__python3} \
+# --includedir=%{_includedir}/gdal \
+# --datadir=%{_datadir}/gdal \
+# --with-dods-root=/usr \
+# %{?with_armadillo:--with-armadillo} \
+# %{?with_crnlib:--with-dds} \
+# %{?with_epsilon:--with-epsilon} \
+# %{?with_grass:--with-grass} \
+# %{!?with_gta:--without-gta} \
+# --with-hide-internal-symbols \
+# %{?with_java:--with-java=%{java_home}} \
+# --with-liblzma \
+# %{!?with_kea:--without-kea} \
+# %{?with_java:--with-mdb --with-jvm-lib-add-rpath --with-jvm-lib="$jvm_lib"} \
+# %{?with_mysql:--with-mysql} \
+# %{?with_oci:--with-oci --with-oci-include=/usr/include/oracle/client --with-oci-lib=%{_libdir}} \
+# %{?with_opencl:--with-opencl} \
+# --with-perl \
+# %{?with_podofo:--with-podofo} \
+# %{?with_poppler:--with-poppler} \
+# --with-python \
+# %{?with_rasdaman:--with-rasdaman=%{_libdir}/rasdaman} \
+# %{?with_fyba:--with-sosi} \
+# %{?with_spatialite:--with-spatialite} \
+# --with-sqlite3 \
+# --with-webp \
+# %{?with_xerces:--with-xerces} \
+# --with-xerces-inc=/usr/include \
+# --with-xerces-lib="-lxerces-c" \
+# --without-libgrass
+## --with-pcidsk=/usr (needs > 0.3)
+## csharp builds, but has no configure option nor install target
+
+%{__make}
+# %{?with_grass:GRASS_INCLUDE="-I/usr/include/grass64"} \
+# %{?with_fyba:SOSI_INC="-I/usr/include/fyba"}
%install
rm -rf $RPM_BUILD_ROOT
-%{__make} -j1 install install-man \
+%{__make} -C build install \
DESTDIR=$RPM_BUILD_ROOT
# TODO: remove libgdal.la when gdal.pc gets maintained Requires.private/Libs.private list
-rm -rf _html
-cp -a html _html
-
-%py_comp $RPM_BUILD_ROOT%{py_sitedir}
-%py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
-%py_postclean
-
-%{__rm} $RPM_BUILD_ROOT%{perl_archlib}/perllocal.pod
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Geo/GDAL/.packlist
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Geo/GDAL/Const/.packlist
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Geo/OGR/.packlist
-%{__rm} $RPM_BUILD_ROOT%{perl_vendorarch}/auto/Geo/OSR/.packlist
+#py_comp $RPM_BUILD_ROOT%{py_sitedir}
+#py_ocomp $RPM_BUILD_ROOT%{py_sitedir}
+#py_postclean
%clean
rm -rf $RPM_BUILD_ROOT
@@ -438,18 +363,12 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
-%doc NEWS PROVENANCE.TXT
-%attr(755,root,root) %{_bindir}/epsg_tr.py
-%attr(755,root,root) %{_bindir}/esri2wkt.py
-%attr(755,root,root) %{_bindir}/gcps2vec.py
-%attr(755,root,root) %{_bindir}/gcps2wld.py
+%doc NEWS.md PROVENANCE.TXT
%attr(755,root,root) %{_bindir}/gdal2tiles.py
%attr(755,root,root) %{_bindir}/gdal2xyz.py
%attr(755,root,root) %{_bindir}/gdaladdo
-%attr(755,root,root) %{_bindir}/gdal_auth.py
%attr(755,root,root) %{_bindir}/gdalbuildvrt
%attr(755,root,root) %{_bindir}/gdal_calc.py
-%attr(755,root,root) %{_bindir}/gdalchksum.py
%attr(755,root,root) %{_bindir}/gdalcompare.py
%attr(755,root,root) %{_bindir}/gdal_contour
%attr(755,root,root) %{_bindir}/gdaldem
@@ -457,8 +376,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/gdalenhance
%attr(755,root,root) %{_bindir}/gdal_fillnodata.py
%attr(755,root,root) %{_bindir}/gdal_grid
-%attr(755,root,root) %{_bindir}/gdalident.py
-%attr(755,root,root) %{_bindir}/gdalimport.py
%attr(755,root,root) %{_bindir}/gdalinfo
%attr(755,root,root) %{_bindir}/gdallocationinfo
%attr(755,root,root) %{_bindir}/gdalmanage
@@ -469,7 +386,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/gdal_proximity.py
%attr(755,root,root) %{_bindir}/gdal_rasterize
%attr(755,root,root) %{_bindir}/gdal_retile.py
-%attr(755,root,root) %{_bindir}/gdalserver
%attr(755,root,root) %{_bindir}/gdal_sieve.py
%attr(755,root,root) %{_bindir}/gdalsrsinfo
%attr(755,root,root) %{_bindir}/gdaltindex
@@ -478,7 +394,6 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/gdalwarp
%attr(755,root,root) %{_bindir}/gnmanalyse
%attr(755,root,root) %{_bindir}/gnmmanage
-%attr(755,root,root) %{_bindir}/mkgraticule.py
%attr(755,root,root) %{_bindir}/nearblack
%attr(755,root,root) %{_bindir}/ogr2ogr
%attr(755,root,root) %{_bindir}/ogrinfo
@@ -487,9 +402,8 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/ogrtindex
%attr(755,root,root) %{_bindir}/pct2rgb.py
%attr(755,root,root) %{_bindir}/rgb2pct.py
-%attr(755,root,root) %{_bindir}/testepsg
%attr(755,root,root) %{_libdir}/libgdal.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libgdal.so.26
+%attr(755,root,root) %ghost %{_libdir}/libgdal.so.36
%dir %{_libdir}/gdalplugins
%{_datadir}/gdal
%{_mandir}/man1/gdal2tiles.1*
@@ -505,7 +419,6 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/gdal_retile.1*
%{_mandir}/man1/gdal_sieve.1*
%{_mandir}/man1/gdal_translate.1*
-%{_mandir}/man1/gdal_utilities.1*
%{_mandir}/man1/gdaladdo.1*
%{_mandir}/man1/gdalbuildvrt.1*
%{_mandir}/man1/gdalcompare.1*
@@ -520,67 +433,33 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/gdalwarp.1*
%{_mandir}/man1/nearblack.1*
%{_mandir}/man1/ogr2ogr.1*
-%{_mandir}/man1/ogr_utilities.1*
%{_mandir}/man1/ogrinfo.1*
%{_mandir}/man1/ogrlineref.1*
%{_mandir}/man1/ogrtindex.1*
%{_mandir}/man1/pct2rgb.1*
%{_mandir}/man1/rgb2pct.1*
%{_mandir}/man1/gdal_pansharpen.1*
-%{_mandir}/man1/gnm_utilities.1*
%{_mandir}/man1/gnmanalyse.1*
%{_mandir}/man1/gnmmanage.1*
%{_mandir}/man1/ogrmerge.1*
%files devel
%defattr(644,root,root,755)
-%doc _html/*
%attr(755,root,root) %{_bindir}/gdal-config
%attr(755,root,root) %{_libdir}/libgdal.so
-%{_libdir}/libgdal.la
%{_pkgconfigdir}/gdal.pc
%{_includedir}/gdal
%{_mandir}/man1/gdal-config.1*
-%files static
-%defattr(644,root,root,755)
-%{_libdir}/libgdal.a
-
-%files -n perl-gdal
-%defattr(644,root,root,755)
-%dir %{perl_vendorarch}/Geo
-%{perl_vendorarch}/Geo/GDAL.pm
-%dir %{perl_vendorarch}/Geo/GDAL
-%{perl_vendorarch}/Geo/GDAL/Const.pm
-%{perl_vendorarch}/Geo/OGR.pm
-%{perl_vendorarch}/Geo/OSR.pm
-%dir %{perl_vendorarch}/auto/Geo
-%dir %{perl_vendorarch}/auto/Geo/GDAL
-%attr(755,root,root) %{perl_vendorarch}/auto/Geo/GDAL/GDAL.so
-%dir %{perl_vendorarch}/auto/Geo/GDAL/Const
-%attr(755,root,root) %{perl_vendorarch}/auto/Geo/GDAL/Const/Const.so
-%dir %{perl_vendorarch}/auto/Geo/GNM
-%attr(755,root,root) %{perl_vendorarch}/auto/Geo/GNM/GNM.so
-%dir %{perl_vendorarch}/auto/Geo/OGR
-%attr(755,root,root) %{perl_vendorarch}/auto/Geo/OGR/OGR.so
-%dir %{perl_vendorarch}/auto/Geo/OSR
-%attr(755,root,root) %{perl_vendorarch}/auto/Geo/OSR/OSR.so
-%{_mandir}/man3/Geo::GDAL.3pm*
-%{perl_vendorarch}/Geo/GNM.pm
-
-%files -n python-gdal
+%files -n python3-gdal
%defattr(644,root,root,755)
-%{py_sitedir}/gdal.py[co]
-%{py_sitedir}/gdalconst.py[co]
-%{py_sitedir}/gdalnumeric.py[co]
-%{py_sitedir}/ogr.py[co]
-%{py_sitedir}/osr.py[co]
-%{py_sitedir}/GDAL-*.egg-info
-%dir %{py_sitedir}/osgeo
-%attr(755,root,root) %{py_sitedir}/osgeo/_gdal.so
-%attr(755,root,root) %{py_sitedir}/osgeo/_gdal_array.so
-%attr(755,root,root) %{py_sitedir}/osgeo/_gdalconst.so
-%attr(755,root,root) %{py_sitedir}/osgeo/_gnm.so
-%attr(755,root,root) %{py_sitedir}/osgeo/_ogr.so
-%attr(755,root,root) %{py_sitedir}/osgeo/_osr.so
-%{py_sitedir}/osgeo/*.py[co]
+%{py3_sitedir}/GDAL-*.egg-info
+%dir %{py3_sitedir}/osgeo
+%attr(755,root,root) %{py3_sitedir}/osgeo/_gdal.*.so
+%attr(755,root,root) %{py3_sitedir}/osgeo/_gdal_array.*.so
+%attr(755,root,root) %{py3_sitedir}/osgeo/_gdalconst.*.so
+%attr(755,root,root) %{py3_sitedir}/osgeo/_gnm.*.so
+%attr(755,root,root) %{py3_sitedir}/osgeo/_ogr.*.so
+%attr(755,root,root) %{py3_sitedir}/osgeo/_osr.*.so
+%{py3_sitedir}/osgeo/*.py
+%{py3_sitedir}/osgeo_utils/*.py
diff --git a/decl.patch b/decl.patch
deleted file mode 100644
index 56cc315..0000000
--- a/decl.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- gdal-3.0.1/gcore/rasterio.cpp~ 2019-06-28 12:58:14.000000000 +0200
-+++ gdal-3.0.1/gcore/rasterio.cpp 2019-10-30 10:08:18.083471282 +0100
-@@ -2872,15 +2872,15 @@
-
- void GDALUnrolledCopy_GByte_2_1_SSSE3( GByte* CPL_RESTRICT pDest,
- const GByte* CPL_RESTRICT pSrc,
-- GPtrDiff_t nIters );
-+ GInt64 nIters );
-
- void GDALUnrolledCopy_GByte_3_1_SSSE3( GByte* CPL_RESTRICT pDest,
- const GByte* CPL_RESTRICT pSrc,
-- GPtrDiff_t nIters );
-+ GInt64 nIters );
-
- void GDALUnrolledCopy_GByte_4_1_SSSE3( GByte* CPL_RESTRICT pDest,
- const GByte* CPL_RESTRICT pSrc,
-- GPtrDiff_t nIters );
-+ GInt64 nIters );
- #endif
-
-
diff --git a/detect_poppler.patch b/detect_poppler.patch
deleted file mode 100644
index 9ee568e..0000000
--- a/detect_poppler.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- gdal-3.0.4/configure~ 2024-08-23 21:21:42.948960702 +0000
-+++ gdal-3.0.4/configure 2024-08-23 21:39:24.818460350 +0000
-@@ -43438,8 +43438,8 @@
- fi
- if test "$POPPLER_VERSION" != ""; then
- HAVE_POPPLER=yes
-- POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([0-9]*\)'`
-- POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[0-9]*\.\([0-9]*\)'`
-+ POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1`
-+ POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'`
- POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"`
- fi
- else
---- gdal-3.0.4/configure.ac~ 2024-08-23 21:21:41.218936948 +0000
-+++ gdal-3.0.4/configure.ac 2024-08-23 21:40:31.555371878 +0000
-@@ -4881,8 +4881,8 @@
- [POPPLER_VERSION=`$PKG_CONFIG --modversion poppler`], [POPPLER_VERSION=])
- if test "$POPPLER_VERSION" != ""; then
- HAVE_POPPLER=yes
-- POPPLER_MAJOR_VERSION=`expr $POPPLER_VERSION : '\([[0-9]]*\)'`
-- POPPLER_MINOR_VERSION=`expr $POPPLER_VERSION : '[[0-9]]*\.\([[0-9]]*\)'`
-+ POPPLER_MAJOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f1`
-+ POPPLER_MINOR_VERSION=`echo $POPPLER_VERSION | cut -d'.' -f2 | sed -e 's/^0//'`
- POPPLER_CFLAGS=`echo $POPPLER_CFLAGS $POPPLER_CFLAGS | sed "s/include\/poppler/include/"`
- fi
- else
diff --git a/gcc11.patch b/gcc11.patch
deleted file mode 100644
index 0f87318..0000000
--- a/gcc11.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From 7a18e2669a733ebe3544e4f5c735fd4d2ded5fa3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Timm=20B=C3=A4der?= <tbaeder at redhat.com>
-Date: Thu, 10 Dec 2020 14:02:44 +0100
-Subject: [PATCH] Add some missing <limits> includes
-
-Otherwise, the builds fails with either gcc11 or recent clang.
----
- gdal/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp | 1 +
- gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp | 1 +
- gdal/third_party/LercLib/Lerc2.h | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp b/gdal/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
-index f59f7d50e2f5..edff5100e1f4 100644
---- a/gdal/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
-+++ b/gdal/ogr/ogrsf_frmts/cad/libopencad/cadobjects.cpp
-@@ -31,6 +31,7 @@
-
- #include "cadobjects.h"
-
-+#include <limits>
- #include <math.h>
- #include <algorithm>
-
-diff --git a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp b/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-index 83951fd7e7fc..6ae837da6467 100644
---- a/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-+++ b/gdal/ogr/ogrsf_frmts/cad/libopencad/dwg/r2000.cpp
-@@ -36,6 +36,7 @@
- #include <cassert>
- #include <cstring>
- #include <iostream>
-+#include <limits>
- #include <memory>
- #include <string>
-
-diff --git a/gdal/third_party/LercLib/Lerc2.h b/gdal/third_party/LercLib/Lerc2.h
-index feec95529c83..564f928ee672 100644
---- a/gdal/third_party/LercLib/Lerc2.h
-+++ b/gdal/third_party/LercLib/Lerc2.h
-@@ -27,6 +27,7 @@ Contributors: Thomas Maurer
- #include <algorithm>
- #include <cfloat>
- #include <cmath>
-+#include <limits>
- #include <string>
- #include <typeinfo>
- #include "Defines.h"
diff --git a/gdal-dds.patch b/gdal-dds.patch
deleted file mode 100644
index c8c31f7..0000000
--- a/gdal-dds.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gdal-1.11.0/configure.ac.orig 2014-05-18 11:22:22.873992206 +0200
-+++ gdal-1.11.0/configure.ac 2014-05-18 12:20:58.637252259 +0200
-@@ -941,6 +941,11 @@
-
- echo "dds support disabled."
-
-+elif test "$with_dds" = "yes"; then
-+ DDS_SETTING=yes
-+ CRUNCHDIR="/usr"
-+ LIBS="-lcrunch $LIBS"
-+ echo "using libcrunch in default location."
- else
-
- DDS_SETTING=yes
diff --git a/gdal-libxml2.patch b/gdal-libxml2.patch
deleted file mode 100644
index 8c22f63..0000000
--- a/gdal-libxml2.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gdal-3.0.4/port/cpl_xml_validate.cpp.orig 2020-01-28 11:18:54.000000000 +0100
-+++ gdal-3.0.4/port/cpl_xml_validate.cpp 2024-06-19 06:20:46.477418699 +0200
-@@ -920,7 +920,7 @@ static void CPLLibXMLWarningErrorCallbac
-
- if( strstr(pszStr, "since this namespace was already imported") == nullptr )
- {
-- xmlErrorPtr pErrorPtr = xmlGetLastError();
-+ const xmlError* pErrorPtr = xmlGetLastError();
- const char* pszFilename = static_cast<char *>(ctx);
- char* pszStrDup = CPLStrdup(pszStr);
- int nLen = static_cast<int>(strlen(pszStrDup));
---- gdal-3.0.4/gcore/gdaljp2metadatagenerator.cpp.orig 2020-01-28 11:18:45.000000000 +0100
-+++ gdal-3.0.4/gcore/gdaljp2metadatagenerator.cpp 2024-06-19 06:20:34.962346526 +0200
-@@ -335,7 +335,7 @@ static CPLString GDALGMLJP2EvalExpr(cons
- /************************************************************************/
-
- static void GDALGMLJP2XPathErrorHandler( void * /* userData */,
-- xmlErrorPtr error)
-+ const xmlError *error)
- {
- if( error->domain == XML_FROM_XPATH &&
- error->str1 != nullptr &&
diff --git a/gdal-pc.patch b/gdal-pc.patch
deleted file mode 100644
index 75d1044..0000000
--- a/gdal-pc.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gdal-2.4.0/GNUmakefile.orig 2018-12-14 22:34:19.000000000 +0100
-+++ gdal-2.4.0/GNUmakefile 2018-12-29 19:15:29.433390410 +0100
-@@ -314,6 +314,7 @@
- rm -f gdal.pc
- echo 'CONFIG_VERSION='`cat ./VERSION`'' >> gdal.pc
- echo 'CONFIG_INST_PREFIX=$(INST_PREFIX)' >> gdal.pc
-+ echo 'CONFIG_INST_LIBDIR=$(INST_LIB)' >> gdal.pc
- echo 'CONFIG_INST_LIBS=$(CONFIG_LIBS_INS)' >> gdal.pc
- echo 'CONFIG_INST_CFLAGS=-I$(INST_INCLUDE)' >> gdal.pc
- echo 'CONFIG_INST_DATA=$(INST_DATA)' >> gdal.pc
---- gdal-2.4.0/gdal.pc.in.orig 2018-12-14 22:34:20.000000000 +0100
-+++ gdal-2.4.0/gdal.pc.in 2018-12-29 19:15:47.330056870 +0100
-@@ -1,6 +1,6 @@
- prefix=${CONFIG_INST_PREFIX}
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=${CONFIG_INST_LIBDIR}
- includedir=${exec_prefix}/include
- datadir=${CONFIG_INST_DATA}
-
diff --git a/gdal-perl.patch b/gdal-perl.patch
deleted file mode 100644
index d22b695..0000000
--- a/gdal-perl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gdal-2.4.0/swig/perl/GNUmakefile.orig 2018-12-26 21:34:07.219588369 +0100
-+++ gdal-2.4.0/swig/perl/GNUmakefile 2018-12-26 21:35:04.292921051 +0100
-@@ -28,7 +28,7 @@
- if [ -f Makefile_Geo__GNM ]; then $(MAKE) -f Makefile_Geo__GNM; fi
-
- Makefile_Geo__GDAL: ${WRAPPERS} Makefile.PL
-- perl Makefile.PL INSTALL_BASE=$(INST_PREFIX)
-+ perl Makefile.PL INSTALLDIRS=vendor
-
- test: build
- $(MAKE) -f Makefile_Geo__GDAL test
diff --git a/gdal-pluginsdir.patch b/gdal-pluginsdir.patch
deleted file mode 100644
index 51eadc4..0000000
--- a/gdal-pluginsdir.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -urNp -x '*.orig' gdal-3.0.4.org/configure.ac gdal-3.0.4/configure.ac
---- gdal-3.0.4.org/configure.ac 2021-04-02 16:52:15.663388370 +0200
-+++ gdal-3.0.4/configure.ac 2021-04-02 16:52:16.026721386 +0200
-@@ -5219,12 +5219,16 @@ dnl ------------------------------------
-
- if test "$prefix" = "NONE" ; then
- GDAL_PREFIX=/usr/local
-+ GDAL_LIBDIR=${GDAL_PREFIX}/lib
- else
- GDAL_PREFIX=${prefix}
-+ eval eval GDAL_LIBDIR="${libdir}"
- fi
-
- export GDAL_PREFIX
-+export GDAL_LIBDIR
- AC_DEFINE_UNQUOTED(GDAL_PREFIX,["]$GDAL_PREFIX["], [--prefix directory for GDAL install])
-+AC_DEFINE_UNQUOTED(GDAL_LIBDIR,["]$GDAL_LIBDIR["], [--prefix directory for GDAL install])
-
- dnl ---------------------------------------------------------------------------
- dnl Perl bindings.
-diff -urNp -x '*.orig' gdal-3.0.4.org/gcore/gdaldrivermanager.cpp gdal-3.0.4/gcore/gdaldrivermanager.cpp
---- gdal-3.0.4.org/gcore/gdaldrivermanager.cpp 2020-01-28 11:18:44.000000000 +0100
-+++ gdal-3.0.4/gcore/gdaldrivermanager.cpp 2021-04-02 16:52:16.026721386 +0200
-@@ -745,12 +745,12 @@ void GDALDriverManager::AutoLoadDrivers(
- }
- else
- {
--#ifdef GDAL_PREFIX
-+#if 1
- papszSearchPath = CSLAddString( papszSearchPath,
- #ifdef MACOSX_FRAMEWORK
- GDAL_PREFIX "/PlugIns");
- #else
-- GDAL_PREFIX "/lib/gdalplugins" );
-+ GDAL_LIBDIR "/gdalplugins" );
- #endif
- #else
- char szExecPath[1024];
diff --git a/gdal-poppler.patch b/gdal-poppler.patch
deleted file mode 100644
index 243c4ce..0000000
--- a/gdal-poppler.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 17e98757e78969a199d1d6318f53d088da192191 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault at spatialys.com>
-Date: Fri, 18 Feb 2022 22:47:01 +0100
-Subject: [PATCH] PDF: fix build against Poppler > 22.2
-
----
- frmts/pdf/pdfdataset.cpp | 17 +++++++++++------
- 1 file changed, 11 insertions(+), 6 deletions(-)
-
-diff --git a/frmts/pdf/pdfdataset.cpp b/frmts/pdf/pdfdataset.cpp
-index 22238bd74822..08f8e31c86a7 100644
---- a/frmts/pdf/pdfdataset.cpp
-+++ b/frmts/pdf/pdfdataset.cpp
-@@ -4101,8 +4101,6 @@ PDFDataset *PDFDataset::Open( GDALOpenIn
- #ifdef HAVE_POPPLER
- if(bUseLib.test(PDFLIB_POPPLER))
- {
-- GooString* poUserPwd = nullptr;
--
- /* Set custom error handler for poppler errors */
- #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 85
- setErrorCallback(PDFDatasetErrorFunction);
-@@ -4136,8 +4134,6 @@ PDFDataset *PDFDataset::Open( GDALOpenIn
- while( true )
- {
- VSIFSeekL(fp, 0, SEEK_SET);
-- if (pszUserPwd)
-- poUserPwd = new GooString(pszUserPwd);
-
- #if POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 58
- auto poStream = new VSIPDFFileStream(fp, pszFilename, std::move(oObj));
-@@ -4145,8 +4141,18 @@ PDFDataset *PDFDataset::Open( GDALOpenIn
- oObj.getObj()->initNull();
- auto poStream = new VSIPDFFileStream(fp, pszFilename, oObj.getObj());
- #endif
-+#if POPPLER_MAJOR_VERSION > 22 || (POPPLER_MAJOR_VERSION == 22 && POPPLER_MINOR_VERSION > 2)
-+ std::optional<GooString> osUserPwd;
-+ if (pszUserPwd)
-+ osUserPwd = std::optional<GooString>(pszUserPwd);
-+ poDocPoppler = new PDFDoc(poStream, std::optional<GooString>(), osUserPwd);
-+#else
-+ GooString* poUserPwd = nullptr;
-+ if (pszUserPwd)
-+ poUserPwd = new GooString(pszUserPwd);
- poDocPoppler = new PDFDoc(poStream, nullptr, poUserPwd);
- delete poUserPwd;
-+#endif
-
- if ( !poDocPoppler->isOk() || poDocPoppler->getNumPages() == 0 )
- {
---- gdal-3.0.4/frmts/pdf/pdfdataset.cpp.orig 2022-04-15 17:08:03.072819386 +0200
-+++ gdal-3.0.4/frmts/pdf/pdfdataset.cpp 2022-04-15 17:43:26.613241927 +0200
-@@ -4837,7 +4837,11 @@ PDFDataset *PDFDataset::Open( GDALOpenIn
- #ifdef HAVE_POPPLER
- if (bUseLib.test(PDFLIB_POPPLER))
- {
-+#if POPPLER_MAJOR_VERSION > 22 || (POPPLER_MAJOR_VERSION == 22 && POPPLER_MINOR_VERSION > 3)
-+ std::unique_ptr<GooString> poMetadata = poCatalogPoppler->readMetadata();
-+#else
- GooString* poMetadata = poCatalogPoppler->readMetadata();
-+#endif
- if (poMetadata)
- {
- #if (POPPLER_MAJOR_VERSION >= 1 || POPPLER_MINOR_VERSION >= 72)
-@@ -4851,7 +4855,9 @@ PDFDataset *PDFDataset::Open( GDALOpenIn
- const char * const apszMDList[2] = { pszContent, nullptr };
- poDS->SetMetadata(const_cast<char**>(apszMDList), "xml:XMP");
- }
-+#if POPPLER_MAJOR_VERSION < 22 || (POPPLER_MAJOR_VERSION == 22 && POPPLER_MINOR_VERSION < 4)
- delete poMetadata;
-+#endif
- }
-
- /* Read Info object */
diff --git a/gdal-rasdaman.patch b/gdal-rasdaman.patch
deleted file mode 100644
index daa5983..0000000
--- a/gdal-rasdaman.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gdal-1.11.0/configure.ac.orig 2014-06-14 20:12:03.704706951 +0200
-+++ gdal-1.11.0/configure.ac 2014-06-14 20:53:44.987988150 +0200
-@@ -4182,7 +4182,7 @@
- AC_CHECK_LIB(raslib,main,RASDAMAN_ENABLED=yes,,,)
-
- if test -n "$RASDAMAN_ENABLED" ; then
-- RASDAMAN_LIB="-lrasodmg -lclientcomm -lcompression -lnetwork -lraslib"
-+ RASDAMAN_LIB="-lrasodmg -lclientcomm -lnetwork -lraslib"
- OPT_GDAL_FORMATS="rasdaman $OPT_GDAL_FORMATS"
- AC_MSG_RESULT([ using rasdaman from system libs.])
- else
-@@ -4195,7 +4195,7 @@
-
- if test -f $RASDAMAN_DIR/include/rasdaman.hh -a -d$RASDAMAN_DIR/lib ; then
- RASDAMAN_INC=-I$RASDAMAN_DIR/include
-- RASDAMAN_LIB="-L$RASDAMAN_DIR/lib -lrasodmg -lclientcomm -lcompression -lnetwork -lraslib"
-+ RASDAMAN_LIB="-L$RASDAMAN_DIR/lib -lrasodmg -lclientcomm -lnetwork -lraslib"
- else
- AC_MSG_ERROR("Could not find rasdaman.hh or libraslib.a in $RASDAMAN_DIR.")
- fi
diff --git a/gdal_tirpcinc.patch b/gdal_tirpcinc.patch
deleted file mode 100644
index de5985f..0000000
--- a/gdal_tirpcinc.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rupN --no-dereference gdal-3.2.0-fedora/frmts/dods/GNUmakefile gdal-3.2.0-fedora-new/frmts/dods/GNUmakefile
---- gdal-3.2.0-fedora/frmts/dods/GNUmakefile 2020-10-26 14:05:39.000000000 +0100
-+++ gdal-3.2.0-fedora-new/frmts/dods/GNUmakefile 2020-11-12 00:13:52.314881073 +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.2.0-fedora/ogr/ogrsf_frmts/dods/GNUmakefile gdal-3.2.0-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile
---- gdal-3.2.0-fedora/ogr/ogrsf_frmts/dods/GNUmakefile 2020-10-26 14:05:39.000000000 +0100
-+++ gdal-3.2.0-fedora-new/ogr/ogrsf_frmts/dods/GNUmakefile 2020-11-12 00:13:52.314881073 +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))
-
diff --git a/jasper.patch b/jasper.patch
deleted file mode 100644
index 773c84f..0000000
--- a/jasper.patch
+++ /dev/null
@@ -1,128 +0,0 @@
-From 3c5cb6266a01a607ee7560807465bc833240d793 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault at spatialys.com>
-Date: Mon, 10 Aug 2020 17:26:53 +0200
-Subject: [PATCH] JPEG2000: fix build with Jasper 2.0.17 (fixes #2844)
-
----
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index 3e668ffe503..2d3f4e46876 100644
---- a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -484,7 +484,7 @@ int JPEG2000Dataset::DecodeImage()
- /* the JP2 boxes match the ones of the code stream */
- if (nBands != 0)
- {
-- if (nBands != jas_image_numcmpts( psImage ))
-+ if (nBands != static_cast<int>(jas_image_numcmpts( psImage )))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
- "The number of components indicated in the IHDR box (%d) mismatch "
-@@ -595,7 +595,7 @@ GDALDataset *JPEG2000Dataset::Open( GDALOpenInfo * poOpenInfo )
-
- {
- int iFormat;
-- char *pszFormatName = nullptr;
-+ const char *pszFormatName = nullptr;
-
- if (!Identify(poOpenInfo))
- return nullptr;
-From e236eeaed1be45a4af457565085e3db1f2fc489f Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault at spatialys.com>
-Date: Tue, 11 Aug 2020 09:26:41 +0200
-Subject: [PATCH] JPEG2000: follow-up fix to build with Jasper 2.0.17 (fixes
- #2844)
-
----
- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index e780d2bcaed..10a4f96f0ee 100644
---- a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,13 +94,23 @@ typedef struct {
- * File stream object.
- \******************************************************************************/
-
-+// PRIjas_seqent macro is defined since Jasper 2.0.17
-+
-+#ifndef PRIjas_seqent
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
-+#else
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
-
-+#ifndef PRIjas_seqent
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
-+#else
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
-+#endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFWriteL(buf, 1, cnt, fileobj->fp));
-From 1562e215c6f53a53efa66263113ecc6e761818d2 Mon Sep 17 00:00:00 2001
-From: Even Rouault <even.rouault at spatialys.com>
-Date: Mon, 5 Oct 2020 12:11:52 +0200
-Subject: [PATCH] JPEG2000: make it build with Jasper 2.0.21 (fixes #3012)
-
----
- gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp | 16 +++++++++-------
- gdal/frmts/jpeg2000/jpeg2000dataset.cpp | 2 +-
- 2 files changed, 10 insertions(+), 8 deletions(-)
-
-diff --git a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-index 10a4f96f0ee..ebcac4010ce 100644
---- a/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-+++ b/gdal/frmts/jpeg2000/jpeg2000_vsil_io.cpp
-@@ -94,22 +94,24 @@ typedef struct {
- * File stream object.
- \******************************************************************************/
-
-+#if defined(PRIjas_seqent)
- // PRIjas_seqent macro is defined since Jasper 2.0.17
--
--#ifndef PRIjas_seqent
--static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
--#else
- static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, unsigned cnt)
-+#else
-+static int JPEG2000_VSIL_read(jas_stream_obj_t *obj, char *buf, int cnt)
- #endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
- return static_cast<int>(VSIFReadL(buf, 1, cnt, fileobj->fp));
- }
-
--#ifndef PRIjas_seqent
--static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
--#else
-+#if defined(JAS_INCLUDE_JP2_CODEC)
-+// Jasper 2.0.21
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, const char *buf, unsigned int cnt)
-+#elif defined(PRIjas_seqent)
- static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, unsigned int cnt)
-+#else
-+static int JPEG2000_VSIL_write(jas_stream_obj_t *obj, char *buf, int cnt)
- #endif
- {
- jas_stream_VSIFL_t *fileobj = JAS_CAST(jas_stream_VSIFL_t *, obj);
-diff --git a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-index a5a6b258ed9..bd1e7763186 100644
---- a/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-+++ b/gdal/frmts/jpeg2000/jpeg2000dataset.cpp
-@@ -513,7 +513,7 @@ int JPEG2000Dataset::DecodeImage()
- for ( iBand = 0; iBand < nBands; iBand++ )
- {
- JPEG2000RasterBand* poBand = (JPEG2000RasterBand*) GetRasterBand(iBand+1);
-- if (poBand->iDepth != jas_image_cmptprec( psImage, iBand ) ||
-+ if (poBand->iDepth != static_cast<int>(jas_image_cmptprec( psImage, iBand )) ||
- poBand->bSignedness != jas_image_cmptsgnd( psImage, iBand ))
- {
- CPLError(CE_Failure, CPLE_AppDefined,
diff --git a/libx32.patch b/libx32.patch
deleted file mode 100644
index 5fad1ec..0000000
--- a/libx32.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- gdal-2.0.2/m4/lib-prefix.m4~ 2016-01-26 16:21:45.000000000 +0100
-+++ gdal-2.0.2/m4/lib-prefix.m4 2017-09-04 23:14:12.632192795 +0200
-@@ -172,9 +172,11 @@
- for searchdir in $searchpath; do
- if test -d "$searchdir"; then
- case "$searchdir" in
-+ */libx32/ | */libx32 ) acl_libdirstem=libx32 ;;
- */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
- *) searchdir=`cd "$searchdir" && pwd`
- case "$searchdir" in
-+ */libx324 ) acl_libdirstem=libx32 ;;
- */lib64 ) acl_libdirstem=lib64 ;;
- esac ;;
- esac
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gdal.git/commitdiff/7d6d8d669622521d188fb76d03cf7b5f163fe830
More information about the pld-cvs-commit
mailing list