From b9ff6cb1d9cb90fe91e2c76276010813b0cd9f08 Mon Sep 17 00:00:00 2001
From: CrystalCT <nippurct@gmail.com>
Date: Mon, 29 Mar 2021 09:01:03 +0200
Subject: [PATCH] Some PSL1GHT fixes

---
 Makefile.psl1ght                   |  4 ++--
 menu/menu_setting.c                | 18 +-----------------
 tasks/task_pl_thumbnail_download.c | 23 ++++++++++++++++++++++-
 3 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/Makefile.psl1ght b/Makefile.psl1ght
index 1055588bf3..dbf00325de 100644
--- a/Makefile.psl1ght
+++ b/Makefile.psl1ght
@@ -27,13 +27,13 @@ ELF_TARGET := retroarch_psl1ght.elf
 SELF_TARGET := $(ELF_TARGET:.elf=.self)
 CORE_PATH		= pkg/psl1ght/pkg/USRDIR/cores/CORE.SELF
 
-INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude
+INCLUDE += -I. -Ips3/gcmgl/include/export -Ips3/include -Ideps -Ideps/stb -Ilibretro-common/include/compat/zlib -Ilibretro-common/include $(LIBPSL1GHT_INC) -Iinclude -Idefines
 LIBDIRS += -L.
 
 MACHDEP := -D__PSL1GHT__ -mcpu=cell
 CFLAGS += -Wall $(MACHDEP) $(INCLUDE)
 LDFLAGS := $(MACHDEP)
-LIBS := -lretro_psl1ght -laudio -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule  -lm -ljpgdec -lpngdec -llv2 -lnet -lnetctl
+LIBS := -lretro_psl1ght -laudio -lrsx -lgcm_sys -lnet -lio -lsysutil -lsysmodule -lm -ljpgdec -lpngdec -llv2 -lnet -lnetctl -lsysfs
 
 # system platform
 system_platform = unix
diff --git a/menu/menu_setting.c b/menu/menu_setting.c
index c3b48dcea6..f7c09e6bf7 100644
--- a/menu/menu_setting.c
+++ b/menu/menu_setting.c
@@ -11060,7 +11060,7 @@ static bool setting_append_list(
                 menu_settings_list_current_add_range(list, list_info, 5, 100, 5, true, true);
             }
 
-#if defined(HAVE_THREADS)
+#if defined(HAVE_THREADS) && !defined(__PSL1GHT__) && !defined(__PS3__)
             CONFIG_BOOL(
                   list, list_info,
                   video_driver_get_threaded(),
@@ -19456,22 +19456,6 @@ void video_driver_menu_settings(void **list_data, void *list_info_data,
    (void)subgroup_info;
    (void)global;
 
-#if !defined(__PSL1GHT__) && defined(__PS3__)
-   CONFIG_BOOL(
-         list, list_info,
-         &global->console.screen.pal60_enable,
-         MENU_ENUM_LABEL_PAL60_ENABLE,
-         MENU_ENUM_LABEL_VALUE_PAL60_ENABLE,
-         false,
-         MENU_ENUM_LABEL_VALUE_OFF,
-         MENU_ENUM_LABEL_VALUE_ON,
-         group_info,
-         subgroup_info,
-         parent_group,
-         general_write_handler,
-         general_read_handler,
-         SD_FLAG_NONE);
-#endif
 #if defined(GEKKO) || defined(_XBOX360)
    CONFIG_UINT(
          list, list_info,
diff --git a/tasks/task_pl_thumbnail_download.c b/tasks/task_pl_thumbnail_download.c
index 994a69e088..b84b69e08b 100644
--- a/tasks/task_pl_thumbnail_download.c
+++ b/tasks/task_pl_thumbnail_download.c
@@ -89,7 +89,11 @@ static bool get_thumbnail_paths(
    char *path, size_t path_size,
    char *url, size_t url_size)
 {
+#if defined(__PSL1GHT__) || defined(__PS3__)
+   char *raw_url;
+#else
    char raw_url[8192];
+#endif
    char content_dir[PATH_MAX_LENGTH];
    char tmp_buf[PATH_MAX_LENGTH];
    const char *system      = NULL;
@@ -99,7 +103,6 @@ static bool get_thumbnail_paths(
    const char *system_name = NULL;
    
    content_dir[0] = '\0';
-   raw_url[0]     = '\0';
    tmp_buf[0]     = '\0';
    
    if (!pl_thumb->thumbnail_path_data)
@@ -150,6 +153,14 @@ static bool get_thumbnail_paths(
    if (string_is_empty(path))
       return false;
    
+#if defined(__PSL1GHT__) || defined(__PS3__)
+   raw_url = (char*)malloc(8192 * sizeof(char));
+   
+   if (!raw_url)
+      return false;
+#endif  
+   raw_url[0]     = '\0';
+
    /* Generate remote path */
    snprintf(raw_url, sizeof(raw_url), "%s/%s/%s/%s",
          FILE_PATH_CORE_THUMBNAILS_URL,
@@ -159,9 +170,19 @@ static bool get_thumbnail_paths(
          );
 
    if (string_is_empty(raw_url))
+#if defined(__PSL1GHT__) || defined(__PS3__)
+   {
+      free(raw_url);
       return false;
+   }
+#else
+      return false;
+#endif
    
    net_http_urlencode_full(url, raw_url, url_size);
+#if defined(__PSL1GHT__) || defined(__PS3__)
+   free(raw_url);
+#endif
    
    if (string_is_empty(url))
       return false;