Merge branch 'update-warzone2100' of github.com:luxtorpeda-dev/packages into update-warzone2100

d10sfan · d10sfan · commit 0a419ead149b · 2025-09-17T21:20:15.000-05:00
diff --git a/common/lib.sh b/common/lib.sh
@@ -103,6 +103,14 @@ install_autoconf () {
     autoconf --version
 }
 
+install_cmake () {
+    wget https://github.com/Kitware/CMake/releases/download/v4.1.1/cmake-4.1.1-linux-x86_64.sh
+    chmod +x cmake-4.1.1-linux-x86_64.sh
+    sudo mkdir -p /opt/cmake
+    sudo ./cmake-4.1.1-linux-x86_64.sh --skip-license --prefix=/opt/cmake
+    sudo ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
+}
+
 start_vcpkg () {
     # sets up paths
     export VCPKG_INSTALLED_PATH="$PWD/vcpkg_installed/x64-linux-dynamic"
diff --git a/common/start_build.sh b/common/start_build.sh
@@ -9,6 +9,7 @@ pushd "engines/$ENGINE_NAME"
 process_engine_environment
 setup_dotnet_repository
 setup_openjdk_repository
+install_cmake
 log_environment
 setup_dist_dirs "$STEAM_APP_ID_LIST"
 
diff --git a/engines/classic-rbdoom-3-bfg/build.sh b/engines/classic-rbdoom-3-bfg/build.sh
@@ -11,12 +11,17 @@ git clone https://github.com/MadDeCoDeR/BFA-Assets.git
 pushd BFA-Assets
 popd
 
+export sourcedir="$PWD/source"
+
+pushd source/vcpkg
+git apply "$sourcedir"/.github/tools/openal-fix.patch
+popd
+
 pushd "source/neo"
 mkdir build
 cd build
 cmake \
     -DCMAKE_BUILD_TYPE=Retail \
-    -DSDL2=ON \
     -DCMAKE_PREFIX_PATH="$pfx" \
     --preset=linux-retail \
     ..
diff --git a/engines/classic-rbdoom-3-bfg/env.json b/engines/classic-rbdoom-3-bfg/env.json
@@ -16,5 +16,5 @@
         "python3-jinja2"
     ],
     "GCC_12": true,
-    "COMMIT_HASH": "c41ff30"
+    "COMMIT_HASH": "0e6783f"
 }
diff --git a/engines/cnc-generals/env.json b/engines/cnc-generals/env.json
@@ -14,6 +14,6 @@
     ],
     "LICENSE_PATH": "./source/LICENSE.md",
     "COMMON_PACKAGE": true,
-    "COMMIT_HASH": "071e451",
+    "COMMIT_HASH": "5871e56",
     "GCC_14": true
 }
diff --git a/engines/commander-genius/env.json b/engines/commander-genius/env.json
@@ -3,5 +3,5 @@
         "9180"
     ],
     "LICENSE_PATH": "./source/COPYRIGHT",
-    "COMMIT_TAG": "v3.6.0"
+    "COMMIT_TAG": "v3.6.1"
 }
diff --git a/engines/dii4a/env.json b/engines/dii4a/env.json
@@ -5,5 +5,5 @@
     ],
     "LICENSE_PATH": "./source/LICENSE",
     "COMMON_PACKAGE": true,
-    "COMMIT_HASH": "34a56ea"
+    "COMMIT_HASH": "b6d3ce1"
 }
diff --git a/engines/ecwolf/env.json b/engines/ecwolf/env.json
@@ -6,5 +6,5 @@
     ],
     "LICENSE_PATH": "./source/docs/copyright",
     "COMMON_PACKAGE": true,
-    "COMMIT_TAG": "1.5pre"
+    "COMMIT_TAG": "1.4.2"
 }
diff --git a/engines/eduke32/env.json b/engines/eduke32/env.json
@@ -8,5 +8,5 @@
     ],
     "LICENSE_PATH": "./source/source/duke3d/gpl-2.0.txt",
     "COMMON_PACKAGE": true,
-    "COMMIT_HASH": "126f35c"
+    "COMMIT_HASH": "e5aad18"
 }
diff --git a/engines/exhumed/env.json b/engines/exhumed/env.json
@@ -4,5 +4,5 @@
     ],
     "LICENSE_PATH": "./source/source/exhumed/gpl-2.0.txt",
     "COMMON_PACKAGE": true,
-    "COMMIT_TAG": "r14262"
+    "COMMIT_TAG": "r14267"
 }
diff --git a/engines/ezquake/env.json b/engines/ezquake/env.json
@@ -7,5 +7,5 @@
         "./LICENSE"
     ],
     "COMMON_PACKAGE": true,
-    "COMMIT_TAG": "3.6.6"
+    "COMMIT_TAG": "3.6.7"
 }
diff --git a/engines/gzdoom/assets/run-gzdoom-local.sh b/engines/gzdoom/assets/run-gzdoom-local.sh
@@ -3,8 +3,4 @@
 export SteamDeck=""
 unset SteamDeck
 
-if [ ! -f gzdoom.ini ]; then
-    cp -rfv ./gzdoom_template.ini gzdoom.ini
-fi
-
 LD_LIBRARY_PATH="lib:$LD_LIBRARY_PATH" ./gzdoom "$@" +vid_backend 1
diff --git a/engines/gzdoom/build.sh b/engines/gzdoom/build.sh
@@ -2,7 +2,7 @@
 
 # From https://gitlab.com/luxtorpeda/packages/gzdoom - See LICENSE file for more information
 # CLONE PHASE
-git clone https://github.com/coelckers/gzdoom.git source
+git clone https://github.com/zdoom/gzdoom.git source
 pushd source
 git checkout "$COMMIT_TAG"
 popd
diff --git a/engines/hammerofthyrion/env.json b/engines/hammerofthyrion/env.json
@@ -6,5 +6,5 @@
     "LIBRARIES": [
         "sdl12compat"
     ],
-    "COMMIT_HASH": "641de4a"
+    "COMMIT_HASH": "14c54c0"
 }
diff --git a/engines/ioquake3/build.sh b/engines/ioquake3/build.sh
@@ -9,10 +9,23 @@ git checkout "$COMMIT_HASH"
 popd
 
 # BUILD PHASE
-pushd "source"
-make -j "$(nproc)"
+pushd source
+mkdir build
+cd build
+cmake \
+    -DCMAKE_INSTALL_PREFIX=../../../tmp \
+    -DCMAKE_PREFIX_PATH=../../../tmp \
+    -DBUILD_SERVER=OFF \
+    -DUSE_MUMBLE=OFF \
+    -DUSE_VOIP=OFF \
+    -DUSE_INTERNAL_LIBS=OFF \
+    -G Ninja -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_C_STANDARD_LIBRARIES="-lrt" \
+    -DCMAKE_CXX_STANDARD_LIBRARIES="-lrt" \
+    ..
+cmake --build .
 popd
 
 # COPY PHASE
-COPYDIR="$diststart/common/dist/" make --directory="source" copyfiles
+cp -rfv source/build/Release/* "$diststart/common/dist/"
 cp -rfv assets/* "$diststart/common/dist/"
diff --git a/engines/ioquake3/env.json b/engines/ioquake3/env.json
@@ -9,5 +9,5 @@
         "./LICENSE"
     ],
     "COMMON_PACKAGE": true,
-    "COMMIT_HASH": "7fd46c8"
+    "COMMIT_HASH": "b2a9284"
 }
diff --git a/engines/nblood/env.json b/engines/nblood/env.json
@@ -5,5 +5,5 @@
     ],
     "LICENSE_PATH": "./source/source/blood/gpl-2.0.txt",
     "COMMON_PACKAGE": true,
-    "COMMIT_TAG": "r14262"
+    "COMMIT_TAG": "r14267"
 }
diff --git a/engines/notblood/env.json b/engines/notblood/env.json
@@ -5,6 +5,6 @@
     ],
     "LICENSE_PATH": "./source/source/blood/gpl-2.0.txt",
     "COMMON_PACKAGE": true,
-    "COMMIT_HASH": "1d83125",
+    "COMMIT_HASH": "f78a818",
     "GCC_14": true
 }
diff --git a/engines/onelife/env.json b/engines/onelife/env.json
@@ -6,5 +6,5 @@
     "LIBRARIES": [
         "sdl12compat"
     ],
-    "COMMIT_HASH": "0f86b3f"
+    "COMMIT_HASH": "cd0c6a0"
 }
diff --git a/engines/openxray/env.json b/engines/openxray/env.json
@@ -5,5 +5,5 @@
     ],
     "LICENSE_PATH": "./source/License.txt",
     "COMMON_PACKAGE": true,
-    "COMMIT_HASH": "3541cca"
+    "COMMIT_HASH": "930009c"
 }
diff --git a/engines/rednukem/env.json b/engines/rednukem/env.json
@@ -5,5 +5,5 @@
     ],
     "LICENSE_PATH": "./source/source/rr/gpl-2.0.txt",
     "COMMON_PACKAGE": true,
-    "COMMIT_TAG": "r14262"
+    "COMMIT_TAG": "r14267"
 }
diff --git a/engines/ruffle/env.json b/engines/ruffle/env.json
@@ -13,5 +13,5 @@
         "temurin-11-jdk"
     ],
     "COMMON_PACKAGE": true,
-    "COMMIT_HASH": "7ec3889"
+    "COMMIT_HASH": "eb31658"
 }
diff --git a/engines/voidsw/env.json b/engines/voidsw/env.json
@@ -4,5 +4,5 @@
     ],
     "LICENSE_PATH": "./source/source/sw/gpl-2.0.txt",
     "COMMON_PACKAGE": true,
-    "COMMIT_HASH": "126f35c"
+    "COMMIT_HASH": "e5aad18"
 }
diff --git a/engines/warzone2100/env.json b/engines/warzone2100/env.json
@@ -7,5 +7,5 @@
         "./source/COPYING.NONGPL",
         "./source/COPYING.README"
     ],
-    "COMMIT_TAG": "4.6.0"
+    "COMMIT_TAG": "4.6.1"
 }
diff --git a/engines/yquake2/env.json b/engines/yquake2/env.json
@@ -12,5 +12,5 @@
         "./sdl_gamecontrollerdb/LICENSE"
     ],
     "COMMON_PACKAGE": true,
-    "COMMIT_TAG": "QUAKE2_8_51"
+    "COMMIT_TAG": "QUAKE2_8_60"
 }
diff --git a/libraries/zmusic/build.sh b/libraries/zmusic/build.sh
@@ -3,7 +3,7 @@
 # CLONE PHASE
 git clone https://github.com/coelckers/ZMusic.git zmusic
 pushd zmusic
-git checkout -f 519b76b
+git checkout -f ac3e232
 popd
 
 # BUILD PHASE
diff --git a/metadata/packagessniper_v2.json b/metadata/packagessniper_v2.json
diff --git a/webui/package-lock.json b/webui/package-lock.json
diff --git a/webui/package.json b/webui/package.json

Original file line number	Diff line number	Diff line change
`@@ -16,5 +16,5 @@`
`16`	`16`	`"python3-jinja2"`
`17`	`17`	`],`
`18`	`18`	`"GCC_12": true,`
`19`		`- "COMMIT_HASH": "c41ff30"`
	`19`	`+ "COMMIT_HASH": "0e6783f"`
`20`	`20`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,6 @@`
`14`	`14`	`],`
`15`	`15`	`"LICENSE_PATH": "./source/LICENSE.md",`
`16`	`16`	`"COMMON_PACKAGE": true,`
`17`		`- "COMMIT_HASH": "071e451",`
	`17`	`+ "COMMIT_HASH": "5871e56",`
`18`	`18`	`"GCC_14": true`
`19`	`19`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,5 +3,5 @@`
`3`	`3`	`"9180"`
`4`	`4`	`],`
`5`	`5`	`"LICENSE_PATH": "./source/COPYRIGHT",`
`6`		`- "COMMIT_TAG": "v3.6.0"`
	`6`	`+ "COMMIT_TAG": "v3.6.1"`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,5 +5,5 @@`
`5`	`5`	`],`
`6`	`6`	`"LICENSE_PATH": "./source/LICENSE",`
`7`	`7`	`"COMMON_PACKAGE": true,`
`8`		`- "COMMIT_HASH": "34a56ea"`
	`8`	`+ "COMMIT_HASH": "b6d3ce1"`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@`
`6`	`6`	`],`
`7`	`7`	`"LICENSE_PATH": "./source/docs/copyright",`
`8`	`8`	`"COMMON_PACKAGE": true,`
`9`		`- "COMMIT_TAG": "1.5pre"`
	`9`	`+ "COMMIT_TAG": "1.4.2"`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,5 +8,5 @@`
`8`	`8`	`],`
`9`	`9`	`"LICENSE_PATH": "./source/source/duke3d/gpl-2.0.txt",`
`10`	`10`	`"COMMON_PACKAGE": true,`
`11`		`- "COMMIT_HASH": "126f35c"`
	`11`	`+ "COMMIT_HASH": "e5aad18"`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -4,5 +4,5 @@`
`4`	`4`	`],`
`5`	`5`	`"LICENSE_PATH": "./source/source/exhumed/gpl-2.0.txt",`
`6`	`6`	`"COMMON_PACKAGE": true,`
`7`		`- "COMMIT_TAG": "r14262"`
	`7`	`+ "COMMIT_TAG": "r14267"`
`8`	`8`	`}`