From c2eddfb2603ba22e6023e5fd182a2d5b8ce3c9f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Kelemen?= <vudiq@vudiq.sk>
Date: Wed, 17 Apr 2024 07:57:49 +0200
Subject: [PATCH] Upstream Lakka patches (#16439)

* Lakka: fix makefile for Lakka canary

* reboot/restart/eject: fix system commands

* Lakka: add url for devbuild updates
---
 Makefile.common        | 6 +++++-
 file_path_special.h    | 4 +++-
 menu/cbs/menu_cbs_ok.c | 2 +-
 retroarch.c            | 8 ++++----
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index ba4135de05..f7158506cf 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1066,10 +1066,14 @@ ifeq ($(HAVE_LAKKA_NIGHTLY), 1)
    DEFINES += -DHAVE_LAKKA_NIGHTLY
 endif
 
-ifneq ($(HAVE_LAKKA_CANARY), "")
+ifneq ($(HAVE_LAKKA_CANARY),)
    DEFINES += -DHAVE_LAKKA_CANARY=\"${HAVE_LAKKA_CANARY}\"
 endif
 
+ifeq ($(HAVE_LAKKA_DEVBUILD), 1)
+   DEFINES += -DHAVE_LAKKA_DEVBUILD
+endif
+
 ifeq ($(HAVE_MENU_COMMON), 1)
    OBJ += menu/menu_setting.o \
           menu/menu_driver.o \
diff --git a/file_path_special.h b/file_path_special.h
index a80c0b657e..cd01bdc41d 100644
--- a/file_path_special.h
+++ b/file_path_special.h
@@ -78,8 +78,10 @@ RETRO_BEGIN_DECLS
 #define FILE_PATH_CORE_THUMBNAILPACKS_URL "http://thumbnailpacks.libretro.com"
 #ifdef 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"
+#elif defined (HAVE_LAKKA_DEVBUILD)
+#define FILE_PATH_LAKKA_URL "http://nightly.builds.lakka.tv/.devbuild"
 #else
 #define FILE_PATH_LAKKA_URL "http://le.builds.lakka.tv"
 #endif
diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c
index 4f9aa051b1..1108ed3b09 100644
--- a/menu/cbs/menu_cbs_ok.c
+++ b/menu/cbs/menu_cbs_ok.c
@@ -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)
 {
 #ifdef HAVE_CDROM
-   system("eject & disown");
+   system("nohup eject 2>&1 >/dev/null & exit");
 #endif /* HAVE_CDROM */
    return 0;
 }
diff --git a/retroarch.c b/retroarch.c
index 2c7ddf0833..5dc30d4583 100644
--- a/retroarch.c
+++ b/retroarch.c
@@ -4336,11 +4336,11 @@ bool command_event(enum event_command cmd, void *data)
 #if defined(__linux__) && !defined(ANDROID)
          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);
+            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
-         system("(sleep 1 && shutdown -P now) & disown");
+         system("nohup /usr/bin/lakka-shutdown.sh 2>&1 >/dev/null & exit");
 #else
          command_event(CMD_EVENT_QUIT, NULL);
          system("shutdown -P now");
@@ -4351,11 +4351,11 @@ bool command_event(enum event_command cmd, void *data)
 #if defined(__linux__) && !defined(ANDROID)
          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);
+            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
-         system("(sleep 1 && shutdown -r now) & disown");
+         system("nohup /usr/bin/lakka-reboot.sh 2>&1 >/dev/null & exit");
 #else
          command_event(CMD_EVENT_QUIT, NULL);
          system("shutdown -r now");