Merge pull request #17904 from webosbrew/webos

Author: LibretroAdmin

.github/workflows/webOS.yml

@@ -2,14 +2,18 @@ name: CI webOS
 
 on:
   push:
+    tags-ignore:
+      - '*'
+    branches:
+      - '*'
   pull_request:
+  release:
+    types: [ published ]
   repository_dispatch:
-    types: [run_build]
-
-permissions:
-  contents: read
+    types: [ run_build ]
 
 env:
+  PACKAGE_NAME: com.retroarch.webos
   ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
 jobs:
@@ -28,6 +32,14 @@ jobs:
           fileName: "ares-package_*.deb"
           out-file-path: "temp"
 
+      - name: Download Manifest Generator
+        uses: robinraju/[email protected]
+        with:
+          repository: "webosbrew/dev-toolbox-cli"
+          latest: true
+          fileName: "webosbrew-toolbox-gen-manifest_*.deb"
+          out-file-path: "temp"
+
       - name: Update packages
         run: sudo apt-get -yq update
 
@@ -50,6 +62,38 @@ jobs:
           ./arm-webos-linux-gnueabi_sdk-buildroot/relocate-sdk.sh
 
       - name: Compile RA
+        shell: bash
         run: |
           . /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
-          make -f Makefile.webos ADD_SDL2_LIB=1 -j$(getconf _NPROCESSORS_ONLN) info all
+          make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 -j$(getconf _NPROCESSORS_ONLN)
+
+      - name: Get short SHA
+        id: slug
+        run: echo "sha8=$(echo ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_OUTPUT
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: com.retroarch.webos_${{ steps.slug.outputs.sha8 }}_arm.ipk
+          path: |
+            webos/*.ipk
+
+      - name: Generate Manifest
+        shell: bash
+        run: |
+          . version.all
+          webosbrew-gen-manifest -o webos/${PACKAGE_NAME}.manifest.json \
+              -p webos/${PACKAGE_NAME}_${RARCH_VERSION}_arm.ipk \
+              -i https://github.com/webosbrew/RetroArch/raw/webos/webos/icon160.png \
+              -l https://github.com/webosbrew/RetroArch
+
+      - name: Release
+        if: github.event_name == 'release'
+        uses: ncipollo/release-action@v1
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ github.event.release.tag_name }}
+          allowUpdates: true
+          omitNameDuringUpdate: true
+          omitBody: true
+          omitPrereleaseDuringUpdate: true
+          artifacts: webos/*.ipk,webos/*.manifest.json

Makefile.webos

@@ -5,10 +5,10 @@ ifneq ($(CROSS_COMPILE),arm-webos-linux-gnueabi-)
 endif
 
 ifdef SDKTARGETSYSROOT
-    $(warning OE-based toolchain isn't supported anymore. Please use https://github.com/webosbrew/native-toolchain)
+    $(warning "OE-based toolchain isn't supported anymore. Please use https://github.com/webosbrew/native-toolchain")
     STAGING_DIR = $(SDKTARGETSYSROOT)
 else ifndef STAGING_DIR
-    $(error Can't find buildroot based toolchain. Please use https://github.com/webosbrew/native-toolchain)
+    $(error "Can't find buildroot based toolchain. Please use https://github.com/webosbrew/native-toolchain")
 endif
 
 WEBOS_FREETYPE_CONFIG ?= $(STAGING_DIR)/usr/bin/freetype-config
@@ -17,12 +17,12 @@ WEBOS_INC_DIR         ?= $(STAGING_DIR)/usr/include
 WEBOS_LIB_DIR         ?= $(STAGING_DIR)/usr/lib
 
 ADD_SDL2_LIB          ?= 0
-SDL2_PREBUILT_ARCHIVE ?= https://github.com/webosbrew/SDL-webOS/releases/download/release-2.30.0-webos.2/SDL2-2.30.0-webos.tar.gz
+SDL2_PREBUILT_ARCHIVE ?= https://github.com/webosbrew/SDL-webOS/releases/download/release-2.30.8-webos.3/SDL2-2.30.8-webos-abi.tar.gz
 
 #########################
 #########################
 
-PACKAGE_NAME = com.retroarch
+APP_PACKAGE_NAME ?= com.retroarch.webos
 PACKAGE_VERSION := $(patsubst "%",%,$(RARCH_VERSION))
 
 DEBUG ?= 0
@@ -60,8 +60,8 @@ HAVE_DR_MP3 = 1
 HAVE_DYNAMIC = 1
 HAVE_DYLIB = 1
 HAVE_EGL = 0
-HAVE_FREETYPE = 0
-HAVE_GDI = 1
+HAVE_FREETYPE = 1
+HAVE_GDI = 0
 HAVE_GETADDRINFO = 1
 HAVE_GETOPT_LONG = 1
 HAVE_GLSL = 1
@@ -107,7 +107,7 @@ HAVE_RUNAHEAD = 1
 HAVE_SDL = 0
 HAVE_SDL2 = 1
 HAVE_SHADERPIPELINE = 1
-HAVE_STB_FONT = 1
+HAVE_STB_FONT = 0
 HAVE_STB_IMAGE = 1
 HAVE_STB_VORBIS = 1
 HAVE_STDIN_CMD = 1
@@ -151,6 +151,8 @@ DEFINES += -DHAVE_FILTERS_BUILTIN
 DEFINES += -DHAVE_SDL2
 DEFINES += -DHAVE_PULSE
 DEFINES += -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORES
+DEFINES += -DHAVE_NETWORKGAMEPAD
+DEFINES += -DHAVE_FREETYPE
 DEFINES += -DHAVE_UPDATE_CORE_INFO
 
 PKG_CONFIG=pkg-config
@@ -159,6 +161,10 @@ SDL2_CFLAGS := $(shell $(PKG_CONFIG) --cflags sdl2)
 SDL2_LIBS := $(shell $(PKG_CONFIG) --libs sdl2)
 OPENGLES_LIBS = -lGLESv2
 PULSE_LIBS = $(shell $(PKG_CONFIG) --libs libpulse)
+FREETYPE_CFLAGS := $(shell $(PKG_CONFIG) --cflags freetype2)
+FREETYPE_LIBS := $(shell $(PKG_CONFIG) --libs freetype2)
+FONTCONFIG_CFLAGS := $(shell $(PKG_CONFIG) --cflags fontconfig)
+FONTCONFIG_LIBS := $(shell $(PKG_CONFIG) --libs fontconfig)
 MMAP_LIBS = -lc
 NEON_CFLAGS = -mfpu=neon
 NEON_ASFLAGS = -mfpu=neon
@@ -191,7 +197,7 @@ RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
 
 define APPINFO
 {
-    "id": "$(PACKAGE_NAME)",
+    "id": "$(APP_PACKAGE_NAME)",
     "version": "$(PACKAGE_VERSION)",
     "vendor": "webosbrew.org",
     "title": "RetroArch",
@@ -285,10 +291,10 @@ endif
 	cd webos && ares-package dist
 
 install: ipk
-	ares-install webos/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_$(ARCH).ipk
+	ares-install webos/$(APP_PACKAGE_NAME)_$(PACKAGE_VERSION)_$(ARCH).ipk
 
 launch: install
-	ares-launch com.retroarch
+	ares-launch $(APP_PACKAGE_NAME)
 
 .PHONY: all clean ipk
 

gfx/drivers_context/sdl_gl_ctx.c

@@ -109,7 +109,7 @@ static void *sdl_ctx_init(void *video_driver)
 #ifdef WEBOS
    SDL_SetHint(SDL_HINT_WEBOS_ACCESS_POLICY_KEYS_BACK, "true");
    SDL_SetHint(SDL_HINT_WEBOS_ACCESS_POLICY_KEYS_EXIT, "true");
-   SDL_SetHint(SDL_HINT_WEBOS_CURSOR_SLEEP_TIME, "1000");
+   SDL_SetHint(SDL_HINT_WEBOS_CURSOR_SLEEP_TIME, "5000");
 #endif
 
    /* Initialise graphics subsystem, if required */

gfx/drivers_font_renderer/freetype.c

@@ -403,6 +403,10 @@ static const char *font_paths[] = {
    "/Library/Fonts/Microsoft/Candara.ttf",
    "/Library/Fonts/Verdana.ttf",
    "/Library/Fonts/Tahoma.ttf",
+#elif defined(WEBOS)
+  "/usr/share/fonts/MuseoSans-Medium.ttf",
+  "/usr/share/fonts/LG_Smart_UI-Regular.ttf",
+  "/usr/share/fonts/DroidSans.ttf",
 #else
    "/usr/share/fonts/TTF/DejaVuSansMono.ttf",
    "/usr/share/fonts/TTF/DejaVuSans.ttf",