From 401bbb0dbc8b740bf6452afbc556f93a73973412 Mon Sep 17 00:00:00 2001 From: Ronald Brown Date: Mon, 23 Oct 2023 04:18:52 +0200 Subject: [PATCH] Lakka: Add canary builds to updater --- Makefile.common | 4 ++++ file_path_special.h | 4 +++- menu/cbs/menu_cbs_ok.c | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Makefile.common b/Makefile.common index 2587d2c28420..8b339f3218e7 100644 --- a/Makefile.common +++ b/Makefile.common @@ -1050,6 +1050,10 @@ ifeq ($(HAVE_LAKKA_NIGHTLY), 1) DEFINES += -DHAVE_LAKKA_NIGHTLY endif +ifneq ($(HAVE_LAKKA_CANARY), "") + DEFINES += -DHAVE_LAKKA_CANARY=\"${HAVE_LAKKA_CANARY}\" +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 844141320e5b..7a35d9692bee 100644 --- a/file_path_special.h +++ b/file_path_special.h @@ -75,7 +75,9 @@ RETRO_BEGIN_DECLS #define FILE_PATH_LOBBY_LIBRETRO_URL "http://lobby.libretro.com/" #define FILE_PATH_CORE_THUMBNAILS_URL "http://thumbnails.libretro.com" #define FILE_PATH_CORE_THUMBNAILPACKS_URL "http://thumbnailpacks.libretro.com" -#ifdef HAVE_LAKKA_NIGHTLY +#ifdef HAVE_LAKKA_CANARY +#define FILE_PATH_LAKKA_URL HAVE_LAKKA_CANARY +#elif HAVE_LAKKA_NIGHTLY #define FILE_PATH_LAKKA_URL "http://nightly.builds.lakka.tv/.updater" #else #define FILE_PATH_LAKKA_URL "http://le.builds.lakka.tv" diff --git a/menu/cbs/menu_cbs_ok.c b/menu/cbs/menu_cbs_ok.c index c847a475cafe..d5033438a550 100644 --- a/menu/cbs/menu_cbs_ok.c +++ b/menu/cbs/menu_cbs_ok.c @@ -247,6 +247,7 @@ static int (funcname)(const char *path, const char *label, unsigned type, size_t #ifdef HAVE_LAKKA static char *lakka_get_project(void) { +#ifndef HAVE_LAKKA_CANARY size_t len; static char lakka_project[128]; FILE *command_file = popen("cat /etc/release | cut -d - -f 1", "r"); @@ -259,6 +260,9 @@ static char *lakka_get_project(void) pclose(command_file); return lakka_project; +#else + return "/"; +#endif } #endif #endif