From 901cc2e39aaa81eb8884e29e039447ceb33a4a12 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Sun, 18 Oct 2020 09:19:42 +0200
Subject: [PATCH] yquake2: update to 7.45.

---
 srcpkgs/yquake2/patches/build.patch | 20 --------------------
 srcpkgs/yquake2/patches/musl.patch  | 11 -----------
 srcpkgs/yquake2/template            | 28 +++++++++++++---------------
 3 files changed, 13 insertions(+), 46 deletions(-)
 delete mode 100644 srcpkgs/yquake2/patches/build.patch
 delete mode 100644 srcpkgs/yquake2/patches/musl.patch

diff --git a/srcpkgs/yquake2/patches/build.patch b/srcpkgs/yquake2/patches/build.patch
deleted file mode 100644
index dfb387f695e..00000000000
--- a/srcpkgs/yquake2/patches/build.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- Makefile.orig	2017-06-27 19:08:03.195849277 +0200
-+++ Makefile	2017-06-27 19:09:14.208045274 +0200
-@@ -160,7 +160,7 @@
- 		  -Wall -pipe -g -fwrapv
- CFLAGS += $(OSX_ARCH)
- else
--CFLAGS := -std=gnu99 -O2 -fno-strict-aliasing \
-+CFLAGS += -std=gnu99 -O2 -fno-strict-aliasing \
- 		  -Wall -pipe -g -ggdb -MMD -fwrapv
- endif
- 
-@@ -237,7 +237,7 @@
- 
- # Base LDFLAGS.
- ifeq ($(YQ2_OSTYPE),Linux)
--LDFLAGS := -L/usr/lib -lm -ldl -rdynamic
-+LDFLAGS += -L/usr/lib -lm -ldl -rdynamic
- else ifeq ($(YQ2_OSTYPE),FreeBSD)
- LDFLAGS := -L/usr/local/lib -lm
- else ifeq ($(YQ2_OSTYPE),OpenBSD)
diff --git a/srcpkgs/yquake2/patches/musl.patch b/srcpkgs/yquake2/patches/musl.patch
deleted file mode 100644
index adf7ef6642f..00000000000
--- a/srcpkgs/yquake2/patches/musl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/backends/unix/signalhandler.c	2018-07-25 17:01:58.664525692 +0200
-+++ src/backends/unix/signalhandler.c	2018-07-25 17:02:13.880526068 +0200
-@@ -34,7 +34,7 @@
- 
- #include "../../common/header/common.h"
- 
--#if defined(__linux__) || defined(__FreeBSD__)
-+#if defined(__linux__) && defined(__GLIBC__) || defined(__FreeBSD__)
- #include <execinfo.h>
- 
- void
diff --git a/srcpkgs/yquake2/template b/srcpkgs/yquake2/template
index 7dc86151e4e..c80ae6da64e 100644
--- a/srcpkgs/yquake2/template
+++ b/srcpkgs/yquake2/template
@@ -1,11 +1,10 @@
 # Template file for 'yquake2'
 pkgname=yquake2
-version=7.43
+version=7.45
 revision=1
 wrksrc="quake2-${version}"
-build_style=gnu-makefile
-make_build_args="WITH_SYSTEMWIDE=yes WITH_SYSTEMDIR=/usr/lib/${pkgname}"
-make_use_env=yes
+build_style=cmake
+configure_args="-DSYSTEMWIDE_SUPPORT=ON"
 hostmakedepends="pkg-config"
 makedepends="SDL2-devel libjpeg-turbo-devel libopenal-devel zlib-devel
  libcurl-devel"
@@ -15,26 +14,25 @@ maintainer="Helmut Pozimski <helmut@pozimski.eu>"
 license="GPL-2.0-or-later"
 homepage="https://www.yamagi.org/quake2/"
 distfiles="https://deponie.yamagi.org/quake2/quake2-${version}.tar.xz"
-checksum=92770a570c9eeb50ed305d83a8729e7b34cebf7166f1b8a35d23d74a27173f16
+checksum=c7524567bf1aa6045f25619bea6e4fd9066284b3fb81863b581fb44f4f47ff65
 
 case "$XBPS_TARGET_MACHINE" in
 	armv*) makedepends+=" MesaLib-devel";;
 esac
 
-pre_build() {
-	case "$XBPS_TARGET_MACHINE" in
-		armv*|aarch*) sed -i -r 's/\$.+arm.+/arm/' Makefile;;
-	esac
-}
+case "$XBPS_TARGET_MACHINE" in
+	*-musl) makedepends+=" libexecinfo-devel"
+		LDFLAGS="-lexecinfo";;
+esac
 
 do_install() {
-	vinstall release/quake2 755 usr/lib/${pkgname} ${pkgname}
+	vinstall build/release/quake2 755 usr/lib/${pkgname} ${pkgname}
 	vmkdir usr/bin
 	ln -sf /usr/lib/${pkgname}/${pkgname} ${DESTDIR}/usr/bin
-	vbin release/q2ded ${pkgname}-q2ded
-	vinstall release/ref_gl3.so 644 usr/lib/${pkgname}
-	vinstall release/ref_gl1.so 644 usr/lib/${pkgname}
-	vinstall release/baseq2/game.so 644 usr/lib/${pkgname}/baseq2
+	vbin build/release/q2ded ${pkgname}-q2ded
+	vinstall build/release/ref_gl3.so 644 usr/lib/${pkgname}
+	vinstall build/release/ref_gl1.so 644 usr/lib/${pkgname}
+	vinstall build/release/baseq2/game.so 644 usr/lib/${pkgname}/baseq2
 	vinstall stuff/yq2.cfg 644 usr/share/doc/${pkgname}
 	vinstall ${FILESDIR}/${pkgname}.desktop 644 usr/share/applications
 	vinstall stuff/icon/Quake2.png 644 usr/share/pixmaps ${pkgname}.png