[Buildroot] [PATCH] package/chocolate-doom: bump to 3.1.1 to fix GCC 15.x issues
Thomas Petazzoni
thomas.petazzoni at bootlin.com
Tue Sep 9 07:26:52 UTC 2025
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.
Fixes:
https://autobuild.buildroot.net/results/90a01c5925e7f5f50b3ea06d6ea7b0da66814a15/
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at bootlin.com>
---
.checkpackageignore | 1 -
...move-redundant-demoextend-definition.patch | 29 -------------------
package/chocolate-doom/Config.in | 2 --
package/chocolate-doom/chocolate-doom.hash | 2 +-
package/chocolate-doom/chocolate-doom.mk | 22 ++++++++++++--
5 files changed, 20 insertions(+), 36 deletions(-)
delete mode 100644 package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch
diff --git a/.checkpackageignore b/.checkpackageignore
index 8cf2f4a215..5b0e0b177b 100644
--- a/.checkpackageignore
+++ b/.checkpackageignore
@@ -292,7 +292,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
diff --git a/package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch b/package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch
deleted file mode 100644
index 06bf54c583..0000000000
--- a/package/chocolate-doom/0001-Remove-redundant-demoextend-definition.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From a8fd4b1f563d24d4296c3e8225c8404e2724d4c2 Mon Sep 17 00:00:00 2001
-From: Jordan Christiansen <xordspar0 at 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 at 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 ------------------------------------------------
-
diff --git a/package/chocolate-doom/Config.in b/package/chocolate-doom/Config.in
index 406b04ecf1..3cefd057ec 100644
--- a/package/chocolate-doom/Config.in
+++ b/package/chocolate-doom/Config.in
@@ -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
diff --git a/package/chocolate-doom/chocolate-doom.hash b/package/chocolate-doom/chocolate-doom.hash
index 79eb1c6a3f..9d89b830f6 100644
--- a/package/chocolate-doom/chocolate-doom.hash
+++ b/package/chocolate-doom/chocolate-doom.hash
@@ -1,3 +1,3 @@
# Locally computed
-sha256 d435d6177423491d60be706da9f07d3ab4fabf3e077ec2a3fc216e394fcfc8c7 chocolate-doom-3.0.1.tar.gz
+sha256 1edcc41254bdc194beb0d33e267fae306556c4d24110a1d3d3f865717f25da23 chocolate-doom-3.1.1.tar.gz
sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING
diff --git a/package/chocolate-doom/chocolate-doom.mk b/package/chocolate-doom/chocolate-doom.mk
index 581b2c51c2..599a15d3fa 100644
--- a/package/chocolate-doom/chocolate-doom.mk
+++ b/package/chocolate-doom/chocolate-doom.mk
@@ -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_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
--
2.51.0
More information about the buildroot
mailing list