From e1cc0b4c6a243375f38cdb585ddb2ccfc9e843d7 Mon Sep 17 00:00:00 2001 From: theofficialgman <28281419+theofficialgman@users.noreply.github.com> Date: Sun, 7 Jan 2024 00:39:02 -0500 Subject: [PATCH] PPSSPP: latest release 1.16.6 build from source uses QT backend instead of SDL backend like was the case previously (potentially better theming) also add auto-updater work towards https://github.com/Botspot/pi-apps/issues/2160 --- .../updates/PPSSPP (PSP emulator).sh | 6 +++++ apps/PPSSPP (PSP emulator)/credits | 2 +- apps/PPSSPP (PSP emulator)/description | 4 ++-- apps/PPSSPP (PSP emulator)/install | 24 +++++++++++++++++++ apps/PPSSPP (PSP emulator)/install-32 | 19 --------------- apps/PPSSPP (PSP emulator)/install-64 | 18 -------------- apps/PPSSPP (PSP emulator)/uninstall | 6 +++-- 7 files changed, 37 insertions(+), 42 deletions(-) create mode 100755 .github/workflows/updates/PPSSPP (PSP emulator).sh create mode 100755 apps/PPSSPP (PSP emulator)/install delete mode 100755 apps/PPSSPP (PSP emulator)/install-32 delete mode 100755 apps/PPSSPP (PSP emulator)/install-64 diff --git a/.github/workflows/updates/PPSSPP (PSP emulator).sh b/.github/workflows/updates/PPSSPP (PSP emulator).sh new file mode 100755 index 00000000000..194acb49dba --- /dev/null +++ b/.github/workflows/updates/PPSSPP (PSP emulator).sh @@ -0,0 +1,6 @@ +#!/bin/bash + +webVer=$(get_release_raw hrydgard/ppsspp) +all_url="https://github.com/hrydgard/ppsspp/tree/$webVer" + +source $GITHUB_WORKSPACE/.github/workflows/update_github_script.sh \ No newline at end of file diff --git a/apps/PPSSPP (PSP emulator)/credits b/apps/PPSSPP (PSP emulator)/credits index a627c7ecd5d..3460872914e 100644 --- a/apps/PPSSPP (PSP emulator)/credits +++ b/apps/PPSSPP (PSP emulator)/credits @@ -1 +1 @@ -Added to pi-apps by @ryanfortner (Github) +theofficialgman diff --git a/apps/PPSSPP (PSP emulator)/description b/apps/PPSSPP (PSP emulator)/description index 97fd58baceb..126fd4c9687 100644 --- a/apps/PPSSPP (PSP emulator)/description +++ b/apps/PPSSPP (PSP emulator)/description @@ -1,4 +1,4 @@ A PSP emulator that can run PSP games in full HD and can upscale textures also. -To run: Menu > Games > PPSSPP -To run in a terminal: ~/ppsspp/PPSSPPSDL +To run: Menu > Games > PPSSPPQt +To run in a terminal: PPSSPPQt diff --git a/apps/PPSSPP (PSP emulator)/install b/apps/PPSSPP (PSP emulator)/install new file mode 100755 index 00000000000..a546f65b391 --- /dev/null +++ b/apps/PPSSPP (PSP emulator)/install @@ -0,0 +1,24 @@ +#!/bin/bash + +version=v1.16.6 + +# remove deprecated files +rm -f ~/.local/share/applications/ppsspp.desktop ~/ppsspp + +cd /tmp || error "Could not move to /tmp folder" +install_packages build-essential cmake libgl1-mesa-dev libsdl2-dev libsdl2-ttf-dev libvulkan-dev libfontconfig1-dev qt5-qmake \ + qtsystems5-dev qtmultimedia5-dev qttools5-dev-tools libqt5opengl5-dev libcurl4-openssl-dev qtmultimedia5-dev libavcodec-dev \ + libavdevice-dev libavfilter-dev libavformat-dev libavutil-dev libpostproc-dev libswresample-dev libswscale-dev || exit 1 +git_clone https://github.com/hrydgard/ppsspp.git --recurse-submodules --shallow-submodules --depth=1 -b "$version" || exit 1 +cd ppsspp || error "Could not move to ppsspp folder" +mkdir build || error "Could not make build folder" +cd build || error "Could not move to build folder" +# vulkan does not currently work properly (or at all) in SDL or QT backends on Linux https://github.com/hrydgard/ppsspp/pull/13054 https://github.com/hrydgard/ppsspp/issues/11628 +# changing to vulkan in the UI does nothing and OpenGL continues to be used +# enabling it causes no compilation issues and it can not be fully disabled (always shows in the UI) so keep it enabled +cmake .. -DUSING_QT_UI=ON -DUSE_SYSTEM_FFMPEG=ON || error "cmake failed to configure the build" +make -j$(nproc) || error "Could not build ppsspp" +sudo make install || error "Could not install ppsspp" +# update timestamp of top level icon directory to signal icon cache to be refreshed +sudo touch /usr/local/share/icons/hicolor +rm -rf /tmp/ppsspp diff --git a/apps/PPSSPP (PSP emulator)/install-32 b/apps/PPSSPP (PSP emulator)/install-32 deleted file mode 100755 index d04a26439bb..00000000000 --- a/apps/PPSSPP (PSP emulator)/install-32 +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -# Get dependencies -install_packages libgl1-mesa-dev libsdl2-dev libvulkan-dev wget unzip || exit 1 -cd ~/ -rm -f ppsspp.zip -wget -O ppsspp.zip https://github.com/ryanfortner/ppsspp-rpi/releases/download/v1.12.3/ppsspp_1.12.3_armhf.zip || error "Failed to download zip!" -unzip ppsspp.zip || error "Failed to unzip PPSSPP!" -rm -f ppsspp.zip || error "Failed to remove zip!" - -# Desktop entry -echo "[Desktop Entry] -Version=1.0 -Type=Application -Name=PPSSPP -Comment=PSP emulator -Icon=$(dirname "$0")/icon-64.png -Exec=$HOME/ppsspp/PPSSPPSDL -Categories=Game;" > ~/.local/share/applications/ppsspp.desktop || error "Failed to create desktop entry!" - diff --git a/apps/PPSSPP (PSP emulator)/install-64 b/apps/PPSSPP (PSP emulator)/install-64 deleted file mode 100755 index f01dca361e2..00000000000 --- a/apps/PPSSPP (PSP emulator)/install-64 +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -# Get dependencies -install_packages libgl1-mesa-dev libsdl2-dev libvulkan-dev wget unzip || exit 1 -cd ~/ -rm -f ppsspp.zip -wget -O ppsspp.zip https://github.com/ryanfortner/ppsspp-rpi/releases/download/v1.12.3/ppsspp_1.12.3_arm64.zip || error "Failed to download zip!" -unzip ppsspp.zip || error "Failed to unzip PPSSPP!" -rm -f ppsspp.zip || error "Failed to remove zip!" - -# Desktop entry -echo "[Desktop Entry] -Version=1.0 -Type=Application -Name=PPSSPP -Comment=PSP emulator -Icon=$(dirname "$0")/icon-64.png -Exec=$HOME/ppsspp/PPSSPPSDL -Categories=Game;" > ~/.local/share/applications/ppsspp.desktop || error "Failed to create desktop entry!" diff --git a/apps/PPSSPP (PSP emulator)/uninstall b/apps/PPSSPP (PSP emulator)/uninstall index 61f4a0193a6..fa0d032ef57 100755 --- a/apps/PPSSPP (PSP emulator)/uninstall +++ b/apps/PPSSPP (PSP emulator)/uninstall @@ -1,6 +1,8 @@ #!/bin/bash purge_packages || exit 1 -rm -f ~/.local/share/applications/ppsspp.desktop || error "Failed to remove desktop entry!" -rm -rf ~/ppsspp || error "Failed to remove install directory!" +# remove deprecated files +rm -f ~/.local/share/applications/ppsspp.desktop ~/ppsspp + +sudo rm -rf /usr/local/share/icons/hicolor/*/apps/ppsspp* /usr/local/share/mime/packages/ppsspp.xml /usr/local/share/applications/PPSSPPQt.desktop /usr/local/share/ppsspp /usr/local/bin/PPSSPPQt