mirrors/aports
1
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2025-08-05 21:37:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

testing/chocolate-doom: upgrade to 3.1.0

Browse Source 
* There's no release tarball (currently), so run ./autogen.sh in prepare
* New dependency on fluidsynth
* Patch to fix builds on gcc 10 is included in upstream release
This commit is contained in:
Jordan Christiansen 2024-08-02 09:13:20 -05:00 committed by Celeste
parent 6f483d86a7
commit de79efa072
2 changed files with 8 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
testing/chocolate-doom/10-remove-redundant-demoextend-definition.patch
View File

@ -1,25 +0,0 @@
From a8fd4b1f563d24d4296c3e8225c8404e2724d4c2 Mon Sep 17 00:00:00 2001
From: Jordan Christiansen <xordspar0@gmail.com>
Date: Sun, 15 Mar 2020 16:55:33 -0500
Subject: [PATCH] Remove redundant demoextend definition
GCC 10 enables -fno-common by default, which causes the linker to fail when
there are multple definitions of a global variable.
See https://gcc.gnu.org/gcc-10/porting_to.html
---
src/hexen/mn_menu.c | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/hexen/mn_menu.c b/src/hexen/mn_menu.c
index 059f45b3e..a97b7fcd1 100644
--- a/src/hexen/mn_menu.c
+++ b/src/hexen/mn_menu.c
@@ -131,7 +131,6 @@ boolean MenuActive;
int InfoType;
int messageson = true;
boolean mn_SuicideConsole;
-boolean demoextend; // from h2def.h
// PRIVATE DATA DEFINITIONS ------------------------------------------------

20
testing/chocolate-doom/APKBUILD
View File

@ -1,24 +1,21 @@
# Maintainer: Jordan Christiansen <xordspar0@gmail.com>
pkgname=chocolate-doom
pkgver=3.0.1
pkgrel=3
pkgver=3.1.0
pkgrel=0
pkgdesc="Portable release of Doom, Heretic, Hexen, and Strife"
url="https://www.chocolate-doom.org"
arch="all"
license="GPL-2.0-or-later"
makedepends="sdl2-dev sdl2_net-dev sdl2_mixer-dev libpng-dev
libsamplerate-dev mesa-dev"
makedepends="autoconf automake sdl2-dev sdl2_net-dev sdl2_mixer-dev libpng-dev
libsamplerate-dev mesa-dev fluidsynth-dev"
subpackages="$pkgname-doc"
options="!check" # no test suite
source="
https://www.chocolate-doom.org/downloads/$pkgver/chocolate-doom-$pkgver.tar.gz
10-remove-redundant-demoextend-definition.patch
"
source="https://github.com/chocolate-doom/chocolate-doom/archive/refs/tags/chocolate-doom-$pkgver.tar.gz"
builddir="$srcdir/$pkgname-$pkgname-$pkgver/"
prepare() {
default_prepare
# config.sub is too old to recognize loongarch64-alpine-linux-musl
update_config_sub
./autogen.sh
}
build() {
@ -37,6 +34,5 @@ package() {
}
sha512sums="
bec5daf5b26a8dd238780cb4e0c23ffc59b97825d323aa67bb6a3279cd243c18c03e899c4cb4b3106ac187330c6421915a14a6a7c0d34cb0ee75d6f29f9dc905 chocolate-doom-3.0.1.tar.gz
8e5ea517ade7915bf40c4f7b6746ec4055009fcbb76f2e6e7ee52dfaaa5f362bc5cd23b88e91cd098beb5b4f793eb89c4e65da8e125623ab63d6652ba99357f2 10-remove-redundant-demoextend-definition.patch
17f65c6f4a48dd1b0aa71bdf495d1036602739f1955d64f7de46157fce912ab4e4344a0f7ad073980f50d67e34f9f5e84402e7f2142cd6364453b71c8d5c2592 chocolate-doom-3.1.0.tar.gz
"