From 87976574f19269528f45191d9a5709f3b09abf64 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Wed, 29 May 2024 19:06:07 -0500
Subject: user/grfcodec: Update to 6.1.0

PowerPC fixes upstream, and compatibility with newer GCC.
---
 user/grfcodec/APKBUILD      | 26 ++++++++++++++++----------
 user/grfcodec/va_copy.patch | 16 ----------------
 2 files changed, 16 insertions(+), 26 deletions(-)
 delete mode 100644 user/grfcodec/va_copy.patch

diff --git a/user/grfcodec/APKBUILD b/user/grfcodec/APKBUILD
index c240a647a..e571af644 100644
--- a/user/grfcodec/APKBUILD
+++ b/user/grfcodec/APKBUILD
@@ -1,27 +1,33 @@
 # Contributor: A. Wilcox <awilfox@adelielinux.org>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=grfcodec
-pkgver=6.0.6
+pkgver=6.1.0
 pkgrel=0
 pkgdesc="Tool for manipulating OpenTTD GRF files"
-url="https://dev.openttdcoop.org/projects/grfcodec"
+url=" "
 arch="all"
 options="!check"  # No test suite.
 license="GPL-2.0-only"
 depends=""
-makedepends="boost-dev"
+makedepends="boost-dev cmake"
 subpackages="$pkgname-doc"
-source="https://cdn.openttd.org/$pkgname-releases/$pkgver/$pkgname-$pkgver-source.tar.xz
-	va_copy.patch
-	"
+source="https://github.com/OpenTTD/$pkgname/releases/download/$pkgver/$pkgname-$pkgver-source.tar.xz"
 
 build() {
-	make
+	if [ "$CBUILD" != "$CHOST" ]; then
+		CMAKE_CROSSOPTS="-DCMAKE_SYSTEM_NAME=Linux -DCMAKE_HOST_SYSTEM_NAME=Linux"
+	fi
+	cmake \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_INSTALL_LIBDIR=lib \
+		-DBUILD_SHARED_LIBS=True \
+		-DCMAKE_BUILD_TYPE=RelWithDebugInfo \
+		${CMAKE_CROSSOPTS} -Bbuild
+	make -C build
 }
 
 package() {
-	make prefix=/usr DESTDIR="$pkgdir" install
+	DESTDIR="$pkgdir" make -C build install
 }
 
-sha512sums="543123c794bfdb5b6556f7a897bcd2f3bdd09be8ad6a4ff07b138e0cac62621a4801c732bb20099c1bb383ad5822fc4ade276d49acf2744c811edd10d7699480  grfcodec-6.0.6-source.tar.xz
-4e7034132f889ac62b82d08dae8c928c8a7efd5a0c3dc0d3f35d6c394fb78082a37a22678c5a428489bd26608d868054131a14fb10201d5ce478d46eb9c96890  va_copy.patch"
+sha512sums="9129e0f38b151e11c90585e0fe966e042ad08ec90f800ee80f749865aed6c72c733639b8d02ecd613409f2a0ae6d1f72fa1d3524f7c450a0f06ff42ee170f16f  grfcodec-6.1.0-source.tar.xz"
diff --git a/user/grfcodec/va_copy.patch b/user/grfcodec/va_copy.patch
deleted file mode 100644
index 04a549d60..000000000
--- a/user/grfcodec/va_copy.patch
+++ /dev/null
@@ -1,16 +0,0 @@
---- grfcodec-6.0.6/src/sanity_defines.h.old	2015-05-09 10:59:46.000000000 +0000
-+++ grfcodec-6.0.6/src/sanity_defines.h	2019-01-14 19:17:36.690000000 +0000
-@@ -77,10 +77,10 @@
- 	~apWrapper(){va_end(_ap);}
- 	operator va_list&(){return _ap;}
- 	operator const va_list&()const{return _ap;}
--#ifdef __va_copy
-+#ifdef va_copy
- 	va_list&operator=(va_list&ap){
--	    __va_copy(_ap,ap);
--		return _ap;
-+	    va_copy(_ap,ap);
-+	    return _ap;
- 	}
- #else
- 	va_list const&operator=(va_list const&ap){
-- 
cgit v1.2.3-70-g09d2