[Scummvm-git-logs] scummvm master -> 5e9c00964313b99a526c6f9d1a2544923952970f
spleen1981
noreply at scummvm.org
Tue Dec 23 16:21:22 UTC 2025
This automated email contains information about 5 new commits which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .
Summary:
4db977bc40 LIBRETRO: BUILD: remove unneeded USE_CLOUD defs
d22148da6d LIBRETRO: BUILD: fix emscripten build
114d999c69 LIBRETRO: BUILD: fix faad for libnx-aarch64
511c87f641 LIBRETRO: BUILD: fix ps1 build
5e9c009643 LIBRETRO: use Common JSON classes for playlist generation
Commit: 4db977bc40221609aabedb79ad70552c33726e50
https://github.com/scummvm/scummvm/commit/4db977bc40221609aabedb79ad70552c33726e50
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2025-12-23T17:19:00+01:00
Commit Message:
LIBRETRO: BUILD: remove unneeded USE_CLOUD defs
Changed paths:
backends/platform/libretro/Makefile
backends/platform/libretro/Makefile.common
diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile
index b56d3bb0fce..3de7e0703f1 100644
--- a/backends/platform/libretro/Makefile
+++ b/backends/platform/libretro/Makefile
@@ -385,7 +385,6 @@ else ifeq ($(platform), emscripten)
CXXFLAGS += -std=c++11
STATIC_LINKING = 1
USE_LIBCO = 0
- USE_CLOUD = 0
# Windows MSVC 2017 all architectures
else ifneq (,$(findstring windows_msvc2017,$(platform)))
diff --git a/backends/platform/libretro/Makefile.common b/backends/platform/libretro/Makefile.common
index df89acc079c..7d00c280861 100644
--- a/backends/platform/libretro/Makefile.common
+++ b/backends/platform/libretro/Makefile.common
@@ -105,7 +105,7 @@ USE_JPEG = 1
USE_FREETYPE2 = 1
-USE_CLOUD ?= 0
+USE_CLOUD ?=
# Components (defines handled by engines.awk)
USE_THEORADEC ?= 1
Commit: d22148da6de7c6a2971f6235e2d10c5fdaceb552
https://github.com/scummvm/scummvm/commit/d22148da6de7c6a2971f6235e2d10c5fdaceb552
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2025-12-23T17:19:21+01:00
Commit Message:
LIBRETRO: BUILD: fix emscripten build
Changed paths:
backends/platform/libretro/Makefile
diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile
index 3de7e0703f1..b4c764f844f 100644
--- a/backends/platform/libretro/Makefile
+++ b/backends/platform/libretro/Makefile
@@ -381,7 +381,8 @@ else ifeq ($(platform), emscripten)
TARGET := $(TARGET_NAME)_libretro_$(platform).bc
AR_ALONE := emar
AR := emar rcs
- DEFINES += -DEMSCRIPTEN -DUSE_CXX11
+ datadir = /share/scummvm
+ DEFINES += -DEMSCRIPTEN -DUSE_CXX11 -DDATA_PATH=\"$(datadir)\"
CXXFLAGS += -std=c++11
STATIC_LINKING = 1
USE_LIBCO = 0
Commit: 114d999c697ad222f8f59589ea0ec173b3efcd7e
https://github.com/scummvm/scummvm/commit/114d999c697ad222f8f59589ea0ec173b3efcd7e
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2025-12-23T17:19:58+01:00
Commit Message:
LIBRETRO: BUILD: fix faad for libnx-aarch64
Changed paths:
backends/platform/libretro/Makefile
backends/platform/libretro/dependencies.mk
diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile
index b4c764f844f..e786786af94 100644
--- a/backends/platform/libretro/Makefile
+++ b/backends/platform/libretro/Makefile
@@ -204,7 +204,7 @@ else ifeq ($(platform), libnx)
DEFINES += -g -O3 -fPIE -I$(LIBNX)/include/ -ffunction-sections -fdata-sections -ftls-model=local-exec -ffast-math -mcpu=cortex-a57+crc+fp+simd -march=armv8-a -mtune=cortex-a57 -mtp=soft
DEFINES += $(INCDIRS)
DEFINES += -D__SWITCH__ -DHAVE_LIBNX -D__arm64__ -D__ARM_NEON__
- CXXFLAGS := $(ASFLAGS) -std=gnu++11 -fpermissive
+ CXXFLAGS += $(ASFLAGS) -std=gnu++11 -fpermissive
STATIC_LINKING = 1
HAVE_OPENGL := 1
HAVE_NEON := 1
diff --git a/backends/platform/libretro/dependencies.mk b/backends/platform/libretro/dependencies.mk
index 616af1bbff6..448115e9001 100644
--- a/backends/platform/libretro/dependencies.mk
+++ b/backends/platform/libretro/dependencies.mk
@@ -7,7 +7,7 @@ DEPS_SUBMODULES := libretro-deps libretro-common
DEPS_FOLDER_libretro-deps := libretro-deps
DEPS_URL_libretro-deps := https://github.com/libretro/libretro-deps
-DEPS_COMMIT_libretro-deps := abf5246b016569759e7d1b0ea91bb98c2e34d160
+DEPS_COMMIT_libretro-deps := f39fbf0707b02486f1cce42ab9bca019b2fb7a7d
DEPS_FOLDER_libretro-common := libretro-common
DEPS_URL_libretro-common := https://github.com/libretro/libretro-common
Commit: 511c87f641ee9a9a5c3737b90b20fc700157cbb6
https://github.com/scummvm/scummvm/commit/511c87f641ee9a9a5c3737b90b20fc700157cbb6
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2025-12-23T17:20:22+01:00
Commit Message:
LIBRETRO: BUILD: fix ps1 build
Changed paths:
backends/platform/libretro/Makefile
diff --git a/backends/platform/libretro/Makefile b/backends/platform/libretro/Makefile
index e786786af94..3c0421663ea 100644
--- a/backends/platform/libretro/Makefile
+++ b/backends/platform/libretro/Makefile
@@ -179,6 +179,8 @@ else ifneq (,$(filter $(platform), ps3 psl1ght))
DEFINES := -DPLAYSTATION3 -D__PS3__ -DRETRO_IS_BIG_ENDIAN=1 -DRETRO_IS_LITTLE_ENDIAN=0 -DWORDS_BIGENDIAN=1 -mcpu=cell -mno-fp-in-toc -I$(PS3DEV)/ppu/include
ifeq ($(platform), psl1ght)
DEFINES += -D__PSL1GHT__
+ CFLAGS += -mvsx -mvsx-timode
+ CXXFLAGS += -mvsx -mvsx-timode
HAVE_OPENGL := 1
endif
STATIC_LINKING = 1
Commit: 5e9c00964313b99a526c6f9d1a2544923952970f
https://github.com/scummvm/scummvm/commit/5e9c00964313b99a526c6f9d1a2544923952970f
Author: Giovanni Cascione (ing.cascione at gmail.com)
Date: 2025-12-23T17:20:56+01:00
Commit Message:
LIBRETRO: use Common JSON classes for playlist generation
Changed paths:
backends/platform/libretro/src/libretro-options-widget.cpp
diff --git a/backends/platform/libretro/src/libretro-options-widget.cpp b/backends/platform/libretro/src/libretro-options-widget.cpp
index 39ad3905c03..863686ea923 100644
--- a/backends/platform/libretro/src/libretro-options-widget.cpp
+++ b/backends/platform/libretro/src/libretro-options-widget.cpp
@@ -21,8 +21,8 @@
#include "backends/platform/libretro/include/libretro-fs.h"
#include "backends/platform/libretro/include/libretro-os.h"
#include "gui/launcher.h"
-
#include "common/translation.h"
+#include "common/formats/json.h"
enum {
kPlaylistPathCmd = 'pchp',
@@ -142,6 +142,9 @@ bool LibretroOptionsWidget::generatePlaylist(Common::String playlistPath) {
Common::String hookFilePath;
Common::String title;
+ Common::JSONObject root;
+ Common::JSONArray items;
+
/* Create playlist file */
RFILE *playlistFile = filestream_open(Common::String(playlistPath + "/" + CORE_NAME + ".lpl").c_str(), RETRO_VFS_FILE_ACCESS_WRITE, RETRO_VFS_FILE_ACCESS_HINT_NONE);
if (!playlistFile) {
@@ -166,9 +169,14 @@ bool LibretroOptionsWidget::generatePlaylist(Common::String playlistPath) {
LibRetroFilesystemNode corePath(".");
if (cCorePath)
corePath = LibRetroFilesystemNode(Common::String(cCorePath));
- filestream_printf(playlistFile, "{\n \"version\": \"1.5\",\n \"default_core_path\": \"%s\",\n \"default_core_name\": \"ScummVM\",\n \"label_display_mode\": 0,\n \"right_thumbnail_mode\": 2,\n \"left_thumbnail_mode\": 3,\n \"sort_mode\": 0,\n \"items\": [", corePath.exists() ? corePath.getPath().c_str() : "");
- playlistElement = "%s\n {\n \"path\": \"%s\",\n \"label\": \"%s\",\n \"core_path\": \"DETECT\",\n \"core_name\": \"DETECT\",\n \"crc32\": \"DETECT\",\n \"db_name\": \"" CORE_NAME ".lpl\"\n }";
- playlistFooter = "\n ]\n}";
+
+ root["version"] = new Common::JSONValue(Common::String("1.5"));
+ root["default_core_path"] = new Common::JSONValue(corePath.exists() ? corePath.getPath() : Common::String(""));
+ root["default_core_name"] = new Common::JSONValue(Common::String("ScummVM"));
+ root["label_display_mode"] = new Common::JSONValue((long long)0);
+ root["right_thumbnail_mode"] = new Common::JSONValue((long long)2);
+ root["left_thumbnail_mode"] = new Common::JSONValue((long long)3);
+ root["sort_mode"] = new Common::JSONValue((long long)0);
} else
playlistElement = "%s%s\n%s\nDETECT\nDETECT\nDETECT\nScummVM.lpl\n";
@@ -193,11 +201,22 @@ bool LibretroOptionsWidget::generatePlaylist(Common::String playlistPath) {
iter->_value.tryGetVal("description", title);
hookFilePath = hookPath + + "/" + iter->_key.c_str() + "." + CORE_EXTENSIONS;
- filestream_printf(playlistFile, playlistElement.c_str(), separator, hookFilePath.c_str(), title.c_str());
-
- if (isFirstEntry && ConfMan.getInt("libretro_playlist_version", _domain) != kPlaylistFormat6lines) {
- *separator = ',';
- isFirstEntry = false;
+ if (ConfMan.getInt("libretro_playlist_version", _domain) != kPlaylistFormat6lines) {
+ Common::JSONObject item;
+ item["path"] = new Common::JSONValue(hookFilePath);
+ item["label"] = new Common::JSONValue(title);
+ item["core_path"] = new Common::JSONValue(Common::String("DETECT"));
+ item["core_name"] = new Common::JSONValue(Common::String("DETECT"));
+ item["crc32"] = new Common::JSONValue(Common::String("DETECT"));
+ item["db_name"] = new Common::JSONValue(Common::String(CORE_NAME ".lpl"));
+
+ items.push_back(new Common::JSONValue(item));
+ } else {
+ filestream_printf(playlistFile, playlistElement.c_str(), separator, hookFilePath.c_str(), title.c_str());
+ if (isFirstEntry) {
+ *separator = ',';
+ isFirstEntry = false;
+ }
}
/* Create hook file */
@@ -214,7 +233,15 @@ bool LibretroOptionsWidget::generatePlaylist(Common::String playlistPath) {
filestream_close(hookFile);
}
- filestream_printf(playlistFile, playlistFooter.c_str());
+ if (ConfMan.getInt("libretro_playlist_version", _domain) != kPlaylistFormat6lines) {
+ root["items"] = new Common::JSONValue(items);
+ Common::JSONValue *rootVal = new Common::JSONValue(root);
+ Common::String out = Common::JSON::stringify(rootVal);
+ filestream_write(playlistFile, out.c_str(), out.size());
+ delete rootVal;
+ } else {
+ filestream_printf(playlistFile, playlistFooter.c_str());
+ }
filestream_close(playlistFile);
Common::String response;
More information about the Scummvm-git-logs
mailing list