Merge fec99844cb into 2c92e5b5b3

Flatpak: Upgrade kde runtime to 6.8

Flatpak/SDL2/SDL2.json

@@ -1,22 +0,0 @@
-{
-  "name": "SDL2",
-  "buildsystem": "autotools",
-  "config-opts": ["--disable-static"],
-  "sources": [
-    {
-      "type": "dir",
-      "path": "../../Externals/SDL/SDL"
-    }
-  ],
-  "cleanup": [ "/bin/sdl2-config",
-               "/include",
-               "/lib/libSDL2.la",
-               "/lib/libSDL2main.a",
-               "/lib/libSDL2main.la",
-               "/lib/libSDL2_test.a",
-               "/lib/libSDL2_test.la",
-               "/lib/cmake",
-               "/share/aclocal",
-               "/lib/pkgconfig"]
-}
-

Flatpak/org.DolphinEmu.dolphin-emu.yml

@@ -1,6 +1,6 @@
 app-id: org.DolphinEmu.dolphin-emu
 runtime: org.kde.Platform
-runtime-version: '6.7'
+runtime-version: '6.8'
 sdk: org.kde.Sdk
 command: dolphin-emu-wrapper
 rename-desktop-file: dolphin-emu.desktop
@@ -47,9 +47,6 @@ modules:
         url: https://github.com/Unrud/xdg-screensaver-shim/archive/0.0.2.tar.gz
         sha256: 0ed2a69fe6ee6cbffd2fe16f85116db737f17fb1e79bfb812d893cf15c728399
 
-  # build the vendored SDL2 from Externals until the runtime gets 2.30.6
-  - SDL2/SDL2.json
-
   - name: dolphin-emu
     buildsystem: cmake-ninja
     config-opts:

Source/Core/Core/CMakeLists.txt

@@ -534,6 +534,11 @@ add_library(core
   PowerPC/SignatureDB/MEGASignatureDB.h
   PowerPC/SignatureDB/SignatureDB.cpp
   PowerPC/SignatureDB/SignatureDB.h
+  Scripting/CoreScriptInterface/InternalAPIs/FileUtility_APIs.h
+  Scripting/HelperClasses/InternalAPIDefinitions/FileUtility_API_Implementations.cpp
+  Scripting/HelperClasses/InternalAPIDefinitions/FileUtility_API_Implementations.h
+  Scripting/ScriptUtilities.cpp
+  Scripting/ScriptUtilities.h
   State.cpp
   State.h
   SyncIdentifier.h

Source/Core/Core/Scripting/CoreScriptInterface/InternalAPIs/FileUtility_APIs.h

@@ -0,0 +1,18 @@
+#pragma once
+
+namespace Scripting
+{
+
+// FileUtility_APIs contains the APIs for getting the user directory path and the system directory
+// path for Dolphin.
+typedef struct FileUtility_APIs
+{
+  // Returns the user directory path for Dolphin.
+  const char* (*GetUserDirectoryPath)();
+
+  // Returns the system directory path for Dolphin.
+  const char* (*GetSystemDirectoryPath)();
+
+} FileUtility_APIs;
+
+}  // namespace Scripting

Source/Core/Core/Scripting/HelperClasses/InternalAPIDefinitions/FileUtility_API_Implementations.cpp

@@ -0,0 +1,31 @@
+#include "Core/Scripting/HelperClasses/InternalAPIDefinitions/FileUtility_API_Implementations.h"
+
+#include <string>
+#include "Common/FileUtil.h"
+
+namespace Scripting::FileUtilityAPIsImpl
+{
+FileUtility_APIs fileUtility_APIs = {};
+
+std::string user_directory_path;
+std::string system_directory_path;
+
+void Init()
+{
+  fileUtility_APIs.GetUserDirectoryPath = GetUserDirectoryPath_impl;
+  fileUtility_APIs.GetSystemDirectoryPath = GetSystemDirectoryPath_impl;
+  user_directory_path = File::GetUserPath(D_LOAD_IDX);
+  system_directory_path = File::GetSysDirectory();
+}
+
+const char* GetUserDirectoryPath_impl()
+{
+  return user_directory_path.c_str();
+}
+
+const char* GetSystemDirectoryPath_impl()
+{
+  return system_directory_path.c_str();
+}
+
+}  // namespace Scripting::FileUtilityAPIsImpl

Source/Core/Core/Scripting/HelperClasses/InternalAPIDefinitions/FileUtility_API_Implementations.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "Core/Scripting/CoreScriptInterface/InternalAPIs/FileUtility_APIs.h"
+
+// This file contains the implementations for the APIs in FileUtility_APIs
+namespace Scripting::FileUtilityAPIsImpl
+{
+extern FileUtility_APIs fileUtility_APIs;
+
+void Init();
+
+const char* GetUserDirectoryPath_impl();
+const char* GetSystemDirectoryPath_impl();
+
+}  // namespace Scripting::FileUtilityAPIsImpl

Source/Core/Core/Scripting/ScriptUtilities.cpp

@@ -0,0 +1,19 @@
+#include "Core/Scripting/ScriptUtilities.h"
+
+#include "Core/Scripting/HelperClasses/InternalAPIDefinitions/FileUtility_API_Implementations.h"
+
+namespace Scripting
+{
+
+static bool is_scripting_core_initialized = false;
+
+void InitScriptingCore()
+{
+  if (!is_scripting_core_initialized)
+  {
+    FileUtilityAPIsImpl::Init();
+    is_scripting_core_initialized = true;
+  }
+}
+
+}  // namespace Scripting

Source/Core/Core/Scripting/ScriptUtilities.h

@@ -0,0 +1,8 @@
+#pragma once
+
+namespace Scripting
+{
+
+void InitScriptingCore();
+
+}  // namespace Scripting

Source/Core/DolphinLib.props

@@ -454,6 +454,9 @@
     <ClInclude Include="Core\PowerPC\SignatureDB\DSYSignatureDB.h" />
     <ClInclude Include="Core\PowerPC\SignatureDB\MEGASignatureDB.h" />
     <ClInclude Include="Core\PowerPC\SignatureDB\SignatureDB.h" />
+    <ClInclude Include="Core\Scripting\CoreScriptInterface\InternalAPIs\FileUtility_APIs.h" />
+    <ClInclude Include="Core\Scripting\HelperClasses\InternalAPIDefinitions\FileUtility_API_Implementations.h" />
+    <ClInclude Include="Core\Scripting\ScriptUtilities.h" />
     <ClInclude Include="Core\State.h" />
     <ClInclude Include="Core\SyncIdentifier.h" />
     <ClInclude Include="Core\SysConf.h" />
@@ -1121,6 +1124,8 @@
     <ClCompile Include="Core\PowerPC\SignatureDB\DSYSignatureDB.cpp" />
     <ClCompile Include="Core\PowerPC\SignatureDB\MEGASignatureDB.cpp" />
     <ClCompile Include="Core\PowerPC\SignatureDB\SignatureDB.cpp" />
+    <ClCompile Include="Core\Scripting\HelperClasses\InternalAPIDefinitions\FileUtility_API_Implementations.cpp" />
+    <ClCompile Include="Core\Scripting\ScriptUtilities.cpp" />
     <ClCompile Include="Core\State.cpp" />
     <ClCompile Include="Core\SysConf.cpp" />
     <ClCompile Include="Core\System.cpp" />