Merge pull request #1237 from fewtarius/dev

Reworking packages as a bit of housekeeping - more to come.

BUILDING.md

@@ -76,7 +76,7 @@ As the distribution is being built, package source are fetched and hosted in thi
 The tools directory contains utility scripts that can be used during the development process, including a simple tool to burn an image to a usb drive or sdcard.
 
 ## Building JELOS
-Building JELOS requires an Ubuntu 22.04 host with approximately 200GB of free space for a single device, or 800GB of free space for a full world build.  Other Linux distributions may be used when building using Docker, however this is untested and unsupported.  We recommend building with no more than 8 cores.
+Building JELOS requires an Ubuntu 22.04 host with 200GB of free space for a single device, or 1TB of free space for a full world build.  Other Linux distributions may be used when building using Docker, however this is untested and unsupported.
 
 ### Cloning the JELOS Sources
 To build JELOS, start by cloning the project git repository.

config/blocklist

@@ -1,7 +1,6 @@
 np2kai # Last major commit before hiatus is broken
 vicesa # Doesn't support updating with the script.
 dolphin-sa # Wayland patch is now broken upstream
-PPSSPPSDL # Build issues that need to be resolved
 melonds-sa # Needs patch updates
 citra-sa-vulkan # Needs build fixes
 duckstation-lr #Libretro Support gone upstream

packages/emulators/libretro/tic80-lr/package.mk

@@ -19,7 +19,7 @@
 #  http://www.gnu.org/copyleft/gpl.html
 ################################################################################
 
-PKG_NAME="TIC-80-lr"
+PKG_NAME="tic80-lr"
 PKG_VERSION="40c5f2d8ef8f221933e9f3fabe3c5e2980e32fee"
 PKG_REV="1"
 PKG_ARCH="any"
@@ -27,7 +27,7 @@ PKG_LICENSE="GPLv3"
 PKG_SITE="https://github.com/nesbox/TIC-80"
 PKG_URL="${PKG_SITE}.git"
 PKG_DEPENDS_HOST="toolchain"
-PKG_DEPENDS_TARGET="toolchain TIC-80-lr:host"
+PKG_DEPENDS_TARGET="toolchain tic80-lr:host"
 PKG_PRIORITY="optional"
 PKG_SECTION="libretro"
 PKG_SHORTDESC="Tic80"

packages/emulators/standalone/ppsspp-sa/package.mk

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 # Copyright (C) 2019-present Shanti Gilbert (https://github.com/shantigilbert)
 # Copyright (C) 2022-present Fewtarius
-PKG_NAME="PPSSPPSDL"
+PKG_NAME="ppsspp-sa"
 PKG_REV="1"
 PKG_ARCH="any"
 PKG_LICENSE="GPLv2"
@@ -90,8 +90,8 @@ pre_make_target() {
 
 makeinstall_target() {
   mkdir -p ${INSTALL}/usr/bin
-  cp ${PKG_DIR}/sources/start_PPSSPPSDL.sh ${INSTALL}/usr/bin
-  cp `find . -name "PPSSPPSDL" | xargs echo` ${INSTALL}/usr/bin/PPSSPPSDL
+  cp ${PKG_DIR}/sources/start_ppsspp.sh ${INSTALL}/usr/bin
+  cp PPSSPPSDL ${INSTALL}/usr/bin/ppsspp
   chmod 0755 ${INSTALL}/usr/bin/*
   ln -sf /storage/.config/ppsspp/assets ${INSTALL}/usr/bin/assets
   mkdir -p ${INSTALL}/usr/config/ppsspp/PSP/SYSTEM

packages/emulators/standalone/ppsspp-sa/sources/start_ppsspp.sh

@@ -6,4 +6,4 @@
 
 ARG=${1//[\\]/}
 export SDL_AUDIODRIVER=alsa          
-PPSSPPSDL "${ARG}"
+ppsspp "${ARG}"

packages/emulators/standalone/vice-sa/package.mk

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Copyright (C) 2020-present Fewtarius
 
-PKG_NAME="vicesa"
+PKG_NAME="vice-sa"
 PKG_VERSION="3.7.1"
 PKG_REV="1"
 PKG_ARCH="any"

packages/jelos/package.mk

@@ -16,7 +16,7 @@ PKG_TOOLCHAIN="make"
 
 PKG_BASEOS="plymouth-lite grep wget util-linux xmlstarlet gnupg gzip patchelf imagemagick \
             terminus-font vim bash pyudev dialog six git dbus-python coreutils \
-            alsa-ucm-conf fbgrab modules system-utils autostart powerstate powertop ectool"
+            alsa-ucm-conf fbgrab modules system-utils autostart quirks powerstate powertop ectool"
 
 PKG_UI="emulationstation es-themes"
 

packages/jelos/sources/scripts/runemu.sh

@@ -305,9 +305,9 @@ then
                         fi
                 ;;
                 "psp")
-                        jslisten set "-9 PPSSPPSDL"
-                        if [ "$EMU" = "PPSSPPSDL" ]; then
-                        RUNTHIS='${TBASH} /usr/bin/start_PPSSPPSDL.sh "${ROMNAME}"'
+                        jslisten set "-9 ppsspp"
+                        if [ "$EMU" = "ppsspp" ]; then
+                        RUNTHIS='${TBASH} /usr/bin/start_ppsspp.sh "${ROMNAME}"'
                         fi
                 ;;
                 "gamecube")

packages/misc/modules/sources/Start PPSSPP.sh

@@ -5,8 +5,8 @@
 
 source /etc/profile
 
-jslisten set "killall PPSSPPSDL"
+jslisten set "killall ppsspp"
 
 cp -f /storage/.config/SDL-GameControllerDB/gamecontrollerdb.txt /storage/.config/ppsspp/assets/gamecontrollerdb.txt
 
-/usr/bin/PPSSPPSDL >/dev/null 2>&1
+/usr/bin/ppsspp >/dev/null 2>&1