webOS: replace ncpu (go), fix undefined function compile error, use p…

…kg-config from buildroot
libretro · Feb 20, 2024 · 0dc5678 · 0dc5678
1 parent cd1a970
commit 0dc5678
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/Makefile.webos b/Makefile.webos
@@ -140,10 +140,12 @@ DEFINES += -DHAVE_PULSE
 DEFINES += -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES
 DEFINES += -DHAVE_UPDATE_CORE_INFO
 
-SDL2_CFLAGS := $(shell pkg-config --cflags sdl2)
-SDL2_LIBS := $(shell pkg-config --libs sdl2)
+PKG_CONFIG=$(SDKTARGETSYSROOT)/../../bin/pkg-config
+
+SDL2_CFLAGS := $(shell $(PKG_CONFIG) --cflags sdl2)
+SDL2_LIBS := $(shell $(PKG_CONFIG) --libs sdl2)
 OPENGLES_LIBS = -lGLESv2
-PULSE_LIBS = $(shell pkg-config --libs libpulse)
+PULSE_LIBS = $(shell $(PKG_CONFIG) --libs libpulse)
 MMAP_LIBS = -lc
 NEON_CFLAGS = -mfpu=neon
 NEON_ASFLAGS = -mfpu=neon

diff --git a/retroarch.c b/retroarch.c
@@ -8208,7 +8208,7 @@ bool retroarch_main_quit(void)
    retroarch_menu_running_finished(true);
 #endif
 
-#ifdef HAVE_ACCESSIBILITY
+#ifdef HAVE_TRANSLATE
    translation_release(false);
 #ifdef HAVE_THREADS
    if (access_st->image_lock)

diff --git a/webos/README.md b/webos/README.md
@@ -1,7 +1,7 @@
 ## Building
 ```sh
 make -f Makefile.webos clean
-make -f Makefile.webos -j$(ncpu --all) ipk
+make -f Makefile.webos -j$(getconf _NPROCESSORS_ONLN) ipk
 ```
 
 ## Testing

diff --git a/webos/appinfo.json b/webos/appinfo.json
@@ -1,6 +1,6 @@
 {
-    "id": "com.retroarch",
-    "version": "1.9.8",
+    "id": "com.webosbrew.retroarch",
+    "version": "1.17.0",
     "vendor": "libretro.com",
     "title": "RetroArch",
     "icon": "icon160.png",