1 Commits

Author SHA256 Message Date
0efb8177da chocolate-doom 3.1.1 2025-08-17 09:34:33 +02:00
5 changed files with 16 additions and 69 deletions

BIN
chocolate-doom-3.1.0.tar.gz (Stored with Git LFS)

Binary file not shown.

BIN
chocolate-doom-3.1.1.tar.gz (Stored with Git LFS) Normal file

Binary file not shown.

View File

@@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sat Aug 16 21:48:17 UTC 2025 - Jan Engelhardt <jengelh@inai.de>
- Update to release 3.1.1
* Use native OpenGL texture format for better performance
* Add option to enable or disable smooth pixel scaling
* Allow spaces in GUS patch folder path
* Add support for non-US backslash key
* Use $TMPDIR to find tempdir on Unix
- Delete declare_code_as_C99_compliant.patch
-------------------------------------------------------------------
Tue Jun 10 16:18:50 UTC 2025 - Martin Jambor <mjambor@suse.com>

View File

@@ -1,7 +1,7 @@
#
# spec file for package chocolate-doom
#
# Copyright (c) 2024 SUSE LLC
# Copyright (c) 2025 SUSE LLC and contributors
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
Name: chocolate-doom
Version: 3.1.0
Version: 3.1.1
Release: 0
Summary: Conservative DOOM/Heretic/Hexen/Strife source port
License: GPL-2.0-or-later
@@ -28,7 +28,6 @@ URL: http://chocolate-doom.org/
Source: https://github.com/chocolate-doom/chocolate-doom/archive/refs/tags/%name-%version.tar.gz
Source3: %name.keyring
Patch1: chdoom-iwaddir.diff
Patch2: declare_code_as_C99_compliant.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: fdupes

View File

@@ -1,63 +0,0 @@
From 57e0cdf606bcf9a518f2cad99831133396c015fa Mon Sep 17 00:00:00 2001
From: Fabian Greffrath <fabian@greffrath.com>
Date: Mon, 20 Jan 2025 17:22:48 +0100
Subject: [PATCH] declare code as C99 compliant, include stdbool.h
unconditionally (#1723)
* declare code as C99 compliant, include stdbool.h unconditionally
* add a comment why `boolean` must be an `int` type
---
CMakeLists.txt | 2 ++
configure.ac | 2 +-
src/doomtype.h | 7 +++++--
3 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5a058d7706..a7456650c4 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,6 +3,8 @@ set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
cmake_minimum_required(VERSION 3.7.2)
project("Chocolate Doom" VERSION 3.1.0 LANGUAGES C)
+set(CMAKE_C_STANDARD 99)
+
# Autotools variables
set(top_srcdir ${CMAKE_CURRENT_SOURCE_DIR})
set(top_builddir ${CMAKE_CURRENT_BINARY_DIR})
diff --git a/configure.ac b/configure.ac
index 7bf04169fb..fbc1dd51db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,7 +39,7 @@ AC_CANONICAL_HOST
orig_CFLAGS="$CFLAGS"
AM_PROG_AR
-AC_PROG_CC
+AC_PROG_CC_C99
AC_PROG_RANLIB
AC_CHECK_PROG(HAVE_PYTHON, python3, true, false)
diff --git a/src/doomtype.h b/src/doomtype.h
index 9947a070b5..d90cfec970 100644
--- a/src/doomtype.h
+++ b/src/doomtype.h
@@ -99,12 +99,15 @@
// standard and defined to include stdint.h, so include this.
#include <inttypes.h>
+#include <stdbool.h>
#if defined(__cplusplus) || defined(__bool_true_false_are_defined)
-// Use builtin bool type with C++.
+// The C++/C99 bool type (or _Bool that is) can only have two values:
+// 0 or 1. However, the Doom source code assumes any non-zero value
+// to evaluate to true, so we have to use an int type here.
-typedef bool boolean;
+typedef int boolean;
#else