hammerofthyrion - Build for steamrt (#480)

luxtorpeda-dev · Sep 21, 2021 · b901d40 · b901d40
1 parent 40110e8
commit b901d40
Show file tree

Hide file tree

Showing 5 changed files with 99 additions and 119 deletions.
diff --git a/engines/hammerofthyrion/build.sh b/engines/hammerofthyrion/build.sh
@@ -3,39 +3,14 @@
 # CLONE PHASE
 git clone https://github.com/sezero/uhexen2.git source
 pushd source
-git checkout fdf6f72
+git checkout afce549
 popd
 
-git clone https://github.com/markjeee/libmad.git mad
-pushd mad
-git checkout -f c2f96fa
-# from http://www.linuxfromscratch.org/blfs/view/svn/multimedia/libmad.html
-patch -Np1 -i ../patches/libmad-0.15.1b-fixes-1.patch
-sed "s@AM_CONFIG_HEADER@AC_CONFIG_HEADERS@g" -i configure.ac
-touch NEWS AUTHORS ChangeLog
-autoreconf -fi
-popd
-
-readonly pfx="$PWD/local"
-mkdir -p "$pfx"
-
 # BUILD PHASE
-pushd "mad"
-./configure --prefix="$pfx" --disable-static
-make -j "$(nproc)" install
-popd
-
-pushd "mad"
-./configure --disable-static
-make -j "$(nproc)" install
-popd
-
 pushd "source/engine/hexen2"
 make -j "$(nproc)" glh2
 popd
 
 # COPY PHASE
-mkdir -p "$diststart/9060/dist/lib"
-cp -rfv "$pfx/lib/"*.so* "$diststart/9060/dist/lib"
 cp -rfv "./source/engine/hexen2/glhexen2" "$diststart/9060/dist"
 cp -rfv assets/* "$diststart/9060/dist"
diff --git a/engines/hammerofthyrion/env.sh b/engines/hammerofthyrion/env.sh
@@ -2,4 +2,4 @@
 
 export STEAM_APP_ID_LIST="9060"
 export LICENSE_PATH="./source/docs/COPYING"
-export ADDITIONAL_LICENSES="./mad/COPYING ./mad/COPYRIGHT"
+export LIBRARIES="sdl12compat mad physfs"
diff --git a/engines/hammerofthyrion/patches/libmad-0.15.1b-fixes-1.patch b/engines/hammerofthyrion/patches/libmad-0.15.1b-fixes-1.patch
diff --git a/libraries/sdl12compat/build.sh b/libraries/sdl12compat/build.sh
@@ -15,3 +15,15 @@ cmake \
     ..
 make -j "$(nproc)" install
 popd
+
+pushd "sdl12compat"
+rm -rf build
+mkdir -p build
+cd build
+cmake \
+    ..
+make -j "$(nproc)" install
+popd
+
+cp -rfv "$pfx/lib/"* /usr/lib
+cp -rfv "$pfx/include/"* /usr/include
diff --git a/metadata/packagesruntime.json b/metadata/packagesruntime.json
@@ -1935,6 +1935,90 @@
             "license_link": "https://github.com/dhewm/dhewm3/blob/master/COPYING.txt"
         }
     },
+    "9060": {
+        "game_name": "HeXen II",
+        "download": [
+            {
+                "name": "HeXen II Soundtrack",
+                "url": "https://archive.org/download/HexenIISoundtrackOgg/",
+                "file": "Hexen%20II%20soundtrack%20ogg.zip"
+            },
+            {
+                "name": "hammerofthyrion",
+                "url": "https://github.com/luxtorpeda-dev/packages/releases/download/hammerofthyrion-1/",
+                "file": "hammerofthyrion-9060-1.tar.xz"
+            },
+            {
+                "name": "fteqw",
+                "url": "https://fte.triptohell.info/moodles/linux_amd64/",
+                "file": "fteqw64"
+            },
+            {
+                "name": "ftequakeworld",
+                "url": "https://github.com/luxtorpeda-dev/packages/releases/download/ftequakeworld-6/",
+                "file": "ftequakeworld-common-6.tar.xz",
+                "cache_by_name": true
+            }
+        ],
+        "choices": [
+            {
+                "name": "hammerofthyrion",
+                "download": [
+                    "hammerofthyrion",
+                    "HeXen II Soundtrack"
+                ],
+                "download_config": {
+                    "HeXen II Soundtrack": {
+                        "extract_location": "./data1/music/",
+                        "decode_as_zip": true
+                    }
+                },
+                "command": "./hammerofthyrion.sh"
+            },
+            {
+                "name": "FTE QuakeWorld",
+                "command": "./ftequakeworld.sh",
+                "download": [
+                    "fteqw",
+                    "ftequakeworld",
+                    "HeXen II Soundtrack"
+                ],
+                "download_config": {
+                    "HeXen II Soundtrack": {
+                        "extract_location": "./data1/music/",
+                        "decode_as_zip": true
+                    },
+                    "fteqw": {
+                        "copy_only": true
+                    }
+                }
+            }
+        ],
+        "information": [
+            {
+                "store_link": "https://store.steampowered.com/app/9060/",
+                "engine_name": "Hammer of Thyrion",
+                "engine_link": "https://github.com/sezero/uhexen2",
+                "version": "afce549 (from master)",
+                "comments": "Fixed music, sourced from archive.org. Set Music Mode in in-game options to All Codecs",
+                "author": "d10sfan",
+                "author_link": "https://github.com/d10sfan",
+                "license": "GPLv2",
+                "license_link": "https://github.com/sezero/uhexen2/blob/master/docs/COPYING"
+            },
+            {
+                "store_link": "https://store.steampowered.com/app/9060/",
+                "engine_name": "FTE QuakeWorld",
+                "engine_link": "https://fte.triptohell.info/about",
+                "version": "6028",
+                "comments": "Fixed music, sourced from archive.org.",
+                "author": "d10sfan",
+                "author_link": "https://github.com/d10sfan",
+                "license": "GPLv2",
+                "license_link": "https://sourceforge.net/p/fteqw/code/HEAD/tree/trunk/engine/LICENSE"
+            }
+        ]
+    },
     "9070": {
         "game_name": "DOOM 3: Resurrection of Evil",
         "download": [
@@ -3831,4 +3915,4 @@
             }
         ]
     }
-}
+}