Update Doom data packages (#13215)

2026-03-19 01:46:00 +01:00 · 2025-11-25 07:22:36 +01:00
parent 0093e8ba3c
commit 784075036a
10 changed files with 274 additions and 63 deletions
--- a/games-fps/chexquest/additional-files/chexquest.sh
+++ b/games-fps/chexquest/additional-files/chexquest.sh
@@ -21,23 +21,69 @@ elif [ "$1" = "2" ]; then
 	echo "$wadname selected"
 fi

+# Can only have 3 buttons on these kinds of alerts AFAICT
+
+# Slot 1 is reserved for Chocolate Doom
 if [ $(command -v chocolate-doom) ]; then
 	port1="chocolate-doom"
 	port1name="Chocolate Doom"
 	echo "Chocolate Doom detected"
 fi

-if [ $(command -v GZDoom) ]; then
+# Slot 2 is for PrBoom+
+if [ $(command -v prboom-plus) ]; then
+	if [ "$port1" = "" ]; then
+		port1="prboom-plus"
+		port1name="PrBoom+"
+	elif [ "$port2" = "" ]; then
+		port2="prboom-plus"
+		port2name="PrBoom+"
+	fi
+	echo "PrBoom+ detected"
+fi
+
+# Slot 3 is UZDoom > GZDoom 4 > LZDoom > GZDoom 3
+# But can still populate earlier slots
+if [ $(command -v UZDoom) ]; then
+	if [ "$port1" = "" ]; then
+		port1="UZDoom"
+		port1name=$port1
+	elif [ "$port2" = "" ]; then
+		port2="UZDoom"
+		port2name=$port2
+	elif [ "$port3" = "" ]; then
+		port3="UZDoom"
+		port3name=$port3
+	fi
+	echo "UZDoom detected"
+elif [ $(command -v GZDoom) ]; then
 	if [ "$port1" = "" ]; then
 		port1="GZDoom"
 		port1name=$port1
 	elif [ "$port2" = "" ]; then
 		port2="GZDoom"
 		port2name=$port2
+	elif [ "$port3" = "" ]; then
+		port3="GZDoom"
+		port3name=$port3
 	fi
 	echo "GZDoom detected"
 fi

+if [ $(command -v LZDoom) ]; then
+	if [ "$port1" = "" ]; then
+		port1="LZDoom"
+		port1name=$port1
+	elif [ "$port2" = "" ]; then
+		port2="LZDoom"
+		port2name=$port2
+	elif [ "$port3" = "" ]; then
+		port3="LZDoom"
+		port3name=$port3
+	fi
+	echo "LZDoom detected"
+fi
+
 if [ -e $(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
 	if [ "$port1" = "" ]; then
 		port1="$(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom"
@@ -45,22 +91,23 @@ if [ -e $(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
 	elif [ "$port2" = "" ]; then
 		port2="$(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom"
 		port2name="GZDoom (Legacy)"
+	elif [ "$port3" = "" ]; then
+		port3="$(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port3name="GZDoom (Legacy)"
 	fi
 	echo "GZDoom (Legacy) detected"
-fi
-
-if [ $(command -v prboom-plus) ]; then
+elif [ -e $(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
 	if [ "$port1" = "" ]; then
-		port1="prboom-plus"
-		port1name="PrBoom+"
+		port1="$(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port1name="GZDoom (Legacy)"
 	elif [ "$port2" = "" ]; then
-		port2="prboom-plus"
-		port2name="PrBoom+"
+		port2="$(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port2name="GZDoom (Legacy)"
 	elif [ "$port3" = "" ]; then
-		port3="prboom-plus"
-		port3name="PrBoom+"
+		port3="$(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port3name="GZDoom (Legacy)"
 	fi
-	echo "PrBoom+ detected"
+	echo "GZDoom (Legacy) detected"
 fi

 if [ "$port1" = "" ]; then
--- a/games-fps/chexquest/chexquest-1.0.recipe
+++ b/games-fps/chexquest/chexquest-1.0.recipe
@@ -8,7 +8,7 @@ if there are more installed a pop-up to select the preferred one will be shown."
 HOMEPAGE="https://www.chexmix.com/chexquest/"
 COPYRIGHT="1996 - 1997 Digital Café, General Mills"
 LICENSE="Public Domain"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://www.doomlegends.com/chexquest/cqdos.zip"
 CHECKSUM_SHA256="dacb82e7589dd9563303aa8ff3124d8dbebac83bbf8bef7867426c5355f31699"
 SOURCE_DIR=""
--- a/games-fps/chexquest3/additional-files/chexquest3.sh
+++ b/games-fps/chexquest3/additional-files/chexquest3.sh
@@ -1,28 +1,51 @@
 #!/bin/bash

-wad="$(finddir B_SYSTEM_DATA_DIRECTORY)/gzdoom/chex3.wad"
-cmd=""
+wad="$(finddir B_SYSTEM_DATA_DIRECTORY)/doomdata/chex3.wad"

 if [ ! -e $wad ]; then
-	wad="$(finddir B_USER_DATA_DIRECTORY)/gzdoom/chex3.wad"
+	wad="$(finddir B_USER_DATA_DIRECTORY)/doomdata/chex3.wad"
 	if [ ! -e $wad ]; then
 		alert --stop "Game data not found!"
 		exit 1
 	fi
 fi

-if [ $(command -v GZDoom) ]; then
+# UZDoom > GZDoom
+if [ $(command -v UZDoom) ]; then
+	cmd="UZDoom"
+	echo "UZDoom detected"
+elif [ $(command -v GZDoom) ]; then
 	cmd="GZDoom"
 	echo "GZDoom v4 detected"
-elif [ -e $(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
-	cmd="$(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom"
-	echo "Legacy GZDoom found in system"
-elif [ -e $(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
-	cmd="$(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom"
-	echo "Legacy GZDoom found in home"
-else
-	alert --stop "GZDoom binary not found!"
+fi
+
+# LZDoom is set as a secondary option if modern UZDoom/GZDoom is present
+# And takes precedence over legacy GZDoom (x86)
+if [ $(command -v LZDoom) ]; then
+	if [ "$cmd" = "" ]; then
+		cmd="LZDoom"
+	else
+		cmd2="LZDoom"
+	fi
+	echo "LZDoom detected"
+elif [ "$cmd" = "" ]; then
+	if [ -e $(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
+		cmd="$(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom"
+		echo "Legacy GZDoom found in system"
+	elif [ -e $(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
+		cmd="$(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom"
+		echo "Legacy GZDoom found in home"
+	fi
+fi
+
+if [ "$cmd" = "" ]; then
+	alert --stop "ZDoom-compatible binary not found!"
 	exit 1
 fi

+# This will only show up on 64bit, legacy GZDoom is skipped on purpose (and its $cmd would mess up the dialog)
+if [ "$cmd2" = "LZDoom" ]; then
+	cmd=$(alert --idea "Multiple ZDoom source ports detected. Choose one to use with Chex Quest 3" "$cmd" "$cmd2")
+fi
+
 $cmd -iwad $wad $@
--- a/games-fps/chexquest3/chexquest3-1.4.recipe
+++ b/games-fps/chexquest3/chexquest3-1.4.recipe
@@ -13,7 +13,7 @@ COPYRIGHT="
 	2008 - 2009 Charles Jacobi & Contributors
 	"
 LICENSE="Public Domain"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://www.chexquest3.com/downloads/ChexQuest3_v1.4.zip"
 CHECKSUM_SHA256="29abab521cf9de4cc561afb84cf804793d90f1cf40f6384e19b34f72923dd446"
 SOURCE_DIR=""
@@ -29,13 +29,13 @@ PROVIDES="
 	chexquest3 = $portVersion
 	"
 REQUIRES="
-	app:GZDoom
+	engine:zdoom
 	"

 INSTALL()
 {
 	# Pack game data
-	mkdir -p $dataDir/gzdoom && cp chex3.wad $dataDir/gzdoom
+	mkdir -p $dataDir/doomdata && cp chex3.wad $dataDir/doomdata

 	# Pack docs
 	mkdir -p $docDir && cp -t $docDir *.txt
--- a/games-fps/doom_shareware/additional-files/doom_shareware.sh
+++ b/games-fps/doom_shareware/additional-files/doom_shareware.sh
@@ -11,23 +11,69 @@ if [ ! -e $wad ]; then
 	fi
 fi

+# Can only have 3 buttons on these kinds of alerts AFAICT
+
+# Slot 1 is reserved for Chocolate Doom
 if [ $(command -v chocolate-doom) ]; then
 	port1="chocolate-doom"
 	port1name="Chocolate Doom"
 	echo "Chocolate Doom detected"
 fi

-if [ $(command -v GZDoom) ]; then
+# Slot 2 is for PrBoom+
+if [ $(command -v prboom-plus) ]; then
+	if [ "$port1" = "" ]; then
+		port1="prboom-plus"
+		port1name="PrBoom+"
+	elif [ "$port2" = "" ]; then
+		port2="prboom-plus"
+		port2name="PrBoom+"
+	fi
+	echo "PrBoom+ detected"
+fi
+
+# Slot 3 is UZDoom > GZDoom 4 > LZDoom > GZDoom 3
+# But can still populate earlier slots
+if [ $(command -v UZDoom) ]; then
+	if [ "$port1" = "" ]; then
+		port1="UZDoom"
+		port1name=$port1
+	elif [ "$port2" = "" ]; then
+		port2="UZDoom"
+		port2name=$port2
+	elif [ "$port3" = "" ]; then
+		port3="UZDoom"
+		port3name=$port3
+	fi
+	echo "UZDoom detected"
+elif [ $(command -v GZDoom) ]; then
 	if [ "$port1" = "" ]; then
 		port1="GZDoom"
 		port1name=$port1
 	elif [ "$port2" = "" ]; then
 		port2="GZDoom"
 		port2name=$port2
+	elif [ "$port3" = "" ]; then
+		port3="GZDoom"
+		port3name=$port3
 	fi
 	echo "GZDoom detected"
 fi

+if [ $(command -v LZDoom) ]; then
+	if [ "$port1" = "" ]; then
+		port1="LZDoom"
+		port1name=$port1
+	elif [ "$port2" = "" ]; then
+		port2="LZDoom"
+		port2name=$port2
+	elif [ "$port3" = "" ]; then
+		port3="LZDoom"
+		port3name=$port3
+	fi
+	echo "LZDoom detected"
+fi
+
 if [ -e $(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
 	if [ "$port1" = "" ]; then
 		port1="$(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom"
@@ -35,22 +81,23 @@ if [ -e $(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
 	elif [ "$port2" = "" ]; then
 		port2="$(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom"
 		port2name="GZDoom (Legacy)"
+	elif [ "$port3" = "" ]; then
+		port3="$(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port3name="GZDoom (Legacy)"
 	fi
 	echo "GZDoom (Legacy) detected"
-fi
-
-if [ $(command -v prboom-plus) ]; then
+elif [ -e $(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
 	if [ "$port1" = "" ]; then
-		port1="prboom-plus"
-		port1name="PrBoom+"
+		port1="$(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port1name="GZDoom (Legacy)"
 	elif [ "$port2" = "" ]; then
-		port2="prboom-plus"
-		port2name="PrBoom+"
+		port2="$(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port2name="GZDoom (Legacy)"
 	elif [ "$port3" = "" ]; then
-		port3="prboom-plus"
-		port3name="PrBoom+"
+		port3="$(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port3name="GZDoom (Legacy)"
 	fi
-	echo "PrBoom+ detected"
+	echo "GZDoom (Legacy) detected"
 fi

 if [ "$port1" = "" ]; then
--- a/games-fps/doom_shareware/doom_shareware-1.9.recipe
+++ b/games-fps/doom_shareware/doom_shareware-1.9.recipe
@@ -8,7 +8,7 @@ if there are more installed a pop-up to select the preferred one will be shown."
 HOMEPAGE="https://www.doomworld.com/classicdoom/"
 COPYRIGHT="1993 - 1995 Id Software"
 LICENSE="Public Domain"
-REVISION="2"
+REVISION="3"
 SOURCE_URI="https://archive.org/download/DoomsharewareEpisode/DoomV1.9sw1995idSoftwareInc.action.zip"
 CHECKSUM_SHA256="63ad7609f2e951fb2198f682e1226f003946c75c00b9785fa967ffb12c6745f7"
 SOURCE_DIR=""
--- a/games-fps/freedoom/additional-files/freedoom.sh
+++ b/games-fps/freedoom/additional-files/freedoom.sh
@@ -23,23 +23,69 @@ elif [ "$1" = "2" ]; then
 	echo "$wadname selected"
 fi

+# Can only have 3 buttons on these kinds of alerts AFAICT
+
+# Slot 1 is reserved for Chocolate Doom
 if [ $(command -v chocolate-doom) ]; then
 	port1="chocolate-doom"
 	port1name="Chocolate Doom"
 	echo "Chocolate Doom detected"
 fi

-if [ $(command -v GZDoom) ]; then
+# Slot 2 is for PrBoom+
+if [ $(command -v prboom-plus) ]; then
+	if [ "$port1" = "" ]; then
+		port1="prboom-plus"
+		port1name="PrBoom+"
+	elif [ "$port2" = "" ]; then
+		port2="prboom-plus"
+		port2name="PrBoom+"
+	fi
+	echo "PrBoom+ detected"
+fi
+
+# Slot 3 is UZDoom > GZDoom 4 > LZDoom > GZDoom 3
+# But can still populate earlier slots
+if [ $(command -v UZDoom) ]; then
+	if [ "$port1" = "" ]; then
+		port1="UZDoom"
+		port1name=$port1
+	elif [ "$port2" = "" ]; then
+		port2="UZDoom"
+		port2name=$port2
+	elif [ "$port3" = "" ]; then
+		port3="UZDoom"
+		port3name=$port3
+	fi
+	echo "UZDoom detected"
+elif [ $(command -v GZDoom) ]; then
 	if [ "$port1" = "" ]; then
 		port1="GZDoom"
 		port1name=$port1
 	elif [ "$port2" = "" ]; then
 		port2="GZDoom"
 		port2name=$port2
+	elif [ "$port3" = "" ]; then
+		port3="GZDoom"
+		port3name=$port3
 	fi
 	echo "GZDoom detected"
 fi

+if [ $(command -v LZDoom) ]; then
+	if [ "$port1" = "" ]; then
+		port1="LZDoom"
+		port1name=$port1
+	elif [ "$port2" = "" ]; then
+		port2="LZDoom"
+		port2name=$port2
+	elif [ "$port3" = "" ]; then
+		port3="LZDoom"
+		port3name=$port3
+	fi
+	echo "LZDoom detected"
+fi
+
 if [ -e $(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
 	if [ "$port1" = "" ]; then
 		port1="$(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom"
@@ -47,22 +93,23 @@ if [ -e $(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
 	elif [ "$port2" = "" ]; then
 		port2="$(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom"
 		port2name="GZDoom (Legacy)"
+	elif [ "$port3" = "" ]; then
+		port3="$(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port3name="GZDoom (Legacy)"
 	fi
 	echo "GZDoom (Legacy) detected"
-fi
-
-if [ $(command -v prboom-plus) ]; then
+elif [ -e $(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
 	if [ "$port1" = "" ]; then
-		port1="prboom-plus"
-		port1name="PrBoom+"
+		port1="$(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port1name="GZDoom (Legacy)"
 	elif [ "$port2" = "" ]; then
-		port2="prboom-plus"
-		port2name="PrBoom+"
+		port2="$(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port2name="GZDoom (Legacy)"
 	elif [ "$port3" = "" ]; then
-		port3="prboom-plus"
-		port3name="PrBoom+"
+		port3="$(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port3name="GZDoom (Legacy)"
 	fi
-	echo "PrBoom+ detected"
+	echo "GZDoom (Legacy) detected"
 fi

 if [ "$port1" = "" ]; then
--- a/games-fps/freedoom/freedoom-0.13.0.recipe
+++ b/games-fps/freedoom/freedoom-0.13.0.recipe
@@ -9,7 +9,7 @@ are more installed a pop-up to select the preferred one will be shown."
 HOMEPAGE="https://freedoom.github.io/"
 COPYRIGHT="2001 - 2024 the Freedoom project"
 LICENSE="BSD (3-clause)"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/freedoom/freedoom/releases/download/v$portVersion/freedoom-$portVersion.zip"
 CHECKSUM_SHA256="3f9b264f3e3ce503b4fb7f6bdcb1f419d93c7b546f4df3e874dd878db9688f59"
 SOURCE_URI_2="https://github.com/freedoom/freedoom/releases/download/v$portVersion/freedm-$portVersion.zip"
--- a/games-fps/hacx/additional-files/hacx.sh
+++ b/games-fps/hacx/additional-files/hacx.sh
@@ -11,23 +11,69 @@ if [ ! -e $wad ]; then
 	fi
 fi

+# Can only have 3 buttons on these kinds of alerts AFAICT
+
+# Slot 1 is reserved for Chocolate Doom
 if [ $(command -v chocolate-doom) ]; then
 	port1="chocolate-doom"
 	port1name="Chocolate Doom"
 	echo "Chocolate Doom detected"
 fi

-if [ $(command -v GZDoom) ]; then
+# Slot 2 is for PrBoom+
+if [ $(command -v prboom-plus) ]; then
+	if [ "$port1" = "" ]; then
+		port1="prboom-plus"
+		port1name="PrBoom+"
+	elif [ "$port2" = "" ]; then
+		port2="prboom-plus"
+		port2name="PrBoom+"
+	fi
+	echo "PrBoom+ detected"
+fi
+
+# Slot 3 is UZDoom > GZDoom 4 > LZDoom > GZDoom 3
+# But can still populate earlier slots
+if [ $(command -v UZDoom) ]; then
+	if [ "$port1" = "" ]; then
+		port1="UZDoom"
+		port1name=$port1
+	elif [ "$port2" = "" ]; then
+		port2="UZDoom"
+		port2name=$port2
+	elif [ "$port3" = "" ]; then
+		port3="UZDoom"
+		port3name=$port3
+	fi
+	echo "UZDoom detected"
+elif [ $(command -v GZDoom) ]; then
 	if [ "$port1" = "" ]; then
 		port1="GZDoom"
 		port1name=$port1
 	elif [ "$port2" = "" ]; then
 		port2="GZDoom"
 		port2name=$port2
+	elif [ "$port3" = "" ]; then
+		port3="GZDoom"
+		port3name=$port3
 	fi
 	echo "GZDoom detected"
 fi

+if [ $(command -v LZDoom) ]; then
+	if [ "$port1" = "" ]; then
+		port1="LZDoom"
+		port1name=$port1
+	elif [ "$port2" = "" ]; then
+		port2="LZDoom"
+		port2name=$port2
+	elif [ "$port3" = "" ]; then
+		port3="LZDoom"
+		port3name=$port3
+	fi
+	echo "LZDoom detected"
+fi
+
 if [ -e $(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
 	if [ "$port1" = "" ]; then
 		port1="$(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom"
@@ -35,22 +81,23 @@ if [ -e $(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
 	elif [ "$port2" = "" ]; then
 		port2="$(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom"
 		port2name="GZDoom (Legacy)"
+	elif [ "$port3" = "" ]; then
+		port3="$(finddir B_SYSTEM_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port3name="GZDoom (Legacy)"
 	fi
 	echo "GZDoom (Legacy) detected"
-fi
-
-if [ $(command -v prboom-plus) ]; then
+elif [ -e $(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom ]; then
 	if [ "$port1" = "" ]; then
-		port1="prboom-plus"
-		port1name="PrBoom+"
+		port1="$(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port1name="GZDoom (Legacy)"
 	elif [ "$port2" = "" ]; then
-		port2="prboom-plus"
-		port2name="PrBoom+"
+		port2="$(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port2name="GZDoom (Legacy)"
 	elif [ "$port3" = "" ]; then
-		port3="prboom-plus"
-		port3name="PrBoom+"
+		port3="$(finddir B_USER_APPS_DIRECTORY)/GZDoom/GZDoom"
+		port3name="GZDoom (Legacy)"
 	fi
-	echo "PrBoom+ detected"
+	echo "GZDoom (Legacy) detected"
 fi

 if [ "$port1" = "" ]; then
--- a/games-fps/hacx/hacx-1.2.recipe
+++ b/games-fps/hacx/hacx-1.2.recipe
@@ -10,7 +10,7 @@ if there are more installed a pop-up to select the preferred one will be shown."
 HOMEPAGE="http://drnostromo.com/hacx/"
 COPYRIGHT="1997 - 2010 Banjo Software Inc. & contributors"
 LICENSE="Public Domain"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="http://drnostromo.com/hacx/files/hacx12.zip"
 CHECKSUM_SHA256="70d25e8f4b48906759db32213927859a99b3b045d3291d468357b225d64cbf8b"
 SOURCE_DIR=""