Merge pull request #2235 from porschemad911/azahar-2124.2

azahar-sa - migrate back to Azahar proper, bump to v2124.2
This commit is contained in:
John Williams
2026-01-27 10:48:30 +11:00
committed by GitHub
12 changed files with 117 additions and 42 deletions

View File

@@ -269,6 +269,8 @@ pp_shader_name=None (builtin)
pp_shader_name\default=true
render_3d=0
render_3d\default=true
render_3d_which_display=0
render_3d_which_display\default=true
screen_bottom_leftright_padding=0
screen_bottom_leftright_padding\default=true
screen_bottom_stretch=false
@@ -285,6 +287,8 @@ screen_top_topbottom_padding=0
screen_top_topbottom_padding\default=true
small_screen_position=2
small_screen_position\default=true
swap_eyes_3d=false
swap_eyes_3d\default=true
swap_screen=false
swap_screen\default=true
upright_screen=false
@@ -299,6 +303,8 @@ log_filter=*:Info
log_filter\default=true
log_regex_filter=
log_regex_filter\default=true
update_check_channel=0
update_check_channel\default=true
[Renderer]
async_presentation=false
@@ -341,12 +347,16 @@ use_hw_shader=true
use_hw_shader\default=true
use_shader_jit=false
use_shader_jit\default=false
use_vsync=true
use_vsync\default=true
use_vsync_new=true
use_vsync_new\default=true
[System]
allow_plugin_loader=true
allow_plugin_loader\default=true
apply_region_free_patch=true
apply_region_free_patch\default=true
enable_required_online_lle_modules=false
enable_required_online_lle_modules\default=true
init_clock=0
@@ -435,6 +445,8 @@ Paths\gamedirs\2\expanded=true
Paths\gamedirs\2\expanded\default=true
Paths\gamedirs\2\path=SYSTEM
Paths\gamedirs\size=2
Paths\inserted_cartridge=
Paths\inserted_cartridge\default=true
Paths\language=en
Paths\language\default=false
Paths\last_artic_base_addr=

View File

@@ -269,6 +269,8 @@ pp_shader_name=None (builtin)
pp_shader_name\default=true
render_3d=0
render_3d\default=true
render_3d_which_display=0
render_3d_which_display\default=true
screen_bottom_leftright_padding=0
screen_bottom_leftright_padding\default=true
screen_bottom_stretch=false
@@ -285,6 +287,8 @@ screen_top_topbottom_padding=0
screen_top_topbottom_padding\default=true
small_screen_position=2
small_screen_position\default=true
swap_eyes_3d=false
swap_eyes_3d\default=true
swap_screen=false
swap_screen\default=true
upright_screen=false
@@ -299,6 +303,8 @@ log_filter=*:Info
log_filter\default=true
log_regex_filter=
log_regex_filter\default=true
update_check_channel=0
update_check_channel\default=true
[Renderer]
async_presentation=false
@@ -341,12 +347,16 @@ use_hw_shader=true
use_hw_shader\default=true
use_shader_jit=false
use_shader_jit\default=false
use_vsync=true
use_vsync\default=true
use_vsync_new=true
use_vsync_new\default=true
[System]
allow_plugin_loader=true
allow_plugin_loader\default=true
apply_region_free_patch=true
apply_region_free_patch\default=true
enable_required_online_lle_modules=false
enable_required_online_lle_modules\default=true
init_clock=0
@@ -435,6 +445,8 @@ Paths\gamedirs\2\expanded=true
Paths\gamedirs\2\expanded\default=true
Paths\gamedirs\2\path=SYSTEM
Paths\gamedirs\size=2
Paths\inserted_cartridge=
Paths\inserted_cartridge\default=true
Paths\language=en
Paths\language\default=false
Paths\last_artic_base_addr=

View File

@@ -269,6 +269,8 @@ pp_shader_name=None (builtin)
pp_shader_name\default=true
render_3d=0
render_3d\default=true
render_3d_which_display=0
render_3d_which_display\default=true
screen_bottom_leftright_padding=0
screen_bottom_leftright_padding\default=true
screen_bottom_stretch=false
@@ -285,6 +287,8 @@ screen_top_topbottom_padding=0
screen_top_topbottom_padding\default=true
small_screen_position=2
small_screen_position\default=true
swap_eyes_3d=false
swap_eyes_3d\default=true
swap_screen=false
swap_screen\default=true
upright_screen=false
@@ -299,6 +303,8 @@ log_filter=*:Info
log_filter\default=true
log_regex_filter=
log_regex_filter\default=true
update_check_channel=0
update_check_channel\default=true
[Renderer]
async_presentation=true
@@ -341,12 +347,16 @@ use_hw_shader=true
use_hw_shader\default=true
use_shader_jit=false
use_shader_jit\default=false
use_vsync=true
use_vsync\default=true
use_vsync_new=true
use_vsync_new\default=true
[System]
allow_plugin_loader=true
allow_plugin_loader\default=true
apply_region_free_patch=true
apply_region_free_patch\default=true
enable_required_online_lle_modules=false
enable_required_online_lle_modules\default=true
init_clock=0
@@ -435,6 +445,8 @@ Paths\gamedirs\2\expanded=true
Paths\gamedirs\2\expanded\default=true
Paths\gamedirs\2\path=SYSTEM
Paths\gamedirs\size=2
Paths\inserted_cartridge=
Paths\inserted_cartridge\default=true
Paths\language=en
Paths\language\default=false
Paths\last_artic_base_addr=

View File

@@ -269,6 +269,8 @@ pp_shader_name=None (builtin)
pp_shader_name\default=true
render_3d=0
render_3d\default=true
render_3d_which_display=0
render_3d_which_display\default=true
screen_bottom_leftright_padding=0
screen_bottom_leftright_padding\default=true
screen_bottom_stretch=false
@@ -285,6 +287,8 @@ screen_top_topbottom_padding=0
screen_top_topbottom_padding\default=true
small_screen_position=2
small_screen_position\default=true
swap_eyes_3d=false
swap_eyes_3d\default=true
swap_screen=false
swap_screen\default=true
upright_screen=false
@@ -299,6 +303,8 @@ log_filter=*:Info
log_filter\default=true
log_regex_filter=
log_regex_filter\default=true
update_check_channel=0
update_check_channel\default=true
[Renderer]
async_presentation=true
@@ -341,12 +347,16 @@ use_hw_shader=true
use_hw_shader\default=true
use_shader_jit=false
use_shader_jit\default=false
use_vsync=true
use_vsync\default=true
use_vsync_new=true
use_vsync_new\default=true
[System]
allow_plugin_loader=true
allow_plugin_loader\default=true
apply_region_free_patch=true
apply_region_free_patch\default=true
enable_required_online_lle_modules=false
enable_required_online_lle_modules\default=true
init_clock=0
@@ -435,6 +445,8 @@ Paths\gamedirs\2\expanded=true
Paths\gamedirs\2\expanded\default=true
Paths\gamedirs\2\path=SYSTEM
Paths\gamedirs\size=2
Paths\inserted_cartridge=
Paths\inserted_cartridge\default=true
Paths\language=en
Paths\language\default=false
Paths\last_artic_base_addr=

View File

@@ -269,6 +269,8 @@ pp_shader_name=None (builtin)
pp_shader_name\default=true
render_3d=0
render_3d\default=true
render_3d_which_display=0
render_3d_which_display\default=true
screen_bottom_leftright_padding=0
screen_bottom_leftright_padding\default=true
screen_bottom_stretch=false
@@ -285,6 +287,8 @@ screen_top_topbottom_padding=0
screen_top_topbottom_padding\default=true
small_screen_position=2
small_screen_position\default=true
swap_eyes_3d=false
swap_eyes_3d\default=true
swap_screen=false
swap_screen\default=true
upright_screen=false
@@ -299,6 +303,8 @@ log_filter=*:Info
log_filter\default=true
log_regex_filter=
log_regex_filter\default=true
update_check_channel=0
update_check_channel\default=true
[Renderer]
async_presentation=true
@@ -341,12 +347,16 @@ use_hw_shader=true
use_hw_shader\default=true
use_shader_jit=false
use_shader_jit\default=false
use_vsync=true
use_vsync\default=true
use_vsync_new=true
use_vsync_new\default=true
[System]
allow_plugin_loader=true
allow_plugin_loader\default=true
apply_region_free_patch=true
apply_region_free_patch\default=true
enable_required_online_lle_modules=false
enable_required_online_lle_modules\default=true
init_clock=0
@@ -435,6 +445,8 @@ Paths\gamedirs\2\expanded=true
Paths\gamedirs\2\expanded\default=true
Paths\gamedirs\2\path=SYSTEM
Paths\gamedirs\size=2
Paths\inserted_cartridge=
Paths\inserted_cartridge\default=true
Paths\language=en
Paths\language\default=false
Paths\last_artic_base_addr=

View File

@@ -269,6 +269,8 @@ pp_shader_name=None (builtin)
pp_shader_name\default=true
render_3d=0
render_3d\default=true
render_3d_which_display=0
render_3d_which_display\default=true
screen_bottom_leftright_padding=0
screen_bottom_leftright_padding\default=true
screen_bottom_stretch=false
@@ -285,6 +287,8 @@ screen_top_topbottom_padding=0
screen_top_topbottom_padding\default=true
small_screen_position=2
small_screen_position\default=true
swap_eyes_3d=false
swap_eyes_3d\default=true
swap_screen=false
swap_screen\default=true
upright_screen=false
@@ -299,6 +303,8 @@ log_filter=*:Info
log_filter\default=true
log_regex_filter=
log_regex_filter\default=true
update_check_channel=0
update_check_channel\default=true
[Renderer]
async_presentation=true
@@ -341,12 +347,16 @@ use_hw_shader=true
use_hw_shader\default=true
use_shader_jit=false
use_shader_jit\default=false
use_vsync=true
use_vsync\default=true
use_vsync_new=true
use_vsync_new\default=true
[System]
allow_plugin_loader=true
allow_plugin_loader\default=true
apply_region_free_patch=true
apply_region_free_patch\default=true
enable_required_online_lle_modules=false
enable_required_online_lle_modules\default=true
init_clock=0
@@ -435,6 +445,8 @@ Paths\gamedirs\2\expanded=true
Paths\gamedirs\2\expanded\default=true
Paths\gamedirs\2\path=SYSTEM
Paths\gamedirs\size=2
Paths\inserted_cartridge=
Paths\inserted_cartridge\default=true
Paths\language=en
Paths\language\default=false
Paths\last_artic_base_addr=

View File

@@ -269,6 +269,8 @@ pp_shader_name=None (builtin)
pp_shader_name\default=true
render_3d=0
render_3d\default=true
render_3d_which_display=0
render_3d_which_display\default=true
screen_bottom_leftright_padding=0
screen_bottom_leftright_padding\default=true
screen_bottom_stretch=false
@@ -285,6 +287,8 @@ screen_top_topbottom_padding=0
screen_top_topbottom_padding\default=true
small_screen_position=2
small_screen_position\default=true
swap_eyes_3d=false
swap_eyes_3d\default=true
swap_screen=false
swap_screen\default=true
upright_screen=false
@@ -299,6 +303,8 @@ log_filter=*:Info
log_filter\default=true
log_regex_filter=
log_regex_filter\default=true
update_check_channel=0
update_check_channel\default=true
[Renderer]
async_presentation=true
@@ -341,12 +347,16 @@ use_hw_shader=true
use_hw_shader\default=true
use_shader_jit=false
use_shader_jit\default=false
use_vsync=true
use_vsync\default=true
use_vsync_new=true
use_vsync_new\default=true
[System]
allow_plugin_loader=true
allow_plugin_loader\default=true
apply_region_free_patch=true
apply_region_free_patch\default=true
enable_required_online_lle_modules=false
enable_required_online_lle_modules\default=true
init_clock=0
@@ -435,6 +445,8 @@ Paths\gamedirs\2\expanded=true
Paths\gamedirs\2\expanded\default=true
Paths\gamedirs\2\path=SYSTEM
Paths\gamedirs\size=2
Paths\inserted_cartridge=
Paths\inserted_cartridge\default=true
Paths\language=en
Paths\language\default=false
Paths\last_artic_base_addr=
@@ -623,13 +635,13 @@ Shortcuts\Main%20Window\Toggle%20Turbo%20Mode\Context=2
Shortcuts\Main%20Window\Toggle%20Turbo%20Mode\Context\default=true
Shortcuts\Main%20Window\Toggle%20Turbo%20Mode\KeySeq=
Shortcuts\Main%20Window\Toggle%20Turbo%20Mode\KeySeq\default=true
UILayout\gameListHeaderState=@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x6\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x5\0\0\0\0\x6\x1\x1\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x6\0\0\x2\x80\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\x64\0\0\0\x1\0\0\0\0\0\0\0\xf0\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0\x64\0\0\0\0)
UILayout\gameListHeaderState="@ByteArray(\0\0\0\xff\0\0\0\0\0\0\0\x1\0\0\0\x1\0\0\0\x6\x1\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\x3\xe2\0\0\0\x6\x1\x1\0\x1\0\0\0\0\0\0\0\0\0\0\0\0\x64\xff\xff\xff\xff\0\0\0\x81\0\0\0\0\0\0\0\x6\0\0\x2\x80\0\0\0\x1\0\0\0\0\0\0\0\x62\0\0\0\x1\0\0\0\0\0\0\0=\0\0\0\x1\0\0\0\0\0\0\0G\0\0\0\x1\0\0\0\0\0\0\0\x30\0\0\0\x1\0\0\0\0\0\0\0L\0\0\0\x1\0\0\0\0\0\0\x3\xe8\0\0\0\0L\0\0\0\0)"
UILayout\geometry="@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\x1=\0\0\0\xd5\0\0\x6\x42\0\0\x3\x11\0\0\x1@\0\0\0\xf3\0\0\x6?\0\0\x3\xe\0\0\0\0\0\0\0\0\a\x80\0\0\x1@\0\0\0\xf3\0\0\x6?\0\0\x3\xe)"
UILayout\geometryRenderWindow=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\x1\0\0\0\x19\0\0\0\x64\0\0\0\x36\0\0\0\0\0\0\0\0\xff\xff\xff\xff\xff\xff\xff\xff\0\0\0\0\0\0\0\0\x5\0\0\0\0\x1\0\0\0\x19\0\0\0\x64\0\0\0\x36)
UILayout\microProfileDialogGeometry=@ByteArray(\x1\xd9\xd0\xcb\0\x3\0\0\0\0\0\x1\0\0\0\x19\0\0\x3\xe8\0\0\x2p\0\0\0\x1\0\0\0\x19\0\0\x3\xe8\0\0\x2p\0\0\0\0\0\0\0\0\a\x80\0\0\0\x1\0\0\0\x19\0\0\x3\xe8\0\0\x2p)
UILayout\microProfileDialogVisible=false
UILayout\microProfileDialogVisible\default=true
UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0W\0\x61\0i\0t\0T\0r\0\x65\0\x65\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\0\0\0\x1\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\b\xfb\0\0\0\x18\0\x41\0R\0M\0R\0\x65\0g\0i\0s\0t\0\x65\0r\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0h\0\xff\xff\xff\xfb\0\0\0 \0G\0r\0\x61\0p\0h\0i\0\x63\0s\0\x44\0\x65\0\x62\0u\0g\0g\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\xfb\0\0\0\"\0P\0i\0\x63\0\x61\0 \0\x43\0o\0m\0m\0\x61\0n\0\x64\0 \0L\0i\0s\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x84\0\xff\xff\xff\xfb\0\0\0*\0P\0i\0\x63\0\x61\0\x42\0r\0\x65\0\x61\0k\0P\0o\0i\0n\0t\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x84\0\xff\xff\xff\xfb\0\0\0 \0P\0i\0\x63\0\x61\0V\0\x65\0r\0t\0\x65\0x\0S\0h\0\x61\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\x1\xa6\0\xff\xff\xff\xfb\0\0\0\x12\0\x43\0i\0T\0r\0\x61\0\x63\0i\0n\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x38\0\xff\xff\xff\xfb\0\0\0.\0L\0L\0\x45\0S\0\x65\0r\0v\0i\0\x63\0\x65\0M\0o\0\x64\0u\0l\0\x65\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\xfb\0\0\0\x16\0I\0P\0\x43\0R\0\x65\0\x63\0o\0r\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xba\0\xff\xff\xff\0\0\x5\0\0\0\x1\xee\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
UILayout\state=@ByteArray(\0\0\0\xff\0\0\0\0\xfd\0\0\0\x2\0\0\0\0\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\x1\xfb\0\0\0\x1c\0W\0\x61\0i\0t\0T\0r\0\x65\0\x65\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\0\0\0\x1\0\0\0\0\0\0\0\0\xfc\x2\0\0\0\b\xfb\0\0\0\x18\0\x41\0R\0M\0R\0\x65\0g\0i\0s\0t\0\x65\0r\0s\0\0\0\0\0\xff\xff\xff\xff\0\0\0h\0\xff\xff\xff\xfb\0\0\0 \0G\0r\0\x61\0p\0h\0i\0\x63\0s\0\x44\0\x65\0\x62\0u\0g\0g\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\xfb\0\0\0\"\0P\0i\0\x63\0\x61\0 \0\x43\0o\0m\0m\0\x61\0n\0\x64\0 \0L\0i\0s\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x84\0\xff\xff\xff\xfb\0\0\0*\0P\0i\0\x63\0\x61\0\x42\0r\0\x65\0\x61\0k\0P\0o\0i\0n\0t\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x84\0\xff\xff\xff\xfb\0\0\0 \0P\0i\0\x63\0\x61\0V\0\x65\0r\0t\0\x65\0x\0S\0h\0\x61\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\x1\xa6\0\xff\xff\xff\xfb\0\0\0\x12\0\x43\0i\0T\0r\0\x61\0\x63\0i\0n\0g\0\0\0\0\0\xff\xff\xff\xff\0\0\0\x38\0\xff\xff\xff\xfb\0\0\0.\0L\0L\0\x45\0S\0\x65\0r\0v\0i\0\x63\0\x65\0M\0o\0\x64\0u\0l\0\x65\0s\0W\0i\0\x64\0g\0\x65\0t\0\0\0\0\0\xff\xff\xff\xff\0\0\0V\0\xff\xff\xff\xfb\0\0\0\x16\0I\0P\0\x43\0R\0\x65\0\x63\0o\0r\0\x64\0\x65\0r\0\0\0\0\0\xff\xff\xff\xff\0\0\0\xba\0\xff\xff\xff\0\0\x2\x39\0\0\0\xc2\0\0\0\x4\0\0\0\x4\0\0\0\b\0\0\0\b\xfc\0\0\0\0)
Updater\check_for_update_on_start=true
Updater\check_for_update_on_start\default=true
Updater\update_on_close=false

View File

@@ -2,9 +2,9 @@
# Copyright (C) 2024-present ROCKNIX (https://github.com/ROCKNIX)
PKG_NAME="azahar-sa"
PKG_VERSION="0db2f72e8e6e023115a5a37b06f11c7532bd8699" # tag AZAHAR_PLUS_2123_3_A
PKG_VERSION="3703dcec3e8943bea5bc73c08ba8f502ff506146" # tag 2124.2
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/AzaharPlus/AzaharPlus"
PKG_SITE="https://github.com/azahar-emu/azahar"
PKG_URL="${PKG_SITE}.git"
PKG_DEPENDS_TARGET="toolchain ffmpeg mesa SDL2 boost zlib libusb boost zstd control-gen spirv-tools qt6"
PKG_LONGDESC="Azahar - Nintendo 3DS emulator"
@@ -29,15 +29,16 @@ fi
TARGET_CXXFLAGS+=-fpch-preprocess
PKG_CMAKE_OPTS_TARGET+=" -DENABLE_QT_TRANSLATION=OFF \
-DENABLE_QT=ON \
-DENABLE_SDL2=ON \
-DENABLE_SDL2_FRONTEND=OFF \
-DENABLE_TESTS=OFF \
-DENABLE_ROOM=OFF \
-DUSE_DISCORD_PRESENCE=OFF \
-DENABLE_OPENGL=ON \
-DENABLE_VULKAN=ON"
PKG_CMAKE_OPTS_TARGET+="-DENABLE_OPENGL=ON \
-DENABLE_QT_TRANSLATION=OFF \
-DENABLE_QT=ON \
-DENABLE_ROOM=OFF \
-DENABLE_SDL2_FRONTEND=OFF \
-DENABLE_SDL2=ON \
-DENABLE_TESTS=OFF \
-DENABLE_VULKAN=ON \
-DUSE_DISCORD_PRESENCE=OFF \
-DUSE_SYSTEM_SDL2=ON"
makeinstall_target() {
mkdir -p ${INSTALL}/usr/bin

View File

@@ -1,4 +1,4 @@
From 6a80cce53323fefe3989839e101c22765141573f Mon Sep 17 00:00:00 2001
From bb1f3221ddce64bfe9409c79e29f2c5dd7ca4b0b Mon Sep 17 00:00:00 2001
From: John Williams <porschemad911@gmail.com>
Date: Fri, 10 Oct 2025 09:36:57 +1100
Subject: [PATCH 1/4] citra_qt - ToggleScreenLayout - remove SeparateWindows
@@ -9,10 +9,10 @@ Subject: [PATCH 1/4] citra_qt - ToggleScreenLayout - remove SeparateWindows
1 file changed, 4 deletions(-)
diff --git a/src/citra_qt/citra_qt.cpp b/src/citra_qt/citra_qt.cpp
index 1216fa882..588b2836f 100644
index 6bd859ba8..a22d72403 100644
--- a/src/citra_qt/citra_qt.cpp
+++ b/src/citra_qt/citra_qt.cpp
@@ -2747,10 +2747,6 @@ void GMainWindow::ToggleScreenLayout() {
@@ -2738,10 +2738,6 @@ void GMainWindow::ToggleScreenLayout() {
case Settings::LayoutOption::HybridScreen:
return Settings::LayoutOption::SideScreen;
case Settings::LayoutOption::SideScreen:

View File

@@ -1,4 +1,4 @@
From f59729ba48bc6016876eaa425c059752ad2c8f81 Mon Sep 17 00:00:00 2001
From ca883730013b5dbd185bb1e2ceb8b751f7b67465 Mon Sep 17 00:00:00 2001
From: John Williams <porschemad911@gmail.com>
Date: Fri, 10 Oct 2025 10:36:14 +1100
Subject: [PATCH 2/4] citra_sdl - emu_window - SDL_WINDOW_VULKAN context

View File

@@ -1,29 +1,29 @@
From dc5229925ce5383658888a8457bc45eee38d42b6 Mon Sep 17 00:00:00 2001
From f687df20ee2f661a96e108870f2c64506de0af7d Mon Sep 17 00:00:00 2001
From: John Williams <porschemad911@gmail.com>
Date: Fri, 10 Oct 2025 09:41:10 +1100
Date: Tue, 27 Jan 2026 09:24:53 +1100
Subject: [PATCH 3/4] common - file paths
---
src/common/common_paths.h | 15 ++++++++-------
src/common/file_util.cpp | 4 ++--
2 files changed, 10 insertions(+), 9 deletions(-)
src/common/common_paths.h | 14 +++++++-------
src/common/file_util.cpp | 2 +-
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/common/common_paths.h b/src/common/common_paths.h
index 49155702a..166e8a6ea 100644
index bb73c049e..e58be3a17 100644
--- a/src/common/common_paths.h
+++ b/src/common/common_paths.h
@@ -40,13 +40,13 @@
@@ -38,13 +38,13 @@
#define LEGACY_LIME3DS_APPLE_DATA_DIR "Library" DIR_SEP "Application Support" DIR_SEP "Lime3DS"
#endif
// For compatibility with XDG paths.
-#define EMU_DATA_DIR "azaharplus-emu"
-#define EMU_DATA_DIR "azahar-emu"
-#define LEGACY_CITRA_DATA_DIR "citra-emu"
-#define LEGACY_LIME3DS_DATA_DIR "lime3ds-emu"
+#define EMU_DATA_DIR "azahar"
+#define LEGACY_CITRA_DATA_DIR "citra"
+#define LEGACY_LIME3DS_DATA_DIR "lime3ds"
#else
-#define EMU_DATA_DIR "azaharplus-emu"
-#define EMU_DATA_DIR "azahar-emu"
-#define LEGACY_CITRA_DATA_DIR "citra-emu"
-#define LEGACY_LIME3DS_DATA_DIR "lime3ds-emu"
+#define EMU_DATA_DIR "azahar"
@@ -32,21 +32,20 @@ index 49155702a..166e8a6ea 100644
#endif
#endif
@@ -61,7 +61,8 @@
@@ -59,7 +59,7 @@
#define SDMC_DIR "sdmc"
#define NAND_DIR "nand"
#define SYSDATA_DIR "sysdata"
-#define LOG_DIR "log"
+#define LOG_DIR "/var/log"
+#define PLAY_TIME_DIR "log"
#define CHEATS_DIR "cheats"
#define DLL_DIR "external_dlls"
#define SHADER_DIR "shaders"
diff --git a/src/common/file_util.cpp b/src/common/file_util.cpp
index c740e8416..dc5591713 100644
index a9793c43c..9897eb26f 100644
--- a/src/common/file_util.cpp
+++ b/src/common/file_util.cpp
@@ -866,7 +866,7 @@ void SetUserPath(const std::string& path) {
@@ -877,7 +877,7 @@ void SetUserPath(const std::string& path) {
g_paths.emplace(UserPath::NANDDir, user_path + NAND_DIR DIR_SEP);
g_paths.emplace(UserPath::SysDataDir, user_path + SYSDATA_DIR DIR_SEP);
// TODO: Put the logs in a better location for each OS
@@ -55,15 +54,6 @@ index c740e8416..dc5591713 100644
g_paths.emplace(UserPath::CheatsDir, user_path + CHEATS_DIR DIR_SEP);
g_paths.emplace(UserPath::DLLDir, user_path + DLL_DIR DIR_SEP);
g_paths.emplace(UserPath::ShaderDir, user_path + SHADER_DIR DIR_SEP);
@@ -874,7 +874,7 @@ void SetUserPath(const std::string& path) {
g_paths.emplace(UserPath::LoadDir, user_path + LOAD_DIR DIR_SEP);
g_paths.emplace(UserPath::StatesDir, user_path + STATES_DIR DIR_SEP);
g_paths.emplace(UserPath::IconsDir, user_path + ICONS_DIR DIR_SEP);
- g_paths.emplace(UserPath::PlayTimeDir, user_path + LOG_DIR DIR_SEP);
+ g_paths.emplace(UserPath::PlayTimeDir, user_path + PLAY_TIME_DIR DIR_SEP);
g_default_paths = g_paths;
}
--
2.47.3

View File

@@ -1,4 +1,4 @@
From 52bd8c1c93cb1bfb05e387e7ce8e42dfd53399cf Mon Sep 17 00:00:00 2001
From 35452a058ed9ea08434a159558c0749b03bac07d Mon Sep 17 00:00:00 2001
From: John Williams <porschemad911@gmail.com>
Date: Fri, 10 Oct 2025 16:17:50 +1100
Subject: [PATCH 4/4] Enable 'use_gles' for OpenGL ES rendering
@@ -8,10 +8,10 @@ Subject: [PATCH 4/4] Enable 'use_gles' for OpenGL ES rendering
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/common/settings.h b/src/common/settings.h
index 77061db16..07f692aa1 100644
index c0f595d12..f80dab47c 100644
--- a/src/common/settings.h
+++ b/src/common/settings.h
@@ -496,7 +496,7 @@ struct Values {
@@ -505,7 +505,7 @@ struct Values {
#endif
GraphicsAPI::Software, GraphicsAPI::Vulkan, "graphics_api"};
SwitchableSetting<u32> physical_device{0, "physical_device"};