chocolate-doom 3.1.0

2024-09-10 10:23:47 +02:00
7 changed files with 56 additions and 134 deletions
--- a/0001-build-use-python3-exclusively.patch
+++ b/0001-build-use-python3-exclusively.patch
@ -1,89 +0,0 @@
-From b291e003c04431557c7369c12f2febd1aa233109 Mon Sep 17 00:00:00 2001
-From: Fabian Greffrath <fabian@greffrath.com>
-Date: Fri, 27 Nov 2020 09:17:04 +0100
-Subject: [PATCH] build: use python3 exclusively
-
-Python 2 is deprecated and is going to be removed from Linux
-distributions in the short term [1,2]. Thus, (parts of) the build
-process will fail on current systems like e.g. Debian unstable.
-
-The /bin/python binary is not going to exist anymore. The canonical
-name for the Python 3 binary is, you guess it, /bin/python3. So, let's
-just use this during our build process and go future proof.
-
-Fixes #1158.
-
-[1] https://wiki.debian.org/Python#Python_in_Debian
-[2] https://wiki.debian.org/Python/2Removal
---
- configure.ac                  |    2 +-
- data/convert-icon             |    2 +-
- man/docgen                    |    2 +-
- man/simplecpp                 |    2 +-
- pkg/win32/cp-with-libs        |    2 +-
- textscreen/fonts/convert-font |    2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-Index: chocolate-doom-3.0.1/configure.ac
-===================================================================
--- chocolate-doom-3.0.1.orig/configure.ac
-+++ chocolate-doom-3.0.1/configure.ac
-@@ -16,7 +16,7 @@ orig_CFLAGS="$CFLAGS"
- 
- AC_PROG_CC
- AC_PROG_RANLIB
-AC_CHECK_PROG(HAVE_PYTHON, python, true, false)
-+AC_CHECK_PROG(HAVE_PYTHON, python3, true, false)
- 
- OPT_LEVEL=2
- 
-Index: chocolate-doom-3.0.1/data/convert-icon
-===================================================================
--- chocolate-doom-3.0.1.orig/data/convert-icon
-+++ chocolate-doom-3.0.1/data/convert-icon
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Copyright(C) 2005-2014 Simon Howard
- #
-Index: chocolate-doom-3.0.1/man/docgen
-===================================================================
--- chocolate-doom-3.0.1.orig/man/docgen
-+++ chocolate-doom-3.0.1/man/docgen
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- # 
- # Chocolate Doom self-documentation tool.  This works similar to javadoc
- # or doxygen, but documents command line parameters and configuration
-Index: chocolate-doom-3.0.1/man/simplecpp
-===================================================================
--- chocolate-doom-3.0.1.orig/man/simplecpp
-+++ chocolate-doom-3.0.1/man/simplecpp
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
- # Contributors to the Freedoom project.  All rights reserved.
-Index: chocolate-doom-3.0.1/pkg/win32/cp-with-libs
-===================================================================
--- chocolate-doom-3.0.1.orig/pkg/win32/cp-with-libs
-+++ chocolate-doom-3.0.1/pkg/win32/cp-with-libs
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Copyright(C) 2016 Simon Howard
- #
-Index: chocolate-doom-3.0.1/textscreen/fonts/convert-font
-===================================================================
--- chocolate-doom-3.0.1.orig/textscreen/fonts/convert-font
-+++ chocolate-doom-3.0.1/textscreen/fonts/convert-font
-@@ -1,4 +1,4 @@
-#!/usr/bin/env python
-+#!/usr/bin/env python3
- #
- # Copyright(C) 2016 Simon Howard
- #
--- a/chdoom-iwaddir.diff
+++ b/chdoom-iwaddir.diff
@ -12,11 +12,11 @@ IWADs, and so should chocolate-doom.
 src/d_iwad.c |    4 ++++
 1 file changed, 4 insertions(+)

-Index: chocolate-doom-3.0.0/src/d_iwad.c
+Index: chocolate-doom-chocolate-doom-3.1.0/src/d_iwad.c
 ===================================================================
--- chocolate-doom-3.0.0.orig/src/d_iwad.c
-+++ chocolate-doom-3.0.0/src/d_iwad.c
-@@ -664,6 +664,10 @@ static void AddXdgDirs(void)
+--- chocolate-doom-chocolate-doom-3.1.0.orig/src/d_iwad.c
+++ chocolate-doom-chocolate-doom-3.1.0/src/d_iwad.c
+@@ -690,6 +690,10 @@ static void AddXdgDirs(void)
     // Edition into this directory, under which includes the Doom
     // Classic WADs.
     AddIWADPath(env, "/games/doom3bfg/base/wads");
@ -25,5 +25,5 @@ Index: chocolate-doom-3.0.0/src/d_iwad.c
 +    AddIWADPath(env, "/games/doom");
 +    AddIWADPath(env, "/doom");
 }
- #endif
 
+ #ifndef __MACOSX__
--- a/chocolate-doom-3.0.1.tar.gz
+++ b/chocolate-doom-3.0.1.tar.gz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:d435d6177423491d60be706da9f07d3ab4fabf3e077ec2a3fc216e394fcfc8c7
-size 2514985
--- a/chocolate-doom-3.0.1.tar.gz.asc
+++ b/chocolate-doom-3.0.1.tar.gz.asc
@ -1,16 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-
-iQIzBAABCgAdFiEEbSwRfgMQZkSXqpVG9sLunCM1Q0QFAl70GGwACgkQ9sLunCM1
-Q0Qv2Q/9EvlPiml+vVIU5Ea4ElCCoGTQfRSc/LeaaKRWOXKSaf8YuzzVntxVPYog
-ibUVM/hGwSsqMaeXWLQLe8mtMItUTEK6VlMeLWQ+YZMJf796PtaI2nrrRzwLZQcK
-mzuaMc00mCLCg9vocUx+3iGiawvLoJgYsCAhZJGKaO3Bph9IxZk7tguRAKoUaoKm
-+cp4tT8TLE7+XqfGqWqkaSlaC1t79G+ouSdcou2itke82X7lBva7MD01GerastWj
-llq04Qjr+e4nSz1PWGt18f/3m64GLlnsLFAKaPH1bjlsH9vGwLlVq8TV+2b4Sah9
-8aPYyWkA4Gt3QfHM+SMUwFZI6NqXkkATauzNuQaR9dicF9jfB6ejWbw4xAzpBNu1
-nbXypUax4nI8JaVdjs7e0pSE+O9PBqvp5VPrvIJYl9hbNucT9MQEuXq9tlKHJapb
-PJojU4Z4yedXdlQAwT9xInWSjNE7E4UDaJhFgFWGj3ej7nIqmjmOhUGmGWRP8Yme
-sWJ8VK2fVKHlrIhUgXw76roP4+wxiQOCXMKG4RoWzEjmm5jNTyUCF+sAzyhVscQP
-zCCZ6EA+F/oRlxFbptzh36kuNXGLBaEWLmQruEtIsr6gOVSNcs6pjc1/jg13Ol+4
-uFLNcH0LoQh8rMbM4ZcpvQracwdRUqVRav82zcQ82xzzDr15mSQ=
-=MxGX
-----END PGP SIGNATURE-----
--- a/chocolate-doom-3.1.0.tar.gz
+++ b/chocolate-doom-3.1.0.tar.gz
--- a/chocolate-doom.changes
+++ b/chocolate-doom.changes
@ -1,3 +1,41 @@
+-------------------------------------------------------------------
+Tue Sep 10 08:13:24 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 3.1.0
+  * WAD file autoloading was added
+  * Music pack configuration was simplified. Copy .flac/.ogg
+    music files into a directory and they will be automatically
+    detected by filename and so used.
+  * Music packs can now be used with OPL as a fallback, and music
+    pack config files can have any name ending in `.cfg`.
+  * MP3 music packs are now supported.
+  * Network synchronization now uses a PID controller by default,
+    which makes games more smooth and more stable, especially for
+    Internet play.
+  * UDP hole punching is now used to make servers behind NAT
+    gateways automatically accessible to the Internet.
+  * Allow simultaneous PC speaker emulation and OPL emulation.
+  * The 0 and 5 keys on the number pad can now be bound
+    independently of any other keyboard key.
+  * With aspect ratio correction disabled, the game can scale to
+    any arbitrary size and remove all black borders in full
+    screen mode.
+  * It is now possible to use -response to load response files.
+  * Mouse movement is no longer read when the game window is
+    inactive.
+  * The Freedoom single-player IWAD files are now officially
+    supported, as recent versions changed all levels to be
+    vanilla compatible.
+  * Add native support for the FluidSynth MIDI synthesizer.
+  * Add improved gamepad support via the SDL_GameController
+    interface. This includes support for analog triggers, modern
+    dual-stick default bindings, descriptive button names for
+    common controller types, and configurable dead zones for
+    stick axes.
+  * The -display parameter was added to specify the display
+    number on which to show the screen.
+- Delete 0001-build-use-python3-exclusively.patch (merged)
+
 -------------------------------------------------------------------
 Wed Mar 29 16:33:13 UTC 2023 - Jan Engelhardt <jengelh@inai.de>

--- a/chocolate-doom.spec
+++ b/chocolate-doom.spec
@ -1,7 +1,7 @@
 #
 # spec file for package chocolate-doom
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # 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.0.1
+Version:        3.1.0
 Release:        0
 Summary:        Conservative DOOM/Heretic/Hexen/Strife source port
 License:        GPL-2.0-or-later
@ -25,11 +25,9 @@ Group:          Amusements/Games/3D/Shoot
 URL:            http://chocolate-doom.org/

 #Git-Web:	https://github.com/fragglet/chocolate-doom
-Source:         http://www.chocolate-doom.org/downloads/%version/%name-%version.tar.gz
-Source2:        http://www.chocolate-doom.org/downloads/%version/%name-%version.tar.gz.asc
+Source:         https://github.com/chocolate-doom/chocolate-doom/archive/refs/tags/%name-%version.tar.gz
 Source3:        %name.keyring
 Patch1:         chdoom-iwaddir.diff
-Patch2:         0001-build-use-python3-exclusively.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  fdupes
@ -44,6 +42,8 @@ BuildRequires:  pkgconfig(libpng) >= 1.6.10
 %endif
 BuildRequires:  pkgconfig(samplerate)
 BuildRequires:  pkgconfig(sdl2) >= 2.0.1
+Obsoletes:      %name-bash-completion < %version-%release
+Provides:       %name-bash-completion = %version-%release
 Provides:       chocolate-heretic = %version
 Provides:       chocolate-hexen = %version
 Provides:       chocolate-strife = %version
@ -56,17 +56,8 @@ resolution rendering, and goes as far as to duplicate or recreate
 bugs and crashes found in the DOS executable that were fixed before
 the initial open-sourcing of the Doom engine.

-%package bash-completion
-Summary:        Chocolate Doom command line completion support for bash
-Group:          System/Shells
-BuildArch:      noarch
-Supplements:    (%name and bash-completion)
-
-%description bash-completion
-Additions for bash-completion to support chocolate-doom.
-
 %prep
-%autosetup -p1
+%autosetup -p1 -n %name-%name-%version

 %build
 autoreconf -fi
@ -81,9 +72,9 @@ mkdir -p "$b/%_bindir"
 rm -f "$b/%_docdir/%name/INSTALL"
 rm -f "$b/%_datadir/applications/chocolate-setup.desktop" # has wrong paths
 pushd "$b/%_mandir/man5"
-for i in default heretic hexen strife; do
-	mv "$i.cfg.5" "chocolate-doom-$i.cfg.5"
-done
+#for i in default heretic hexen strife; do
+#	mv "$i.cfg.5" "chocolate-doom-$i.cfg.5"
+#done
 %fdupes %buildroot/%_prefix

 %post
@ -92,12 +83,10 @@ echo "INFO: %name: The global IWAD directory is %_datadir/doom."
 %files
 %_bindir/chocolate-*
 %_mandir/man*/*
-%_datadir/appdata/
 %_datadir/applications/*
+%_datadir/metainfo/*
 %_datadir/icons/*
 %_docdir/chocolate-*/
-
-%files bash-completion
 %_datadir/bash-completion/

 %changelog