doomsday-engine: init at 2.3.1, doomsday-engine_3: init at 3.0-unstable-2024-01-23

[pluiedev]

Description of changes

Fixes #108391

Tested with the DOOM 1 Shareware WAD and it works well!

Known issues include lack of FMOD support, and possible crash under Wayland (workaround: unset WAYLAND_DISPLAY for 2.x, and set SDL_VIDEODRIVER to x11 for 3.x).

Neither of them have update scripts for now (much to my chagrin). See Mic92/nix-update#257

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 24.11 Release Notes (or backporting 23.11 and 24.05 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

---

Add a 👍 reaction to pull requests you find important.

[matteo-pacini]

@pluiedev The official websites points to a different repo (?):

https://github.com/skyjake/Doomsday-Engine

See Git Repositories here: https://dengine.net/source

Also FYI, on the GitHub repo, 2.3.1 is a quite old tag (2021), and there are more recent commits that are not part of any release (5 months ago).

[pluiedev]

@pluiedev The official websites points to a different repo (?):

Confusingly there are also two different repos for the_Foundation, one on Gitea and one on Codeberg. At this point I have no idea anymore what's supposed to be the "canonical" Git repo to base on

Also FYI, on the GitHub repo, 2.3.1 is a quite old tag (2021), and there are more recent commits that are not part of any release (5 months ago).

We should try to target stable releases if possible. The other commits belong to what the author calls "Doomsday 3", which seems to be still majorly unstable per a blog post I read. Still, we could perhaps package it separately under doomsday-engine3 or something

[matteo-pacini]

@pluiedev it should also be marked as broken on Darwin for two reasons:

1. Clang errors - there's a few of those that can be patched (see patch below), but the big problem is (2)
2. Project relies on an obsolete Darwin framework - QTKit - which has been deprecated by Apple around 10 years ago. That framework is still around in x86_64-darwin, but it definitely won't work on aarch64-darwin.

I've tested it on macOS Sonoma 14.5 (on Apple Silicon) - and does not compile.

Patch for (1)

diff --git a/doomsday/apps/client/src/ui/dialogs/filedownloaddialog.cpp b/doomsday/apps/client/src/ui/dialogs/filedownloaddialog.cpp
index 0d19eb1630..f56979ad96 100644
--- a/doomsday/apps/client/src/ui/dialogs/filedownloaddialog.cpp
+++ b/doomsday/apps/client/src/ui/dialogs/filedownloaddialog.cpp
@@ -21,6 +21,8 @@
 
 #include <de/charsymbols.h>
 
+#include <cmath>
+
 using namespace de;
 
 DENG_GUI_PIMPL(FileDownloadDialog)
@@ -47,7 +49,7 @@ DENG_GUI_PIMPL(FileDownloadDialog)
         if (!bytes.end) return;
 
         auto &indicator = self().progressIndicator();
-        indicator.setProgress(round<int>(100.0 * double(bytes.size())/double(bytes.end)));
+        indicator.setProgress((int)(round(100.0 * double(bytes.size())/double(bytes.end))));
 
         indicator.setText(tr("%1\n" _E(l)_E(F) "%2 file%3 / %4 MB")
                           .arg(message)
diff --git a/doomsday/apps/client/src/ui/widgets/cvarsliderwidget.cpp b/doomsday/apps/client/src/ui/widgets/cvarsliderwidget.cpp
index 2c3a424c00..eb8940b491 100644
--- a/doomsday/apps/client/src/ui/widgets/cvarsliderwidget.cpp
+++ b/doomsday/apps/client/src/ui/widgets/cvarsliderwidget.cpp
@@ -19,6 +19,8 @@
 #include "ui/widgets/cvarsliderwidget.h"
 #include <doomsday/console/var.h>
 
+#include <cmath>
+
 using namespace de;
 using namespace de::ui;
 
@@ -87,6 +89,6 @@ void CVarSliderWidget::setCVarValueFromWidget()
     }
     else
     {
-        CVar_SetInteger(d->var(), round<int>(value()));
+        CVar_SetInteger(d->var(), (int)(round(value())));
     }
 }

You could also allow x86_64-darwin only

[pluiedev]

I think I'm going to mark it as broken on aarch64-darwin for now — x86_64-darwin should be well-supported in the upstream and unless it fails to build, I don't see why not

[pluiedev]

I actually did not realize that the_Foundation was already packaged... oops!

[pluiedev]

I was bored so I also packaged the 3.x version of Doomsday Engine. Was easier than I thought

[getchoo]

mainly recommending some structural changes to generic builder here, based on the nvidia-x11 package - which i've found to be pretty great to work with as a user :)

this should help a bit with overriding and avoid any issues with the top level 2.x and 3.x builders overflowing the limited arguments of the current setup (i.e., if one package adds postConfigure currently, generic.nix would need to be updated to account for that. now though, it'll be used automatically)

edit: we should probably add this generic function to passthru as well

[danwdart]

Awesome, thanks for all this effort. There's a lot for me to learn from this.

[danwdart]

So WAYLAND_DISPLAY= doomsday currently freezes when you push the select wad button with Cannot mix incompatible Qt library (5.15.14) with this library (5.15.12), just checking that this is known.

[pluiedev]

So WAYLAND_DISPLAY= doomsday currently freezes when you push the select wad button with Cannot mix incompatible Qt library (5.15.14) with this library (5.15.12), just checking that this is known.

You probably have Qt libraries installed in your system that are older than the ones available in master, which is what Doomsday (in this PR) is built against. Maybe try updating your system and running it again?

[matteo-pacini]

Not building on Darwin:

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 318552

---

x86_64-darwin

❌ 2 packages failed to build:

• doomsday-engine
• doomsday-engine_3

---

aarch64-darwin

❌ 2 packages failed to build:

• doomsday-engine
• doomsday-engine_3

In both builds, it fails to find the glib-2.0 dependency.