From 4572319dc7dc487add56340afda13177f1cc7a2c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 3 Mar 2025 19:16:01 +1100
Subject: [PATCH] Proj 6.3.2 => 9.5.1 (#11458)

Co-authored-by: Ed Reel <edreel@gmail.com>
---
 manifest/i686/p/proj.filelist | 51 -----------------------------------
 packages/proj.rb              | 35 +++++++++++-------------
 2 files changed, 16 insertions(+), 70 deletions(-)
 delete mode 100644 manifest/i686/p/proj.filelist

diff --git a/manifest/i686/p/proj.filelist b/manifest/i686/p/proj.filelist
deleted file mode 100644
index 15d23771f..000000000
--- a/manifest/i686/p/proj.filelist
+++ /dev/null
@@ -1,51 +0,0 @@
-/usr/local/bin/cct
-/usr/local/bin/cs2cs
-/usr/local/bin/geod
-/usr/local/bin/gie
-/usr/local/bin/invgeod
-/usr/local/bin/invproj
-/usr/local/bin/proj
-/usr/local/bin/projinfo
-/usr/local/include/geodesic.h
-/usr/local/include/org_proj4_PJ.h
-/usr/local/include/proj.h
-/usr/local/include/proj/common.hpp
-/usr/local/include/proj/coordinateoperation.hpp
-/usr/local/include/proj/coordinatesystem.hpp
-/usr/local/include/proj/crs.hpp
-/usr/local/include/proj/datum.hpp
-/usr/local/include/proj/io.hpp
-/usr/local/include/proj/metadata.hpp
-/usr/local/include/proj/nn.hpp
-/usr/local/include/proj/util.hpp
-/usr/local/include/proj_api.h
-/usr/local/include/proj_constants.h
-/usr/local/include/proj_experimental.h
-/usr/local/include/proj_symbol_rename.h
-/usr/local/lib/libproj.a
-/usr/local/lib/libproj.la
-/usr/local/lib/libproj.so
-/usr/local/lib/libproj.so.15
-/usr/local/lib/libproj.so.15.3.2
-/usr/local/lib/pkgconfig/proj.pc
-/usr/local/share/man/man1/cct.1.gz
-/usr/local/share/man/man1/cs2cs.1.gz
-/usr/local/share/man/man1/geod.1.gz
-/usr/local/share/man/man1/gie.1.gz
-/usr/local/share/man/man1/proj.1.gz
-/usr/local/share/man/man1/projinfo.1.gz
-/usr/local/share/man/man3/geodesic.3.gz
-/usr/local/share/man/man3/pj_init.3.gz
-/usr/local/share/proj/CH
-/usr/local/share/proj/GL27
-/usr/local/share/proj/ITRF2000
-/usr/local/share/proj/ITRF2008
-/usr/local/share/proj/ITRF2014
-/usr/local/share/proj/nad.lst
-/usr/local/share/proj/nad27
-/usr/local/share/proj/nad83
-/usr/local/share/proj/null
-/usr/local/share/proj/other.extra
-/usr/local/share/proj/proj.db
-/usr/local/share/proj/projjson.schema.json
-/usr/local/share/proj/world
diff --git a/packages/proj.rb b/packages/proj.rb
index 725c5a360..4b169c306 100644
--- a/packages/proj.rb
+++ b/packages/proj.rb
@@ -1,28 +1,25 @@
-require 'package'
+require 'buildsystems/cmake'
 
-class Proj < Package
+class Proj < CMake
   description 'PROJ is a generic coordinate transformation software that transforms geospatial coordinates from one coordinate reference system (CRS) to another.'
   homepage 'https://proj.org'
-  version '6.3.2'
+  version '9.5.1'
   license 'MIT'
-  compatibility 'all'
-  source_url 'https://download.osgeo.org/proj/proj-6.3.2.zip'
-  source_sha256 '5ef90382d1d57e7185d13064fa46c1f6350a079f4f7ad67c862b6075ca7b88ec'
-  binary_compression 'tar.xz'
+  compatibility 'aarch64 armv7l x86_64'
+  source_url "https://download.osgeo.org/proj/proj-#{version}.tar.gz"
+  source_sha256 'a8395f9696338ffd46b0feb603edbb730fad6746fba77753c77f7f997345e3d3'
+  binary_compression 'tar.zst'
 
   binary_sha256({
-    aarch64: 'bde7e31699f5ed4348dbd36b5f5b3c2712c1fcee49f27531c4d900e38d043e69',
-     armv7l: 'bde7e31699f5ed4348dbd36b5f5b3c2712c1fcee49f27531c4d900e38d043e69',
-       i686: '5c4a089119c9f9a362a0bbe13b6f6982cb08cc469c678dde694a8ec181415efc',
-     x86_64: 'bf6f5ee5af25517619680631c3bfb79aad84ebc5acfd00be404a35ebe3b9ff95'
+    aarch64: 'cea001d600720b88b5b32e0327e59e1e3d9a4a0993654f708e31b9b04789b669',
+     armv7l: 'cea001d600720b88b5b32e0327e59e1e3d9a4a0993654f708e31b9b04789b669',
+     x86_64: '624b3019565b583b3de7f4b1ab9688910bfc63714ab4549b269dfe0f78cee5bd'
   })
 
-  def self.build
-    system "./configure #{CREW_CONFIGURE_OPTIONS}"
-    system 'make'
-  end
-
-  def self.install
-    system 'make', "DESTDIR=#{CREW_DEST_DIR}", 'install'
-  end
+  depends_on 'curl' # R
+  depends_on 'gcc_lib' # R
+  depends_on 'glibc' # R
+  depends_on 'libtiff' # R
+  depends_on 'python3' # R
+  depends_on 'sqlite' # R
 end