From 57aba033e6cc81b95d006227c45a15eb3fc77d07 Mon Sep 17 00:00:00 2001
From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Date: Sun, 24 Sep 2023 13:25:12 +0200
Subject: [PATCH] package/proj: bump to version 9.3.0

- Switch to cmake-package as autotools has been removed since version
  9.0.0
- This bump will fix the following build failure with gcc 13 thanks to
  https://github.com/OSGeo/PROJ/pull/3459/commits/b0b8937c56ced8eb0ffef532b9c691a1a5fc8634:

In file included from proj_json_streaming_writer.cpp:34:
proj_json_streaming_writer.hpp:42:14: error: 'int64_t' in namespace 'std' does not name a type
   42 | typedef std::int64_t GIntBig;
      |              ^~~~~~~

https://github.com/OSGeo/PROJ/blob/9.3.0/NEWS

Fixes:
 - http://autobuild.buildroot.org/results/68416dcbed1ece589a7438b085f57064fc20f87d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---
 package/proj/proj.hash |  6 +++---
 package/proj/proj.mk   | 19 ++++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/package/proj/proj.hash b/package/proj/proj.hash
index 96d94e458e..22e6a43bf7 100644
--- a/package/proj/proj.hash
+++ b/package/proj/proj.hash
@@ -1,5 +1,5 @@
-# Fetched from http://download.osgeo.org/proj/proj-8.1.1.tar.gz.md5
-md5  f017fd7d35311b0d65b2cf0503844690  proj-8.1.1.tar.gz
+# Fetched from http://download.osgeo.org/proj/proj-9.3.0.tar.gz.md5
+md5  f1d70cb8873bb4429a03c437c65c41c4  proj-9.3.0.tar.gz
 # Locally calculated
-sha256  82f1345e5fa530c407cb1fc0752e83f8d08d2b98772941bbdc7820241f7fada2  proj-8.1.1.tar.gz
+sha256  91a3695a004ea28db0448a34460bed4cc3b130e5c7d74339ec999efdab0e547d  proj-9.3.0.tar.gz
 sha256  6a8f30793e877d32e3f88b972f0970a051a3b5a26cd057d3993cb51e21c43319  COPYING
diff --git a/package/proj/proj.mk b/package/proj/proj.mk
index bc924b41fb..0e913fa335 100644
--- a/package/proj/proj.mk
+++ b/package/proj/proj.mk
@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-PROJ_VERSION = 8.1.1
+PROJ_VERSION = 9.3.0
 PROJ_SITE = http://download.osgeo.org/proj
 PROJ_LICENSE = MIT
 PROJ_LICENSE_FILES = COPYING
@@ -19,22 +19,23 @@ PROJ_CFLAGS += -O0
 PROJ_CXXFLAGS += -O0
 endif
 
-PROJ_CONF_ENV = \
-	CFLAGS="$(PROJ_CFLAGS)" \
-	CXXFLAGS="$(PROJ_CXXFLAGS)"
+PROJ_CONF_OPTS = \
+	-DBUILD_APPS=OFF \
+	-DCMAKE_C_FLAGS="$(PROJ_CFLAGS)" \
+	-DCMAKE_CXX_FLAGS="$(PROJ_CXXFLAGS)"
 
 ifeq ($(BR2_PACKAGE_LIBCURL),y)
 PROJ_DEPENDENCIES += libcurl
-PROJ_CONF_OPTS += --with-curl=$(STAGING_DIR)/usr/bin/curl-config
+PROJ_CONF_OPTS += -DENABLE_CURL=ON
 else
-PROJ_CONF_OPTS += --without-curl
+PROJ_CONF_OPTS += -DENABLE_CURL=OFF
 endif
 
 ifeq ($(BR2_PACKAGE_TIFF),y)
 PROJ_DEPENDENCIES += tiff
-PROJ_CONF_OPTS += --enable-tiff
+PROJ_CONF_OPTS += -DENABLE_TIFF=ON
 else
-PROJ_CONF_OPTS += --disable-tiff
+PROJ_CONF_OPTS += -DENABLE_TIFF=OFF
 endif
 
-$(eval $(autotools-package))
+$(eval $(cmake-package))