games/pioneer: Updated for version 20250501.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 5 insertions, 118 deletions

diff --git a/games/pioneer/equipment-efb0077.diff b/games/pioneer/equipment-efb0077.diff
deleted file mode 100644
index 2bf931ae2b..0000000000
--- a/games/pioneer/equipment-efb0077.diff
+++ /dev/null
@@ -1,84 +0,0 @@
-diff --git a/data/modules/Equipment/Hyperdrive.lua b/data/modules/Equipment/Hyperdrive.lua
-index e3c8cd5b5e..fec629107b 100644
---- a/data/modules/Equipment/Hyperdrive.lua
-+++ b/data/modules/Equipment/Hyperdrive.lua
-@@ -96,7 +96,7 @@ Equipment.Register("hyperspace.hyperdrive_mil3", HyperdriveType.New {
- 	slot = { type="hyperdrive.military", size=3 },
- 	mass=12.5, volume=15, capabilities={ hyperclass=3 },
- 	fuel_resv_size = 10, factor_eff = 60,
--	price=85000, purchasable=true, tech_level=11,
-+	price=85000, purchasable=true, tech_level="MILITARY",
- 	icon_name="equip_hyperdrive_mil"
- })
- Equipment.Register("hyperspace.hyperdrive_mil4", HyperdriveType.New {
-@@ -104,7 +104,7 @@ Equipment.Register("hyperspace.hyperdrive_mil4", HyperdriveType.New {
- 	slot = { type="hyperdrive.military", size=4 },
- 	mass=32, volume=40, capabilities={ hyperclass=4 },
- 	fuel_resv_size = 30, factor_eff = 48,
--	price=214000, purchasable=true, tech_level=12,
-+	price=214000, purchasable=true, tech_level="MILITARY",
- 	icon_name="equip_hyperdrive_mil"
- })
- Equipment.Register("hyperspace.hyperdrive_mil5", HyperdriveType.New {
-diff --git a/data/pigui/libs/equipment-outfitter.lua b/data/pigui/libs/equipment-outfitter.lua
-index 21bbc21a7c..86a08e592f 100644
---- a/data/pigui/libs/equipment-outfitter.lua
-+++ b/data/pigui/libs/equipment-outfitter.lua
-@@ -196,8 +196,12 @@ end
- --==================
- 
- function Outfitter:stationHasTech(level)
--	level = level == "MILITARY" and 11 or level
--	return self.station.techLevel >= level
-+	if level ~= "MILITARY" then
-+		return self.station.techLevel >= level
-+	else
-+		level = 11
-+		return self.station.techLevel == level
-+	end
- end
- 
- -- Override to support e.g. custom equipment shops
-@@ -490,8 +494,15 @@ function Outfitter:renderCompareRow(label, stat_a, stat_b)
- 	ui.text(label)
- 
- 	local icon_size = Vector2(ui.getTextLineHeight())
-+	local cmp_a, cmp_b = "", ""
-+	if stat_a then
-+		cmp_a = stat_a[3] == "MILITARY" and 11 or stat_a[3]
-+	end
-+	if stat_b then
-+		cmp_b = stat_b[3] == "MILITARY" and 11 or stat_b[3]
-+	end
- 	local color = stat_a and stat_b
--		and compare(stat_a[3], stat_b[3], stat_a[5])
-+		and compare(cmp_a, cmp_b, stat_a[5])
- 		or colors.font
- 
- 	ui.tableNextColumn()
-@@ -500,7 +511,11 @@ function Outfitter:renderCompareRow(label, stat_a, stat_b)
- 		ui.sameLine()
- 
- 		local val, format = stat_a[3], stat_a[4]
--		ui.textColored(color, format(val))
-+		if val ~= "MILITARY" then
-+			ui.textColored(color, format(val))
-+		else
-+			ui.icon(icons.shield_other, icon_size, color)
-+		end
- 	end
- 
- 	ui.tableNextColumn()
-@@ -509,7 +524,11 @@ function Outfitter:renderCompareRow(label, stat_a, stat_b)
- 		ui.sameLine()
- 
- 		local val, format = stat_b[3], stat_b[4]
--		ui.text(format(val))
-+		if val ~= "MILITARY" then
-+			ui.textColored(color, format(val))
-+		else
-+			ui.icon(icons.shield_other, icon_size, color)
-+		end
- 	end
- end
- 
diff --git a/games/pioneer/hyperdrive-db5330e.diff b/games/pioneer/hyperdrive-db5330e.diff
deleted file mode 100644
index 834a47863a..0000000000
--- a/games/pioneer/hyperdrive-db5330e.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- data/modules/Equipment/Types.lua.old	2025-02-06 12:54:42.346204471 +0900
-+++ data/modules/Equipment/Types.lua	2025-02-06 13:13:07.126097752 +0900
-@@ -267,7 +267,7 @@
- 		local amount = ship['nextJumpFuelUse']
- 		ship:unsetprop('nextJumpFuelUse')
- 
--		self.storedFuel = math.max(0, self.storedFuel - amount)
-+		self:SetFuel(ship, math.max(0, self.storedFuel - amount))
- 
- 		if self.byproduct then
- 			local cargoMgr = ship:GetComponent('CargoManager')
diff --git a/games/pioneer/lighting-33158a5.diff b/games/pioneer/lighting-33158a5.diff
deleted file mode 100644
index 63d4de6d4b..0000000000
--- a/games/pioneer/lighting-33158a5.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/src/graphics/opengl/VertexBufferGL.cpp b/src/graphics/opengl/VertexBufferGL.cpp
-index 3b0b0f2817..a96476f237 100644
---- a/src/graphics/opengl/VertexBufferGL.cpp
-+++ b/src/graphics/opengl/VertexBufferGL.cpp
-@@ -20,7 +20,7 @@ namespace Graphics {
- 			case ATTRIB_NORMAL: return 1;
- 			case ATTRIB_DIFFUSE: return 2;
- 			case ATTRIB_UV0: return 3;
--			case ATTRIB_TANGENT: return 4;
-+			case ATTRIB_TANGENT: return 5;
- 			default:
- 				assert(false);
- 				return 0;
diff --git a/games/pioneer/pioneer.SlackBuild b/games/pioneer/pioneer.SlackBuild
index bdc62288a5..2dcf5a8a46 100644
--- a/games/pioneer/pioneer.SlackBuild
+++ b/games/pioneer/pioneer.SlackBuild
@@ -35,8 +35,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=pioneer
-VERSION=${VERSION:-20250203}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-20250501}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -79,11 +79,6 @@ chown -R root:root .
 find -L .  -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \
         \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} +
 
-# Post-release patches (upstream commits)
-patch -p0 < $CWD/hyperdrive-db5330e.diff
-patch -p1 < $CWD/lighting-33158a5.diff
-patch -p1 < $CWD/equipment-efb0077.diff
-
 if [ "${DEBUG:=0}" != 0 ]; then
   RELEASE=Debug
   SLKCFLAGS="$(printf %s "$SLKCFLAGS" | sed 's/-O2/-O0/')"
diff --git a/games/pioneer/pioneer.info b/games/pioneer/pioneer.info
index 6ff3a1fef2..41f103e50f 100644
--- a/games/pioneer/pioneer.info
+++ b/games/pioneer/pioneer.info
@@ -1,8 +1,8 @@
 PRGNAM="pioneer"
-VERSION="20250203"
+VERSION="20250501"
 HOMEPAGE="https://pioneerspacesim.net/"
-DOWNLOAD="https://github.com/pioneerspacesim/pioneer/archive/20250203/pioneer-20250203.tar.gz"
-MD5SUM="6d23fff7337436f0c1a3857dce7b3518"
+DOWNLOAD="https://github.com/pioneerspacesim/pioneer/archive/20250501/pioneer-20250501.tar.gz"
+MD5SUM="824ce90a01b08d4398ac5e1b2a8226ee"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="assimp"