libgdal: update to 2.4.1

Also switch from poppler to podofo because of incompatibilities
with our current poppler-0.75.

Signed-off-by: Jürgen Buchmüller <pullmoll@t-online.de>
This commit is contained in:
Jürgen Buchmüller 2019-03-28 13:28:44 +01:00
parent 4ab383144b
commit cb47555776
No known key found for this signature in database
GPG Key ID: DE55AD8DBEBB4EE8
2 changed files with 6 additions and 70 deletions

View File

@ -1,64 +0,0 @@
diff --git a/frmts/pdf/pdfio.cpp b/frmts/pdf/pdfio.cpp
index b00560d..f9b4955 100644
--- frmts/pdf/pdfio.cpp
+++ frmts/pdf/pdfio.cpp
@@ -389,7 +389,7 @@ GBool VSIPDFFileStream::hasGetChars()
/* getChars() */
/************************************************************************/
-int VSIPDFFileStream::getChars(int nChars, Guchar *buffer)
+int VSIPDFFileStream::getChars(int nChars, unsigned char *buffer)
{
int nRead = 0;
while (nRead < nChars)
diff --git a/frmts/pdf/pdfio.h b/frmts/pdf/pdfio.h
index 795fc2b..f73bb99 100644
--- frmts/pdf/pdfio.h
+++ frmts/pdf/pdfio.h
@@ -30,6 +30,7 @@
#ifndef PDFIO_H_INCLUDED
#define PDFIO_H_INCLUDED
+#include <goo/gfile.h>
#include "cpl_vsi_virtual.h"
/************************************************************************/
@@ -46,9 +47,9 @@
#define moveStart_delta_type Goffset
#else
#define getPos_ret_type int
-#define getStart_ret_type Guint
-#define makeSubStream_offset_type Guint
-#define setPos_offset_type Guint
+#define getStart_ret_type unsigned int
+#define makeSubStream_offset_type unsigned int
+#define setPos_offset_type unsigned int
#define moveStart_delta_type int
#endif
@@ -109,10 +110,10 @@ class VSIPDFFileStream final: public BaseStream
* but will still compile correctly.
*/
virtual GBool hasGetChars() override;
- virtual int getChars(int nChars, Guchar *buffer) override;
+ virtual int getChars(int nChars, unsigned char *buffer) override;
#else
virtual GBool hasGetChars() ;
- virtual int getChars(int nChars, Guchar *buffer) ;
+ virtual int getChars(int nChars, unsigned char *buffer) ;
#endif
VSIPDFFileStream *poParent;
diff --git a/frmts/pdf/pdfsdk_headers.h b/frmts/pdf/pdfsdk_headers.h
index 9150b0f..5e0f669 100644
--- frmts/pdf/pdfsdk_headers.h
+++ frmts/pdf/pdfsdk_headers.h
@@ -50,7 +50,6 @@
#pragma warning( disable : 4244 ) /* conversion from 'const int' to 'Guchar', possible loss of data */
#endif
-#include <goo/gtypes.h>
#include <goo/GooList.h>
/* begin of poppler xpdf includes */

View File

@ -1,20 +1,20 @@
# Template file for 'libgdal'
pkgname=libgdal
version=2.4.0
revision=3
version=2.4.1
revision=1
wrksrc="gdal-${version}"
build_style=gnu-configure
configure_args="--with-liblzma --with-poppler"
configure_args="--with-liblzma --with-webp --with-zstd --with-podofo"
hostmakedepends="gettext-devel pkg-config python-numpy json-c-devel"
makedepends="freexl-devel geos-devel jasper-devel json-c-devel libcurl-devel
libopenexr-devel libopenjpeg2-devel libqhull-devel libwebp-devel libxml2-devel
libzstd-devel opencl-headers poppler-glib-devel sqlite-devel"
libopenexr-devel libopenjpeg2-devel libpodofo-devel libqhull-devel
libwebp-devel libxml2-devel libzstd-devel opencl-headers sqlite-devel"
short_desc="Geospatial Data Abstraction Library"
maintainer="Jürgen Buchmüller <pullmoll@t-online.de>"
license="MIT"
homepage="http://www.gdal.org/"
distfiles="http://download.osgeo.org/gdal/${version}/gdal-${version}.tar.xz"
checksum=c3791dcc6d37e59f6efa86e2df2a55a4485237b0a48e330ae08949f0cdf00f27
checksum=fd51b4900b2fc49b98d8714f55fc8a78ebfd07218357f93fb796791115a5a1ad
subpackages="libgdal-devel libgdal-tools"
pre_build() {