getting the scripts up to date

needed to merge them before i could apply the fixes. retropieuser is not able to get to a computer to apply the fixes himself

Author: Exarkuniv

scriptmodules/ports/2s2h.sh

@@ -13,33 +13,23 @@
 rp_module_id="2s2h"
 rp_module_desc="2s2h - 2ship2harkinian is an advanced source port for The Legend of Zelda - Majora's Mask"
 rp_module_help="Save your valid USA .z64 copy of Majora's Mask to $romdir/n64"
-rp_module_repo="git https://github.com/HarbourMasters/2ship2harkinian.git 1.0.1"
+rp_module_repo="git https://github.com/HarbourMasters/2ship2harkinian.git develop"
 rp_module_section="exp"
 rp_module_flags="all"
 
 function depends_2s2h() {
-    getDepends gcc g++ git cmake ninja-build lsb-release libsdl2-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev jq
+    local depends=(gcc g++ git cmake ninja-build lsb-release libsdl2-dev libpng-dev 
+	libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev 
+	libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev jq xorg)
+	
+    getDepends "${depends[@]}"   
+
 }
 
 function sources_2s2h() {
     gitPullOrClone
 }
 
-function increase_swap() {
-    original_swap=$(grep SwapTotal /proc/meminfo | awk '{print $2}')
-    sudo dphys-swapfile swapoff
-    sudo sed -i 's/^CONF_SWAPSIZE=.*/CONF_SWAPSIZE=4096/' /etc/dphys-swapfile
-    sudo dphys-swapfile setup
-    sudo dphys-swapfile swapon
-}
-
-function restore_swap() {
-    sudo dphys-swapfile swapoff
-    sudo sed -i "s/^CONF_SWAPSIZE=.*/CONF_SWAPSIZE=$((original_swap / 1024))/" /etc/dphys-swapfile
-    sudo dphys-swapfile setup
-    sudo dphys-swapfile swapon
-}
-
 function copy_rom_2s2h() {
     local romdir="$home/RetroPie/roms/n64"
     local destdir="$md_build/OTRExporter"
@@ -74,12 +64,12 @@ function build_2s2h() {
         return 1
     fi
 
-    increase_swap
+    rpSwap on 2048
     cmake -H. -Bbuild-cmake -GNinja
-    cmake --build build-cmake --target ExtractAssets
-    cmake --build build-cmake
+    cmake --build build-cmake --target ExtractAssets -j4
+    cmake --build build-cmake -j4
     md_ret_require="$md_build/build-cmake/mm"
-    restore_swap
+    rpSwap off
 }
 
 function install_2s2h() {
@@ -91,6 +81,7 @@ function install_2s2h() {
 }
 
 function configure_2s2h() {
+    local launch_prefix="XINIT-WM:"
 
 # Create the boot .sh file
     cat > "$md_inst/2s2h.sh" << _EOF_
@@ -126,8 +117,10 @@ _EOF_
 }
 _EOF_
     chmod +x "$md_inst/2ship2harkinian.json"
-
-    addPort "$md_id" "2s2h" "2ship2harkinian - Majora's Mask" "$md_inst/2s2h.sh"
-    
+	
     chown -R $user:$user "$md_inst"
+	
+    addPort "$md_id" "2s2h" "2ship2harkinian - Majora's Mask" "$launch_prefix$md_inst/2s2h.sh"
+    
+
 }

scriptmodules/ports/soh.sh

@@ -13,33 +13,22 @@
 rp_module_id="soh"
 rp_module_desc="soh - Ship of Harkinian is an advanced source port for The Legend of Zelda - Ocarina of Time"
 rp_module_help="Save your valid PAL .z64 copy of Ocarina of Time and/or Ocarina of Time Master Quest to $romdir/n64"
-rp_module_repo="git https://github.com/HarbourMasters/Shipwright 8.0.4"
+rp_module_repo="git https://github.com/HarbourMasters/Shipwright develop"
 rp_module_section="exp"
 rp_module_flags="!all 64bit"
 
 function depends_soh() {
-    getDepends gcc g++ git cmake ninja-build libglew-dev lsb-release libsdl2-dev libpng-dev libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev jq
-}
+    local depends=(gcc g++ git cmake ninja-build lsb-release libsdl2-dev libpng-dev 
+	libsdl2-net-dev libzip-dev zipcmp zipmerge ziptool nlohmann-json3-dev 
+	libtinyxml2-dev libspdlog-dev libboost-dev libopengl-dev jq xorg libpulse-dev)
+	
+    getDepends "${depends[@]}"   
 
+}
 function sources_soh() {
     gitPullOrClone
 }
 
-function increase_swap() {
-    original_swap=$(grep SwapTotal /proc/meminfo | awk '{print $2}')
-    sudo dphys-swapfile swapoff
-    sudo sed -i 's/^CONF_SWAPSIZE=.*/CONF_SWAPSIZE=2048/' /etc/dphys-swapfile
-    sudo dphys-swapfile setup
-    sudo dphys-swapfile swapon
-}
-
-function restore_swap() {
-    sudo dphys-swapfile swapoff
-    sudo sed -i "s/^CONF_SWAPSIZE=.*/CONF_SWAPSIZE=$((original_swap / 1024))/" /etc/dphys-swapfile
-    sudo dphys-swapfile setup
-    sudo dphys-swapfile swapon
-}
-
 function check_and_copy_rom() {
     local romdir="$home/RetroPie/roms/n64"
     local destdir="$md_build/OTRExporter"
@@ -74,12 +63,12 @@ function build_soh() {
         return 1
     fi
 
-    increase_swap
+    rpSwap on 2048
     cmake -H. -Bbuild-cmake -GNinja
-    cmake --build build-cmake --target ExtractAssets
-    cmake --build build-cmake
+    cmake --build build-cmake --target ExtractAssets -j3
+    cmake --build build-cmake-j3
     md_ret_require="$md_build/build-cmake/soh"
-    restore_swap
+    rpSwap off
 }
 
 function install_soh() {
@@ -91,17 +80,46 @@ function install_soh() {
 }
 
 function configure_soh() {
+    local launch_prefix="XINIT-WM:"
 
     cat > "$md_inst/soh.sh" << _EOF_
 #!/bin/bash
 
 # Change directory
-cd "$md_conf_root/soh" || exit
+cd "$md_inst" || exit
  
 # Run the soh.elf file
 ./soh.elf
 _EOF_
+
     chmod +x "$md_inst/soh.sh"
 
-    addPort "$md_id" "soh" "Ship of Harkinian - Ocarina of Time" "XINIT-WM:$md_inst/soh.sh"
+    # Create the config file to default to fullscreen
+    cat > "$md_inst/shipofharkinian.json" << _EOF_
+
+    {
+    "Window": {
+        "AudioBackend": "sdl",
+        "Backend": {
+            "Id": 3,
+            "Name": "OpenGL"
+        },
+        "Fullscreen": {
+            "Enabled": true,
+            "Height": 1080,
+            "Width": 1920
+        },
+        "Height": 1080,
+        "PositionX": 0,
+        "PositionY": 0,
+        "Width": 1920
+    }
+
+    }
+_EOF_
+    chmod +x "$md_inst/shipofharkinian.json"
+	
+	chown -R $user:$user "$md_inst"
+
+    addPort "$md_id" "soh" "Ship of Harkinian - Ocarina of Time" "$launch_prefix$md_inst/soh.sh"
 }