From 2dddf4359b0bf88396baaf93ae0a2a04600bc694 Mon Sep 17 00:00:00 2001 From: XargonWan Date: Fri, 16 Sep 2022 20:26:44 +0200 Subject: [PATCH] PPSSPP: maybe moving this up is fixing yuzu on flathub --- net.retrodeck.retrodeck.yml | 174 ++++++++++++++++++------------------ 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/net.retrodeck.retrodeck.yml b/net.retrodeck.retrodeck.yml index dfe3cf40..9f4912ad 100644 --- a/net.retrodeck.retrodeck.yml +++ b/net.retrodeck.retrodeck.yml @@ -401,6 +401,93 @@ modules: url: https://buildbot.libretro.com/stable/1.10.3/linux/x86_64/RetroArch_cores.7z sha256: 33abf39839687f8faba202ed5dcf3a54c06266a49fad35f0521fa445523d009f + # PPSSPP - START + # https://github.com/flathub/org.ppsspp.PPSSPP + + - name: ppsspp + buildsystem: cmake-ninja + config-opts: + - -DUSE_SYSTEM_FFMPEG=OFF # turn this on? + - -DUSE_SYSTEM_LIBZIP=ON + - -DUSE_SYSTEM_ZSTD=ON + + - -DUSE_WAYLAND_WSI=ON + - -DUSING_X11_VULKAN=ON + - -DUSING_QT_UI=OFF + + - -DBUILD_TESTING=OFF + - -DOpenGL_GL_PREFERENCE=GLVND + build-options: + - -DX86_64=ON + sources: + - type: git + url: https://github.com/hrydgard/ppsspp.git + tag: v1.13.2 + commit: 9fe6338e3bf397f8a009a51a282c139dfa180eb6 + x-checker-data: + type: git + tag-pattern: ^v([\d.]+)$ + + # PPSSPP Flathub Workaround - START + # This workaround disables the PPSSPP libraries (disable-submodules: true) and install them separately + # This is only to make it buildable by the flathub builder as normaly it seems not to be needed + disable-submodules: true + - type: git + dest: SDL/macOS + commit: f19a1d54b8a5af6cc378ea307e0ec676922eb4cc + url: https://github.com/hrydgard/ppsspp-mac-sdl + - type: git + dest: assets/debugger + commit: 36ad6b19b22de2075a01a4f0c765e3ef514dc38f + url: https://github.com/unknownbrackets/ppsspp-debugger.git + - type: git + dest: dx9sdk + commit: 7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93 + url: https://github.com/hrydgard/minidx9.git + - type: git + dest: ext/SPIRV-Cross + commit: 9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1 + url: https://github.com/KhronosGroup/SPIRV-Cross.git + - type: git + dest: ext/armips + commit: 7885552b208493a6a0f21663770c446c3ba65576 + url: https://github.com/Kingcom/armips.git + - type: git + dest: ext/discord-rpc + commit: 963aa9f3e5ce81a4682c6ca3d136cddda614db33 + url: https://github.com/discordapp/discord-rpc.git + - type: git + dest: ext/glslang + commit: dc11adde23c455a24e13dd54de9b4ede8bdd7db8 + url: https://github.com/hrydgard/glslang.git + - type: git + dest: ext/miniupnp + commit: 3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e + url: https://github.com/hrydgard/miniupnp.git + - type: git + dest: ext/native/tools/prebuilt + commit: cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a + url: https://github.com/hrydgard/ppsspp-freetype.git + - type: git + dest: ext/rapidjson + commit: 73063f5002612c6bf64fe24f851cd5cc0d83eef9 + disable-submodules: true + url: https://github.com/Tencent/rapidjson.git + - type: git + dest: ext/zstd + commit: a488ba114ec17ea1054b9057c26a046fc122b3b6 + url: https://github.com/facebook/zstd.git + - type: git + dest: ffmpeg + commit: 3ad7ddb9eb2af898dce8c4b5e9a28b77b3f7ddd7 + url: https://github.com/hrydgard/ppsspp-ffmpeg.git + - type: git + dest: pspautotests + commit: 682a4303aba63a50c91ae0fa6928c9dac8ca9b92 + url: https://github.com/hrydgard/pspautotests.git + # PPSSPP Flathub Workaround - END + # PPSSPP - END + # Yuzu - START # https://github.com/flathub/org.yuzu_emu.yuzu # WHEN UPADTING: remember to update rd-submodules/yuzu contents @@ -1200,93 +1287,6 @@ modules: # PRIMEHACK - END - # PPSSPP - START - # https://github.com/flathub/org.ppsspp.PPSSPP - - - name: ppsspp - buildsystem: cmake-ninja - config-opts: - - -DUSE_SYSTEM_FFMPEG=OFF # turn this on? - - -DUSE_SYSTEM_LIBZIP=ON - - -DUSE_SYSTEM_ZSTD=ON - - - -DUSE_WAYLAND_WSI=ON - - -DUSING_X11_VULKAN=ON - - -DUSING_QT_UI=OFF - - - -DBUILD_TESTING=OFF - - -DOpenGL_GL_PREFERENCE=GLVND - build-options: - - -DX86_64=ON - sources: - - type: git - url: https://github.com/hrydgard/ppsspp.git - tag: v1.13.2 - commit: 9fe6338e3bf397f8a009a51a282c139dfa180eb6 - x-checker-data: - type: git - tag-pattern: ^v([\d.]+)$ - - # PPSSPP Flathub Workaround - START - # This workaround disables the PPSSPP libraries (disable-submodules: true) and install them separately - # This is only to make it buildable by the flathub builder as normaly it seems not to be needed - disable-submodules: true - - type: git - dest: SDL/macOS - commit: f19a1d54b8a5af6cc378ea307e0ec676922eb4cc - url: https://github.com/hrydgard/ppsspp-mac-sdl - - type: git - dest: assets/debugger - commit: 36ad6b19b22de2075a01a4f0c765e3ef514dc38f - url: https://github.com/unknownbrackets/ppsspp-debugger.git - - type: git - dest: dx9sdk - commit: 7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93 - url: https://github.com/hrydgard/minidx9.git - - type: git - dest: ext/SPIRV-Cross - commit: 9acb9ec31f5a8ef80ea6b994bb77be787b08d3d1 - url: https://github.com/KhronosGroup/SPIRV-Cross.git - - type: git - dest: ext/armips - commit: 7885552b208493a6a0f21663770c446c3ba65576 - url: https://github.com/Kingcom/armips.git - - type: git - dest: ext/discord-rpc - commit: 963aa9f3e5ce81a4682c6ca3d136cddda614db33 - url: https://github.com/discordapp/discord-rpc.git - - type: git - dest: ext/glslang - commit: dc11adde23c455a24e13dd54de9b4ede8bdd7db8 - url: https://github.com/hrydgard/glslang.git - - type: git - dest: ext/miniupnp - commit: 3a87be33e797ba947b2b2a5f8d087f6c3ff4d93e - url: https://github.com/hrydgard/miniupnp.git - - type: git - dest: ext/native/tools/prebuilt - commit: cbea79dc8fef4d9210e2bac7e7b9b5ff3388197a - url: https://github.com/hrydgard/ppsspp-freetype.git - - type: git - dest: ext/rapidjson - commit: 73063f5002612c6bf64fe24f851cd5cc0d83eef9 - disable-submodules: true - url: https://github.com/Tencent/rapidjson.git - - type: git - dest: ext/zstd - commit: a488ba114ec17ea1054b9057c26a046fc122b3b6 - url: https://github.com/facebook/zstd.git - - type: git - dest: ffmpeg - commit: 3ad7ddb9eb2af898dce8c4b5e9a28b77b3f7ddd7 - url: https://github.com/hrydgard/ppsspp-ffmpeg.git - - type: git - dest: pspautotests - commit: 682a4303aba63a50c91ae0fa6928c9dac8ca9b92 - url: https://github.com/hrydgard/pspautotests.git - # PPSSPP Flathub Workaround - END - # PPSSPP - END - # Duckstation - START # https://github.com/flathub/org.duckstation.DuckStation