Merge remote-tracking branch 'upstream/cooker-0.7.0b' into cooker-0.7.0b-icenine451

This commit is contained in:
icenine451 2023-05-01 09:14:41 -04:00
commit 5ec37a627e
9 changed files with 332 additions and 27 deletions

View file

@ -482,8 +482,8 @@ enable_discord_presence=true
enable_discord_presence\default=true enable_discord_presence\default=true
firstStart=false firstStart=false
firstStart\default=false firstStart\default=false
fullscreen=false fullscreen=true
fullscreen\default=true fullscreen\default=false
hideInactiveMouse=false hideInactiveMouse=false
hideInactiveMouse\default=true hideInactiveMouse\default=true
pauseWhenInBackground=false pauseWhenInBackground=false

View file

@ -1,7 +1,7 @@
"controller_mappings" "controller_mappings"
{ {
"version" "3" "version" "3"
"revision" "1378" "revision" "1423"
"title" "RetroDECK - Official Layout v.0.7" "title" "RetroDECK - Official Layout v.0.7"
"description" "The Official RetroDECK Layout" "description" "The Official RetroDECK Layout"
"creator" "76561197985498748" "creator" "76561197985498748"
@ -12,7 +12,7 @@
"controller_caps" "23117823" "controller_caps" "23117823"
"major_revision" "0" "major_revision" "0"
"minor_revision" "0" "minor_revision" "0"
"Timestamp" "-881676272" "Timestamp" "-593495904"
"actions" "actions"
{ {
"Default" "Default"
@ -7824,6 +7824,211 @@
} }
} }
"group" "group"
{
"id" "218"
"mode" "dpad"
"name" ""
"description" ""
"inputs"
{
"dpad_north"
{
"activators"
{
"Full_Press"
{
"bindings"
{
"binding" "key_press LEFT_SHIFT, , "
"binding" "key_press W, , "
}
}
}
"disabled_activators"
{
}
}
"dpad_south"
{
"activators"
{
"Full_Press"
{
"bindings"
{
"binding" "key_press LEFT_SHIFT, , "
"binding" "key_press S, , "
}
}
}
"disabled_activators"
{
}
}
"dpad_east"
{
"activators"
{
"Full_Press"
{
"bindings"
{
"binding" "xinput_button RSTICK_RIGHT, , "
}
"settings"
{
"repeat_rate" "1000"
"interruptable" "0"
}
}
}
"disabled_activators"
{
}
}
"dpad_west"
{
"activators"
{
"Full_Press"
{
"bindings"
{
"binding" "xinput_button RSTICK_LEFT, , "
}
"settings"
{
"repeat_rate" "1000"
"interruptable" "0"
}
}
}
"disabled_activators"
{
}
}
"click"
{
"activators"
{
"Full_Press"
{
"bindings"
{
"binding" "key_press ESCAPE, , "
}
}
}
"disabled_activators"
{
}
}
}
"settings"
{
"requires_click" "0"
}
}
"group"
{
"id" "219"
"mode" "dpad"
"name" ""
"description" ""
"inputs"
{
"dpad_north"
{
"activators"
{
"Full_Press"
{
"bindings"
{
"binding" "key_press LEFT_SHIFT, , "
"binding" "key_press E, , "
}
}
}
"disabled_activators"
{
}
}
"dpad_south"
{
"activators"
{
"Full_Press"
{
"bindings"
{
"binding" "key_press LEFT_SHIFT, , "
"binding" "key_press Q, , "
}
}
}
"disabled_activators"
{
}
}
"dpad_east"
{
"activators"
{
"Full_Press"
{
"bindings"
{
"binding" "key_press LEFT_SHIFT, , "
"binding" "key_press D, , "
}
}
}
"disabled_activators"
{
}
}
"dpad_west"
{
"activators"
{
"Full_Press"
{
"bindings"
{
"binding" "key_press LEFT_SHIFT, , "
"binding" "key_press A, , "
}
}
}
"disabled_activators"
{
}
}
"click"
{
"activators"
{
"Full_Press"
{
"bindings"
{
"binding" "key_press LEFT_CONTROL, , "
"binding" "key_press TAB, , "
}
}
}
"disabled_activators"
{
}
}
}
"settings"
{
"requires_click" "0"
}
}
"group"
{ {
"id" "34" "id" "34"
"mode" "switches" "mode" "switches"
@ -10374,10 +10579,12 @@
{ {
"19" "switch active" "19" "switch active"
"16" "button_diamond active" "16" "button_diamond active"
"23" "joystick active" "23" "joystick inactive"
"219" "joystick active"
"17" "left_trigger active" "17" "left_trigger active"
"18" "right_trigger active" "18" "right_trigger active"
"22" "right_joystick active" "22" "right_joystick inactive"
"218" "right_joystick active"
"20" "dpad inactive" "20" "dpad inactive"
"21" "dpad active" "21" "dpad active"
"45" "gyro inactive" "45" "gyro inactive"

View file

@ -20,6 +20,8 @@ AudioStretchMaxLatency = 80
DPL2Decoder = False DPL2Decoder = False
DPL2Quality = 2 DPL2Quality = 2
DSPHLE = True DSPHLE = True
WiiSDCardAllowWrites = True
WiiSDCardEnableFolderSync = False
[Display] [Display]
Fullscreen = True Fullscreen = True
DisableScreenSaver = True DisableScreenSaver = True

View file

@ -5,7 +5,6 @@ General/Toggle Pause = @(Ctrl+P)
General/Reset = @(Ctrl+R) General/Reset = @(Ctrl+R)
General/Take Screenshot = @(Ctrl+X) General/Take Screenshot = @(Ctrl+X)
General/Exit = @(Ctrl+Escape) General/Exit = @(Ctrl+Escape)
General/Control NetPlay Golf Mode = @(Alt+G)
Emulation Speed/Decrease Emulation Speed = @(Ctrl+`2`) Emulation Speed/Decrease Emulation Speed = @(Ctrl+`2`)
Emulation Speed/Increase Emulation Speed = @(Ctrl+`1`) Emulation Speed/Increase Emulation Speed = @(Ctrl+`1`)
Emulation Speed/Disable Emulation Speed Limit = @(Ctrl+`0`) Emulation Speed/Disable Emulation Speed Limit = @(Ctrl+`0`)
@ -20,3 +19,6 @@ Other State Hotkeys/Undo Load State = @(Ctrl+`8`)
Other State Hotkeys/Undo Save State = @(Ctrl+`9`) Other State Hotkeys/Undo Save State = @(Ctrl+`9`)
Other State Hotkeys/Increase Selected State Slot = @(Ctrl+K) Other State Hotkeys/Increase Selected State Slot = @(Ctrl+K)
Other State Hotkeys/Decrease Selected State Slot = @(Ctrl+J) Other State Hotkeys/Decrease Selected State Slot = @(Ctrl+J)
General/Toggle Fullscreen = @(Ctrl+Return)
General/Control NetPlay Golf Mode = @(Alt+H)
Wii/Press Sync Button = @(Alt+W)

View file

@ -0,0 +1,82 @@
[Wiimote1]
Device = evdev/0/Microsoft X-Box 360 pad 0
Tilt/Modifier/Range = 50.0
Nunchuk/Stick/Modifier/Range = 50.0
Nunchuk/Tilt/Modifier/Range = 50.0
Classic/Left Stick/Modifier/Range = 50.0
Classic/Right Stick/Modifier/Range = 50.0
Guitar/Stick/Modifier/Range = 50.0
Drums/Stick/Modifier/Range = 50.0
Turntable/Stick/Modifier/Range = 50.0
uDraw/Stylus/Modifier/Range = 50.0
Drawsome/Stylus/Modifier/Range = 50.0
Buttons/A = SOUTH
Buttons/B = EAST
Buttons/1 = WEST
Buttons/2 = NORTH
Buttons/- = SELECT
Buttons/+ = START
Buttons/Home = THUMBR
D-Pad/Up = `Axis 7-`
D-Pad/Down = `Axis 7+`
D-Pad/Left = `Axis 6-`
D-Pad/Right = `Axis 6+`
Extension = Nunchuk
Rumble/Motor = Strong
Nunchuk/Stick/Up = `Axis 1-`
Nunchuk/Stick/Down = `Axis 1+`
Nunchuk/Stick/Left = `Axis 0-`
Nunchuk/Stick/Right = `Axis 0+`
Nunchuk/Buttons/C = TL
Nunchuk/Buttons/Z = `Full Axis 2+`
IR/Auto-Hide = True
Hotkeys/Sideways Toggle = `XInput2/0/Virtual core pointer:Alt`+`XInput2/0/Virtual core pointer:X`
Hotkeys/Upright Toggle = `XInput2/0/Virtual core pointer:Alt_L`+`XInput2/0/Virtual core pointer:Z`
[Wiimote2]
Device = XInput2/0/Virtual core pointer
Tilt/Modifier/Range = 50.0
Nunchuk/Stick/Modifier/Range = 50.0
Nunchuk/Tilt/Modifier/Range = 50.0
Classic/Left Stick/Modifier/Range = 50.0
Classic/Right Stick/Modifier/Range = 50.0
Guitar/Stick/Modifier/Range = 50.0
Drums/Stick/Modifier/Range = 50.0
Turntable/Stick/Modifier/Range = 50.0
uDraw/Stylus/Modifier/Range = 50.0
Drawsome/Stylus/Modifier/Range = 50.0
[Wiimote3]
Device = XInput2/0/Virtual core pointer
Tilt/Modifier/Range = 50.0
Nunchuk/Stick/Modifier/Range = 50.0
Nunchuk/Tilt/Modifier/Range = 50.0
Classic/Left Stick/Modifier/Range = 50.0
Classic/Right Stick/Modifier/Range = 50.0
Guitar/Stick/Modifier/Range = 50.0
Drums/Stick/Modifier/Range = 50.0
Turntable/Stick/Modifier/Range = 50.0
uDraw/Stylus/Modifier/Range = 50.0
Drawsome/Stylus/Modifier/Range = 50.0
[Wiimote4]
Device = XInput2/0/Virtual core pointer
Tilt/Modifier/Range = 50.0
Nunchuk/Stick/Modifier/Range = 50.0
Nunchuk/Tilt/Modifier/Range = 50.0
Classic/Left Stick/Modifier/Range = 50.0
Classic/Right Stick/Modifier/Range = 50.0
Guitar/Stick/Modifier/Range = 50.0
Drums/Stick/Modifier/Range = 50.0
Turntable/Stick/Modifier/Range = 50.0
uDraw/Stylus/Modifier/Range = 50.0
Drawsome/Stylus/Modifier/Range = 50.0
[BalanceBoard]
Device = XInput2/0/Virtual core pointer
Tilt/Modifier/Range = 50.0
Nunchuk/Stick/Modifier/Range = 50.0
Nunchuk/Tilt/Modifier/Range = 50.0
Classic/Left Stick/Modifier/Range = 50.0
Classic/Right Stick/Modifier/Range = 50.0
Guitar/Stick/Modifier/Range = 50.0
Drums/Stick/Modifier/Range = 50.0
Turntable/Stick/Modifier/Range = 50.0
uDraw/Stylus/Modifier/Range = 50.0
Drawsome/Stylus/Modifier/Range = 50.0

View file

@ -5,7 +5,7 @@ General/Toggle Pause = @(Ctrl+P)
General/Reset = @(Ctrl+R) General/Reset = @(Ctrl+R)
General/Take Screenshot = @(Ctrl+X) General/Take Screenshot = @(Ctrl+X)
General/Exit = @(Ctrl+Escape) General/Exit = @(Ctrl+Escape)
General/Control NetPlay Golf Mode = @(Alt+G) General/Control NetPlay Golf Mode = @(Alt+H)
Emulation Speed/Decrease Emulation Speed = @(Ctrl+`2`) Emulation Speed/Decrease Emulation Speed = @(Ctrl+`2`)
Emulation Speed/Increase Emulation Speed = @(Ctrl+`1`) Emulation Speed/Increase Emulation Speed = @(Ctrl+`1`)
Emulation Speed/Disable Emulation Speed Limit = @(Ctrl+`0`) Emulation Speed/Disable Emulation Speed Limit = @(Ctrl+`0`)
@ -20,3 +20,5 @@ Other State Hotkeys/Undo Load State = @(Ctrl+`8`)
Other State Hotkeys/Undo Save State = @(Ctrl+`9`) Other State Hotkeys/Undo Save State = @(Ctrl+`9`)
Other State Hotkeys/Increase Selected State Slot = @(Ctrl+K) Other State Hotkeys/Increase Selected State Slot = @(Ctrl+K)
Other State Hotkeys/Decrease Selected State Slot = @(Ctrl+J) Other State Hotkeys/Decrease Selected State Slot = @(Ctrl+J)
General/Toggle Fullscreen = @(Ctrl+Return)
Wii/Press Sync Button = @(Alt+W)

View file

@ -2719,7 +2719,7 @@ input_replay_slot_increase = "nul"
input_replay_slot_increase_axis = "nul" input_replay_slot_increase_axis = "nul"
input_replay_slot_increase_btn = "nul" input_replay_slot_increase_btn = "nul"
input_replay_slot_increase_mbtn = "nul" input_replay_slot_increase_mbtn = "nul"
input_reset = "nul" input_reset = "r"
input_reset_axis = "nul" input_reset_axis = "nul"
input_reset_btn = "nul" input_reset_btn = "nul"
input_reset_mbtn = "nul" input_reset_mbtn = "nul"

View file

@ -165,14 +165,24 @@ modules:
url: https://github.com/rclone/rclone/releases/download/v1.61.1/rclone-v1.61.1-linux-amd64.zip url: https://github.com/rclone/rclone/releases/download/v1.61.1/rclone-v1.61.1-linux-amd64.zip
sha256: 6d6455e1cb69eb0615a52cc046a296395e44d50c0f32627ba8590c677ddf50a9 sha256: 6d6455e1cb69eb0615a52cc046a296395e44d50c0f32627ba8590c677ddf50a9
# Source: https://github.com/flathub/com.valvesoftware.Steam.Utility.steamtinkerlaunch/blob/129c9192f874405d21612d95f9749dc2bcaf8cea/modules/rsync.yml#L5
- name: rsync - name: rsync
buildsystem: simple no-autogen: true
build-commands: config-opts:
- cp local/bin/rsync ${FLATPAK_DEST}/bin/ - --prefix=${FLATPAK_DEST}
- --with-included-popt
- --with-included-zlib
- --disable-debug
- --disable-xxhash # Unable to meet dependency -- rsync refuses to see the required xxhash.h file
sources: sources:
- type: archive - type: archive
url: https://download.samba.org/pub/rsync/binaries/ubuntu-22.04-x86_64/rsync-3.2.7.tar.gz url: https://download.samba.org/pub/rsync/src/rsync-3.2.7.tar.gz
sha256: dd2b74396c6e8d6a2d7af94cd97fad5788d888e722bc9780de1590f37a1920d6 sha256: 4e7d9d3f6ed10878c58c5fb724a67dacf4b6aac7340b13e488fb2dc41346f2bb
x-checker-data:
type: anitya
project-id: 4217
stable-only: true
url-template: https://download.samba.org/pub/rsync/src/rsync-$version.tar.gz
- name: jq - name: jq
buildsystem: simple buildsystem: simple
@ -260,7 +270,7 @@ modules:
sources: sources:
- type: git - type: git
url: https://gitlab.com/es-de/emulationstation-de url: https://gitlab.com/es-de/emulationstation-de
branch: 9bcc112f7c7efd3216bd3f12370f55fdee011bd4 branch: 7a1e420c9df3b801a65e9bcdc0ac92e2d708836e
- type: shell - type: shell
commands: commands:
- sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK - sed -i 's#"EMULATIONSTATION-DE V" + Utils::String::toUpper(PROGRAM_VERSION_STRING)#"RetroDECK
@ -431,12 +441,11 @@ modules:
- name: ppsspp - name: ppsspp
buildsystem: cmake-ninja buildsystem: cmake-ninja
config-opts: config-opts:
- -DUSE_SYSTEM_FFMPEG=OFF # default: off, turn this on? - -DUSE_SYSTEM_FFMPEG=OFF
- -DUSE_SYSTEM_LIBZIP=ON - -DUSE_SYSTEM_LIBZIP=ON
- -DUSE_SYSTEM_ZSTD=ON - -DUSE_SYSTEM_ZSTD=ON
- -DUSE_WAYLAND_WSI=ON - -DUSE_WAYLAND_WSI=ON
#- -DUSING_X11_VULKAN=ON
- -DUSING_QT_UI=OFF - -DUSING_QT_UI=OFF
- -DBUILD_TESTING=OFF - -DBUILD_TESTING=OFF
@ -454,11 +463,12 @@ modules:
sources: sources:
- type: git - type: git
url: &ppsspp-url https://github.com/hrydgard/ppsspp.git url: &ppsspp-url https://github.com/hrydgard/ppsspp.git
tag: v1.14.4 tag: v1.15
commit: cd535263c1ad65fd03869591a8bd706680cbf04b commit: 4a9227504219bbc64e444ba7f0e306746e5a806d
x-checker-data: x-checker-data:
type: git type: anitya
tag-pattern: ^v([\d.]+)$ project-id: 12295
tag-template: 'v$version'
is-main-source: true is-main-source: true
- name: ppsspp-localization - name: ppsspp-localization

@ -1 +1 @@
Subproject commit a2441b964afefd8cd1cebcdf562c7878670daf42 Subproject commit a337dd0c6b7209a316dc6fa142323972e128c85d