aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Engberg <diizzy@FreeBSD.org>2026-10-19 20:39:15 +0000
committerDaniel Engberg <diizzy@FreeBSD.org>2026-10-19 20:58:43 +0000
commit670976738e90dce59390d165c79ee585d3ba959c (patch)
tree3206ade2224f4aa15f4144d0f9813f0f5cf6d7ac
parente03327d560b682ca6af5d8a29955deec7f6e8c6a (diff)
games/wyrmgus: Remove from tree
Broken for more than 5 months, no PR of fixing it
-rw-r--r--MOVED1
-rw-r--r--games/Makefile1
-rw-r--r--games/wyrmgus/Makefile52
-rw-r--r--games/wyrmgus/distinfo3
-rw-r--r--games/wyrmgus/files/patch-260d0ee71b3e8339d159658bb02c2cb1e4ff8def43
-rw-r--r--games/wyrmgus/files/patch-src_map_map.cpp19
-rw-r--r--games/wyrmgus/files/patch-src_map_world.cpp13
-rw-r--r--games/wyrmgus/files/patch-src_stratagus_translator.h11
-rw-r--r--games/wyrmgus/pkg-descr1
9 files changed, 1 insertions, 143 deletions
diff --git a/MOVED b/MOVED
index db0c99e9b27c..8fccd5eb70cc 100644
--- a/MOVED
+++ b/MOVED
@@ -5748,3 +5748,4 @@ deskutils/gnome-todo||2026-10-19|Broken for several months in tree
devel/rubygem-mmap2||2026-10-19|Broken for over a year in tree
filesystems/darling-dmg||2026-10-19|Broken for over a year in tree
games/wyrmsun||2026-10-19|Depends on games/wyrmgus which has been broken for more than 5 months
+games/wyrmgus||2026-10-19|Broken for several months in tree
diff --git a/games/Makefile b/games/Makefile
index c093909632d6..bc1deb308068 100644
--- a/games/Makefile
+++ b/games/Makefile
@@ -1061,7 +1061,6 @@
SUBDIR += worldofpadman
SUBDIR += wtf
SUBDIR += wxlauncher
- SUBDIR += wyrmgus
SUBDIR += xasteroids
SUBDIR += xbat
SUBDIR += xbill
diff --git a/games/wyrmgus/Makefile b/games/wyrmgus/Makefile
deleted file mode 100644
index 7fa9f5397a0d..000000000000
--- a/games/wyrmgus/Makefile
+++ /dev/null
@@ -1,52 +0,0 @@
-PORTNAME= wyrmgus
-PORTVERSION= 5.3.6
-DISTVERSIONPREFIX= v
-PORTREVISION= 1
-CATEGORIES= games devel
-
-MAINTAINER= amdmi3@FreeBSD.org
-COMMENT= Modified Stratagus engine for Wyrmsun
-WWW= https://github.com/Andrettin/Wyrmgus
-
-LICENSE= GPLv2+
-LICENSE_FILE= ${WRKSRC}/COPYING
-
-LIB_DEPENDS= libtolua++-${LUA_VER}.so:lang/tolua++
-BUILD_DEPENDS= ${LOCALBASE}/include/boost/tokenizer.hpp:devel/boost-libs
-
-# recheck with boost >= 1.73
-BROKEN= does not build because boost asio is not compatible with c++20
-
-USE_GITHUB= yes
-GH_ACCOUNT= Andrettin
-GH_PROJECT= Wyrmgus
-
-USES= cmake compiler:c++17-lang lua:51 pkgconfig sdl sqlite qt:5 xorg
-USE_QT= core gui widgets multimedia location \
- quickcontrols quickcontrols2 graphicaleffects \
- qmake:build buildtools:build
-USE_XORG= x11
-USE_SDL= sdl2 mixer2
-CMAKE_ARGS= -DGAMEDIR:STRING="bin" \
- -DTOLUA++_APP:STRING="tolua++-${LUA_VER}" \
- -DTOLUA++_INCLUDE_DIR:STRING="${LUA_INCDIR}" \
- -DTOLUA++_LIBRARY:STRING="${LUA_LIBDIR}/libtolua++.so" \
- -DENABLE_USEGAMEDIR:BOOL=OFF
-
-PORTDOCS= *
-
-PLIST_FILES= bin/${PORTNAME} \
- share/pixmaps/wyrmsun.ico
-
-OPTIONS_DEFINE= OPENGL DOCS
-OPTIONS_DEFAULT=OPENGL
-
-OPENGL_USES= gl
-OPENGL_USE= GL=gl,glu
-OPENGL_CMAKE_ON= -DWITH_RENDERER="OpenGL"
-OPENGL_CMAKE_OFF= -DWITH_RENDERER="NativeSDL"
-
-post-install:
- ${INSTALL_DATA} ${WRKSRC}/src/win32/wyrmsun.ico ${STAGEDIR}${PREFIX}/share/pixmaps/
-
-.include <bsd.port.mk>
diff --git a/games/wyrmgus/distinfo b/games/wyrmgus/distinfo
deleted file mode 100644
index 7139080fc94c..000000000000
--- a/games/wyrmgus/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-TIMESTAMP = 1660163342
-SHA256 (Andrettin-Wyrmgus-v5.3.6_GH0.tar.gz) = d3678d4a01534f2331da879de3c099d36f89e9bb37baa225b5b170b57c9f97c9
-SIZE (Andrettin-Wyrmgus-v5.3.6_GH0.tar.gz) = 1631729
diff --git a/games/wyrmgus/files/patch-260d0ee71b3e8339d159658bb02c2cb1e4ff8def b/games/wyrmgus/files/patch-260d0ee71b3e8339d159658bb02c2cb1e4ff8def
deleted file mode 100644
index 737cbe86ddc1..000000000000
--- a/games/wyrmgus/files/patch-260d0ee71b3e8339d159658bb02c2cb1e4ff8def
+++ /dev/null
@@ -1,43 +0,0 @@
-From 260d0ee71b3e8339d159658bb02c2cb1e4ff8def Mon Sep 17 00:00:00 2001
-From: Andrettin <6322423+Andrettin@users.noreply.github.com>
-Date: Tue, 30 Aug 2022 18:31:42 +0200
-Subject: [PATCH] Fixed in-game game loading
-
----
- src/game/game.cpp | 5 +++++
- src/game/loadgame.cpp | 2 +-
- src/stratagus/mainloop.cpp | 5 -----
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/src/game/game.cpp b/src/game/game.cpp
-index 27184e5d1..d0adcdacf 100644
---- src/game/game.cpp
-+++ src/game/game.cpp
-@@ -866,6 +866,11 @@ boost::asio::awaitable<void> StartMap(const std::filesystem::path &filepath, con
-
- Gui->setTop(oldTop);
- vector::remove(Containers, container);
-+
-+ if (!load_game_file.empty()) {
-+ engine_interface::get()->load_game_deferred(load_game_file);
-+ load_game_file.clear();
-+ }
- } catch (...) {
- std::throw_with_nested(std::runtime_error("Error running map \"" + path::to_string(filepath) + "\"."));
- }
-diff --git a/src/stratagus/mainloop.cpp b/src/stratagus/mainloop.cpp
-index e356e46c8..0da8a174c 100644
---- src/stratagus/mainloop.cpp
-+++ src/stratagus/mainloop.cpp
-@@ -451,11 +451,6 @@ static boost::asio::awaitable<void> SingleGameLoop()
- DisplayLoop();
- co_await GameLogicLoop();
- }
--
-- if (!load_game_file.empty()) {
-- engine_interface::get()->load_game_deferred(load_game_file);
-- load_game_file.clear();
-- }
- }
-
- /**
diff --git a/games/wyrmgus/files/patch-src_map_map.cpp b/games/wyrmgus/files/patch-src_map_map.cpp
deleted file mode 100644
index 99e79113da65..000000000000
--- a/games/wyrmgus/files/patch-src_map_map.cpp
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/map/map.cpp.orig 2021-11-17 14:34:51 UTC
-+++ src/map/map.cpp
-@@ -3759,6 +3759,7 @@ void CMap::clear_paths_between_subtemplates(const int
- const CMapLayer *map_layer = this->MapLayers[z].get();
-
- for (const auto &[subtemplate, subtemplate_rect] : map_layer->subtemplate_areas) {
-+ const auto& subtemplate_ = subtemplate;
- const QPoint min_pos = subtemplate_rect.topLeft();
- const QPoint max_pos = subtemplate_rect.bottomRight();
-
-@@ -3788,7 +3789,7 @@ void CMap::clear_paths_between_subtemplates(const int
- return;
- }
-
-- subtemplate_path_start_points[subtemplate].push_back(std::move(adjacent_pos));
-+ subtemplate_path_start_points[subtemplate_].push_back(std::move(adjacent_pos));
- });
- }
-
diff --git a/games/wyrmgus/files/patch-src_map_world.cpp b/games/wyrmgus/files/patch-src_map_world.cpp
deleted file mode 100644
index b6ba8229f1f5..000000000000
--- a/games/wyrmgus/files/patch-src_map_world.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/map/world.cpp.orig 2022-03-13 19:52:08 UTC
-+++ src/map/world.cpp
-@@ -147,7 +147,9 @@ std::string world::get_encyclopedia_text() const
- ++supertaxon_counts[rank_supertaxon];
- }
-
-- for (const auto &[supertaxon, count] : supertaxon_counts) {
-+ for (const auto &supertaxon_count : supertaxon_counts) {
-+ const auto& supertaxon = supertaxon_count.first;
-+ const auto& count = supertaxon_count.second;
- if (count <= 1) {
- continue;
- }
diff --git a/games/wyrmgus/files/patch-src_stratagus_translator.h b/games/wyrmgus/files/patch-src_stratagus_translator.h
deleted file mode 100644
index f6a8458bfa60..000000000000
--- a/games/wyrmgus/files/patch-src_stratagus_translator.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/stratagus/translator.h.orig 2022-08-08 17:14:50 UTC
-+++ src/stratagus/translator.h
-@@ -26,6 +26,8 @@
-
- #pragma once
-
-+#include <unordered_map>
-+
- #include "util/singleton.h"
-
- #include <QTranslator>
diff --git a/games/wyrmgus/pkg-descr b/games/wyrmgus/pkg-descr
deleted file mode 100644
index 735ddfc8966b..000000000000
--- a/games/wyrmgus/pkg-descr
+++ /dev/null
@@ -1 +0,0 @@
-Modified Stratagus engine for Wyrmsun