Projetos/rpi-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

package/chocolate-doom: bump to 3.1.1 to fix GCC 15.x issues

Browse Source 
Changes in 3.1.0:

  https://github.com/chocolate-doom/chocolate-doom/releases/tag/chocolate-doom-3.1.0

Changes in 3.1.1:

  https://github.com/chocolate-doom/chocolate-doom/releases/tag/chocolate-doom-3.1.1

The SDL2_mixer and SDL2_net dependencies are now optional since 3.1.0,
so adjust the packaging accordingly.

Also, the license file was renamed upstream in commit:
91a66a7ecb
So _LICENSE_FILES and the .hash file are also updated to reflect
that change.

Fixes:

  https://autobuild.buildroot.net/results/90a01c5925e7f5f50b3ea06d6ea7b0da66814a15/

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
[Julien: fix license file and hash]
Signed-off-by: Julien Olivain <ju.o@free.fr>
This commit is contained in:
Thomas Petazzoni
2025-09-09 09:26:52 +02:00
committed by Julien Olivain
parent 6e81b51f68
commit be466c265b
5 changed files with 22 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.checkpackageignore
View File

@@ -289,7 +289,6 @@ package/cdrkit/0003-Add-extern-to-char-outfile-declaration-to-fix-build-.patch l
package/cfm/S65cfm lib_sysv.Indent lib_sysv.Variables
package/cgroupfs-mount/S30cgroupfs Shellcheck lib_sysv.Indent lib_sysv.Variables
package/chipmunk/0001-Fix-build-failure-on-musl.patch lib_patch.Upstream
package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch lib_patch.Upstream
package/chrony/S49chronyd lib_sysv.Variables
package/cmake/0001-rename-cmake-rootfile.patch lib_patch.Upstream
package/cmocka/0001-Don-t-redefine-uintptr_t.patch lib_patch.Upstream

29
package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch
View File

@@ -1,29 +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 multiple definitions of a global variable.
See https://gcc.gnu.org/gcc-10/porting_to.html
[Retrieved from:
https://github.com/chocolate-doom/chocolate-doom/commit/a8fd4b1f563d24d4296c3e8225c8404e2724d4c2]
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
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 ------------------------------------------------

2
package/chocolate-doom/Config.in
View File

@@ -3,8 +3,6 @@ config BR2_PACKAGE_CHOCOLATE_DOOM
depends on BR2_USE_MMU # fork()
depends on !BR2_STATIC_LIBS # sdl2
select BR2_PACKAGE_SDL2
select BR2_PACKAGE_SDL2_MIXER
select BR2_PACKAGE_SDL2_NET
help
Chocolate Doom is a set of conservative source ports for Doom,
Heretic, Hexen and Strife, with a philosophy of preserving the

4
package/chocolate-doom/chocolate-doom.hash
View File

@@ -1,3 +1,3 @@
# Locally computed
sha256 d435d6177423491d60be706da9f07d3ab4fabf3e077ec2a3fc216e394fcfc8c7 chocolate-doom-3.0.1.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
sha256 1edcc41254bdc194beb0d33e267fae306556c4d24110a1d3d3f865717f25da23 chocolate-doom-3.1.1.tar.gz
sha256 aef8b4222b79d0dbf6bf17cfff71c90a6a6bb8917a4162abe417b469ed22da2e COPYING.md

24
package/chocolate-doom/chocolate-doom.mk
View File

@@ -4,13 +4,15 @@
#
################################################################################
CHOCOLATE_DOOM_VERSION = 3.0.1
CHOCOLATE_DOOM_SITE = http://www.chocolate-doom.org/downloads/$(CHOCOLATE_DOOM_VERSION)
CHOCOLATE_DOOM_VERSION = 3.1.1
CHOCOLATE_DOOM_SITE = $(call github,chocolate-doom,chocolate-doom,chocolate-doom-$(CHOCOLATE_DOOM_VERSION))
CHOCOLATE_DOOM_LICENSE = GPL-2.0+
CHOCOLATE_DOOM_LICENSE_FILES = COPYING
CHOCOLATE_DOOM_LICENSE_FILES = COPYING.md
CHOCOLATE_DOOM_CPE_ID_VENDOR = chocolate-doom
CHOCOLATE_DOOM_CPE_ID_PRODUCT = chocolate_doom
CHOCOLATE_DOOM_DEPENDENCIES = host-pkgconf sdl2 sdl2_mixer sdl2_net
CHOCOLATE_DOOM_DEPENDENCIES = host-pkgconf sdl2
# Fetch from git
CHOCOLATE_DOOM_AUTORECONF = YES
# Avoid installing desktop entries, icons, etc.
CHOCOLATE_DOOM_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) install-exec
@@ -23,6 +25,20 @@ endif
CHOCOLATE_DOOM_CONF_ENV += CFLAGS="$(CHOCOLATE_DOOM_CFLAGS)"
ifeq ($(BR2_PACKAGE_SDL2_MIXER),y)
CHOCOLATE_DOOM_DEPENDENCIES += sdl2_mixer
CHOCOLATE_DOOM_CONF_OPTS += --enable-sdl2mixer
else
CHOCOLATE_DOOM_CONF_OPTS += --disable-sdl2mixer
endif
ifeq ($(BR2_PACKAGE_SDL2_NET),y)
CHOCOLATE_DOOM_DEPENDENCIES += sdl2_net
CHOCOLATE_DOOM_CONF_OPTS += --enable-sdl2net
else
CHOCOLATE_DOOM_CONF_OPTS += --disable-sdl2net
endif
ifeq ($(BR2_PACKAGE_LIBPNG),y)
CHOCOLATE_DOOM_DEPENDENCIES += libpng
CHOCOLATE_DOOM_CONF_OPTS += --with-libpng