Update DolphinSA and DuckstationSA
This commit is contained in:
parent
f2809e907a
commit
e592cbea3d
4 changed files with 31 additions and 20 deletions
|
@ -3,14 +3,14 @@
|
|||
|
||||
PKG_NAME="dolphinsa"
|
||||
PKG_LICENSE="GPLv2"
|
||||
PKG_DEPENDS_TARGET="toolchain libevdev libdrm ffmpeg zlib libpng lzo libusb"
|
||||
PKG_DEPENDS_TARGET="toolchain libevdev libdrm ffmpeg zlib libpng lzo libusb zstd"
|
||||
PKG_LONGDESC="Dolphin is a GameCube / Wii emulator, allowing you to play games for these two platforms on PC with improvements. "
|
||||
|
||||
case ${DEVICE} in
|
||||
RG552|handheld)
|
||||
PKG_SITE="https://github.com/dolphin-emu/dolphin"
|
||||
PKG_URL="${PKG_SITE}.git"
|
||||
PKG_VERSION="d9cd819a76d4f1c171c47cdc81dc2ef7c0adb07f"
|
||||
PKG_VERSION="5479f0e776009d85c509fc6f9874aceeaed9b85b"
|
||||
PKG_PATCH_DIRS+=" new"
|
||||
;;
|
||||
*)
|
||||
|
|
|
@ -1,24 +1,37 @@
|
|||
diff --git a/Source/Core/Core/HW/GCPadEmu.h b/Source/Core/Core/HW/GCPadEmu.h
|
||||
index 66a1aee4e4..a03eaebcd3 100644
|
||||
--- a/Source/Core/Core/HW/GCPadEmu.h
|
||||
+++ b/Source/Core/Core/HW/GCPadEmu.h
|
||||
@@ -65,6 +65,7 @@ public:
|
||||
static constexpr const char* X_BUTTON = "X";
|
||||
static constexpr const char* Y_BUTTON = "Y";
|
||||
static constexpr const char* Z_BUTTON = "Z";
|
||||
+ static constexpr const char* HOTKEY_BUTTON = "Hotkey";
|
||||
static constexpr const char* START_BUTTON = "Start";
|
||||
|
||||
// i18n: The left trigger button (labeled L on real controllers)
|
||||
diff --git a/Source/Core/Core/HW/GCPadEmu.cpp b/Source/Core/Core/HW/GCPadEmu.cpp
|
||||
index c8e7016..fb089c4 100644
|
||||
index 470d2b8c2f..97818b5b67 100644
|
||||
--- a/Source/Core/Core/HW/GCPadEmu.cpp
|
||||
+++ b/Source/Core/Core/HW/GCPadEmu.cpp
|
||||
@@ -26,6 +26,7 @@ static const u16 button_bitmasks[] = {
|
||||
@@ -25,6 +25,7 @@ static const u16 button_bitmasks[] = {
|
||||
PAD_BUTTON_Y,
|
||||
PAD_TRIGGER_Z,
|
||||
PAD_BUTTON_START,
|
||||
+ PAD_BUTTON_HOTKEY,
|
||||
0 // MIC HAX
|
||||
};
|
||||
|
||||
@@ -37,7 +38,7 @@ static const u16 trigger_bitmasks[] = {
|
||||
static const u16 dpad_bitmasks[] = {PAD_BUTTON_UP, PAD_BUTTON_DOWN, PAD_BUTTON_LEFT,
|
||||
PAD_BUTTON_RIGHT};
|
||||
|
||||
-static const char* const named_buttons[] = {"A", "B", "X", "Y", "Z", "Start"};
|
||||
+static const char* const named_buttons[] = {"A", "B", "X", "Y", "Z", "Start", "Hotkey"};
|
||||
|
||||
static const char* const named_triggers[] = {
|
||||
// i18n: The left trigger button (labeled L on real controllers)
|
||||
|
||||
@@ -47,6 +48,9 @@ GCPad::GCPad(const unsigned int index) : m_index(index)
|
||||
// i18n: The START/PAUSE button on GameCube controllers
|
||||
m_buttons->AddInput(ControllerEmu::Translate, START_BUTTON, _trans("START"));
|
||||
|
||||
+ // Hotkey Button
|
||||
+ m_buttons->AddInput(ControllerEmu::Translate, HOTKEY_BUTTON, _trans("HOTKEY"));
|
||||
+
|
||||
// sticks
|
||||
groups.emplace_back(m_main_stick = new ControllerEmu::OctagonAnalogStick(
|
||||
MAIN_STICK_GROUP, _trans("Control Stick"), MAIN_STICK_GATE_RADIUS));
|
||||
diff --git a/Source/Core/DolphinNoGUI/PlatformX11.cpp b/Source/Core/DolphinNoGUI/PlatformX11.cpp
|
||||
index 8dcd93bf52..5d7386da38 100644
|
||||
--- a/Source/Core/DolphinNoGUI/PlatformX11.cpp
|
||||
|
|
|
@ -48,8 +48,9 @@ index 11bbf55da1..71d8960652 100644
|
|||
|
||||
return 0;
|
||||
}
|
||||
|
||||
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp
|
||||
index 913c9956e9..dd09e980cb 100644
|
||||
index 8a02534c57..00d8ac09e8 100644
|
||||
--- a/Source/Core/Core/Core.cpp
|
||||
+++ b/Source/Core/Core/Core.cpp
|
||||
@@ -470,14 +470,26 @@ static void EmuThread(std::unique_ptr<BootParameters> boot, WindowSystemInfo wsi
|
||||
|
@ -87,7 +88,7 @@ index 913c9956e9..dd09e980cb 100644
|
|||
|
||||
BootSessionData boot_session_data = std::move(boot->boot_session_data);
|
||||
const std::optional<std::string>& savestate_path = boot_session_data.GetSavestatePath();
|
||||
@@ -494,16 +506,53 @@ static void EmuThread(std::unique_ptr<BootParameters> boot, WindowSystemInfo wsi
|
||||
@@ -494,13 +506,50 @@ static void EmuThread(std::unique_ptr<BootParameters> boot, WindowSystemInfo wsi
|
||||
Common::SyncSDImageToSDFolder();
|
||||
}};
|
||||
|
||||
|
@ -107,9 +108,6 @@ index 913c9956e9..dd09e980cb 100644
|
|||
+ {
|
||||
+ Wiimote::LoadConfig();
|
||||
+ }
|
||||
|
||||
if (NetPlay::IsNetPlayRunning())
|
||||
NetPlay::SetupWiimotes();
|
||||
}
|
||||
|
||||
- FreeLook::LoadInputConfig();
|
||||
|
|
|
@ -10,7 +10,7 @@ PKG_SHORTDESC="Fast PlayStation 1 emulator for x86-64/AArch32/AArch64 "
|
|||
|
||||
case ${DEVICE} in
|
||||
RG552|handheld)
|
||||
PKG_VERSION="ef3ad91ad0969013bc29ad1276c13aa2842ecc2b"
|
||||
PKG_VERSION="ab1422b69026befb96b8cef9748c8ec2017c6aa1"
|
||||
PKG_PATCH_DIRS+=" new"
|
||||
;;
|
||||
*)
|
||||
|
|
Loading…
Reference in a new issue