From f6c5cb33067ec75165c79b351629c56361bc7135 Mon Sep 17 00:00:00 2001 From: Peter Date: Sat, 24 Feb 2024 18:44:41 +0100 Subject: [PATCH] libretro-scummvm: fix build after repository change --- .../emulation/libretro-scummvm/package.mk | 10 ++++--- ...libretro-Fix-missing-library-version.patch | 10 +++---- ...ummvm.ini-to-writable-save-directory.patch | 26 +++++++++++-------- .../game.libretro.scummvm/package.mk | 2 +- 4 files changed, 27 insertions(+), 21 deletions(-) diff --git a/packages/emulation/libretro-scummvm/package.mk b/packages/emulation/libretro-scummvm/package.mk index 60a8ed51b1..efd5754810 100644 --- a/packages/emulation/libretro-scummvm/package.mk +++ b/packages/emulation/libretro-scummvm/package.mk @@ -2,11 +2,11 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libretro-scummvm" -PKG_VERSION="2a272d90dcf2783c7866b866e43912c05a4bfc4b" -PKG_SHA256="c55f862b1527f74f55108574af8fd3af8ca9d0b672eb07bbbab0ec5bc07a406c" +PKG_VERSION="6fa7403b8b1b6e18e3a3d02120b38aad6a73ad26" +PKG_SHA256="8b636d4a366962c381d8eeb5cc70f5fc598e9039eb2b89e4b006ea3c3f7969a9" PKG_LICENSE="GPLv3" -PKG_SITE="https://github.com/libretro/scummvm-wrapper" -PKG_URL="https://github.com/libretro/scummvm-wrapper/archive/${PKG_VERSION}.tar.gz" +PKG_SITE="https://github.com/libretro/scummvm" +PKG_URL="https://github.com/libretro/scummvm/archive/${PKG_VERSION}.tar.gz" PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="ScummVM with libretro backend." PKG_TOOLCHAIN="make" @@ -25,6 +25,8 @@ pre_make_target() { else PKG_MAKE_OPTS_TARGET+=" platform=${TARGET_NAME}" fi + + cd ${PKG_BUILD}/backends/platform/libretro } makeinstall_target() { diff --git a/packages/emulation/libretro-scummvm/patches/0001-libretro-Fix-missing-library-version.patch b/packages/emulation/libretro-scummvm/patches/0001-libretro-Fix-missing-library-version.patch index ca3bd6e14b..9fa9ba600b 100644 --- a/packages/emulation/libretro-scummvm/patches/0001-libretro-Fix-missing-library-version.patch +++ b/packages/emulation/libretro-scummvm/patches/0001-libretro-Fix-missing-library-version.patch @@ -4,14 +4,14 @@ Date: Tue, 17 Jan 2023 12:13:29 -0800 Subject: [PATCH 1/2] libretro: Fix missing library version --- - src/libretro.cpp | 2 +- + backends/platform/libretro/src/libretro-core.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/libretro.cpp b/src/libretro.cpp +diff --git a/backends/platform/libretro/src/libretro-core.cpp b/backends/platform/libretro/src/libretro-core.cpp index 5b2830a..1aeb141 100644 ---- a/src/libretro.cpp -+++ b/src/libretro.cpp -@@ -114,7 +114,7 @@ void retro_get_system_info(struct retro_system_info *info) { +--- a/backends/platform/libretro/src/libretro-core.cpp ++++ b/backends/platform/libretro/src/libretro-core.cpp +@@ -748,7 +748,7 @@ void retro_get_system_info(struct retro_system_info *info) { #else #define __GIT_VERSION "" #endif diff --git a/packages/emulation/libretro-scummvm/patches/0002-libretro-Move-scummvm.ini-to-writable-save-directory.patch b/packages/emulation/libretro-scummvm/patches/0002-libretro-Move-scummvm.ini-to-writable-save-directory.patch index c370ed709a..72d1e0ecb4 100644 --- a/packages/emulation/libretro-scummvm/patches/0002-libretro-Move-scummvm.ini-to-writable-save-directory.patch +++ b/packages/emulation/libretro-scummvm/patches/0002-libretro-Move-scummvm.ini-to-writable-save-directory.patch @@ -4,22 +4,26 @@ Date: Thu, 28 Oct 2021 16:00:20 -0700 Subject: [PATCH 2/2] libretro: Move scummvm.ini to writable save directory --- - src/libretro-os.cpp | 2 +- + backends/platform/libretro/src/libretro-os-utils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/src/libretro-os.cpp b/src/libretro-os.cpp +diff --git a/backends/platform/libretro/src/libretro-os-utils.cpp b/backends/platform/libretro/src/libretro-os-utils.cpp index 27a442d..3b52467 100644 ---- a/src/libretro-os.cpp -+++ b/src/libretro-os.cpp -@@ -742,7 +742,7 @@ public: - } +--- a/backends/platform/libretro/src/libretro-os-utils.cpp ++++ b/backends/platform/libretro/src/libretro-os-utils.cpp +@@ -57,10 +57,10 @@ void OSystem_libretro::getTimeAndDate(Ti + } - virtual Common::String getDefaultConfigFileName() { -- return s_systemDir + "/scummvm.ini"; -+ return s_saveDir + "/scummvm.ini"; - } + Common::Path OSystem_libretro::getDefaultConfigFileName() { +- if (s_systemDir.empty()) ++ if (s_saveDir.empty()) + return Common::Path("scummvm.ini"); + else +- return Common::Path(s_systemDir).appendComponent("scummvm.ini"); ++ return Common::Path(s_saveDir).appendComponent("scummvm.ini"); + } - virtual void logMessage(LogMessageType::Type type, const char *message) { + void OSystem_libretro::logMessage(LogMessageType::Type type, const char *message) { -- 2.34.1 diff --git a/packages/mediacenter/kodi-binary-addons/game.libretro.scummvm/package.mk b/packages/mediacenter/kodi-binary-addons/game.libretro.scummvm/package.mk index 39cf6904ae..02b66ea232 100644 --- a/packages/mediacenter/kodi-binary-addons/game.libretro.scummvm/package.mk +++ b/packages/mediacenter/kodi-binary-addons/game.libretro.scummvm/package.mk @@ -4,7 +4,7 @@ PKG_NAME="game.libretro.scummvm" PKG_VERSION="2.7.0.38-Nexus" PKG_SHA256="ce9b0762892a304929d7fb5d9abefd587ab51b77bb32149b864ca442048c94e9" -PKG_REV="1" +PKG_REV="2" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="https://github.com/kodi-game/game.libretro.scummvm"