mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upstream Lakka patches (#16439)

Browse Source 
* Lakka: fix makefile for Lakka canary

* reboot/restart/eject: fix system commands

* Lakka: add url for devbuild updates
This commit is contained in:
Tomáš Kelemen 2024-04-17 07:57:49 +02:00 committed by GitHub
parent 6d1f7ef2be
commit c2eddfb260
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.common
View File

@ -1066,10 +1066,14 @@ ifeq ($(HAVE_LAKKA_NIGHTLY), 1)
DEFINES += -DHAVE_LAKKA_NIGHTLY DEFINES += -DHAVE_LAKKA_NIGHTLY
endif endif
ifneq ($(HAVE_LAKKA_CANARY), "") ifneq ($(HAVE_LAKKA_CANARY),)
DEFINES += -DHAVE_LAKKA_CANARY=\"${HAVE_LAKKA_CANARY}\" DEFINES += -DHAVE_LAKKA_CANARY=\"${HAVE_LAKKA_CANARY}\"
endif endif
ifeq ($(HAVE_LAKKA_DEVBUILD), 1)
DEFINES += -DHAVE_LAKKA_DEVBUILD
endif
ifeq ($(HAVE_MENU_COMMON), 1) ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/menu_setting.o \ OBJ += menu/menu_setting.o \
menu/menu_driver.o \ menu/menu_driver.o \

4
file_path_special.h
View File

@ -78,8 +78,10 @@ RETRO_BEGIN_DECLS
#define FILE_PATH_CORE_THUMBNAILPACKS_URL "http://thumbnailpacks.libretro.com" #define FILE_PATH_CORE_THUMBNAILPACKS_URL "http://thumbnailpacks.libretro.com"
#ifdef HAVE_LAKKA_CANARY #ifdef HAVE_LAKKA_CANARY
#define FILE_PATH_LAKKA_URL HAVE_LAKKA_CANARY #define FILE_PATH_LAKKA_URL HAVE_LAKKA_CANARY
#elif HAVE_LAKKA_NIGHTLY #elif defined (HAVE_LAKKA_NIGHTLY)
#define FILE_PATH_LAKKA_URL "http://nightly.builds.lakka.tv/.updater" #define FILE_PATH_LAKKA_URL "http://nightly.builds.lakka.tv/.updater"
#elif defined (HAVE_LAKKA_DEVBUILD)
#define FILE_PATH_LAKKA_URL "http://nightly.builds.lakka.tv/.devbuild"
#else #else
#define FILE_PATH_LAKKA_URL "http://le.builds.lakka.tv" #define FILE_PATH_LAKKA_URL "http://le.builds.lakka.tv"
#endif #endif

2
menu/cbs/menu_cbs_ok.c
View File

@ -2989,7 +2989,7 @@ static int action_ok_eject_disc(const char *path,
const char *label, unsigned type, size_t idx, size_t entry_idx) const char *label, unsigned type, size_t idx, size_t entry_idx)
{ {
#ifdef HAVE_CDROM #ifdef HAVE_CDROM
system("eject & disown"); system("nohup eject 2>&1 >/dev/null & exit");
#endif /* HAVE_CDROM */ #endif /* HAVE_CDROM */
return 0; return 0;
} }

8
retroarch.c
View File

@ -4336,11 +4336,11 @@ bool command_event(enum event_command cmd, void *data)
#if defined(__linux__) && !defined(ANDROID) #if defined(__linux__) && !defined(ANDROID)
if (settings->bools.config_save_on_exit) if (settings->bools.config_save_on_exit)
{ {
runloop_msg_queue_push(msg_hash_to_str(MSG_VALUE_SHUTTING_DOWN), 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
command_event(CMD_EVENT_MENU_SAVE_CURRENT_CONFIG, NULL); command_event(CMD_EVENT_MENU_SAVE_CURRENT_CONFIG, NULL);
runloop_msg_queue_push(msg_hash_to_str(MSG_VALUE_SHUTTING_DOWN), 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
} }
#ifdef HAVE_LAKKA #ifdef HAVE_LAKKA
system("(sleep 1 && shutdown -P now) & disown"); system("nohup /usr/bin/lakka-shutdown.sh 2>&1 >/dev/null & exit");
#else #else
command_event(CMD_EVENT_QUIT, NULL); command_event(CMD_EVENT_QUIT, NULL);
system("shutdown -P now"); system("shutdown -P now");
@ -4351,11 +4351,11 @@ bool command_event(enum event_command cmd, void *data)
#if defined(__linux__) && !defined(ANDROID) #if defined(__linux__) && !defined(ANDROID)
if (settings->bools.config_save_on_exit) if (settings->bools.config_save_on_exit)
{ {
runloop_msg_queue_push(msg_hash_to_str(MSG_VALUE_REBOOTING), 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
command_event(CMD_EVENT_MENU_SAVE_CURRENT_CONFIG, NULL); command_event(CMD_EVENT_MENU_SAVE_CURRENT_CONFIG, NULL);
runloop_msg_queue_push(msg_hash_to_str(MSG_VALUE_REBOOTING), 1, 180, true, NULL, MESSAGE_QUEUE_ICON_DEFAULT, MESSAGE_QUEUE_CATEGORY_INFO);
} }
#ifdef HAVE_LAKKA #ifdef HAVE_LAKKA
system("(sleep 1 && shutdown -r now) & disown"); system("nohup /usr/bin/lakka-reboot.sh 2>&1 >/dev/null & exit");
#else #else
command_event(CMD_EVENT_QUIT, NULL); command_event(CMD_EVENT_QUIT, NULL);
system("shutdown -r now"); system("shutdown -r now");