Merge branch 'libretro:master' into master

Author: TheRhysWyrill

.github/workflows/webOS.yml

@@ -61,35 +61,56 @@ jobs:
           tar xzf arm-webos-linux-gnueabi_sdk-buildroot-x86_64.tar.gz
           ./arm-webos-linux-gnueabi_sdk-buildroot/relocate-sdk.sh
 
-      - name: Compile RA
+      - name: Load RARCH_VERSION from version.all
+        id: version
+        shell: bash
+        run: |
+          RARCH_VERSION=$(grep -Po '(?<=#define PACKAGE_VERSION ")[^"]+' version.all)
+          echo "RARCH_VERSION=$RARCH_VERSION" >> "$GITHUB_ENV"
+
+      - name: Compile RA (GLES3 variant)
         shell: bash
         run: |
           . /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
-          make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 -j$(getconf _NPROCESSORS_ONLN)
+          make -f Makefile.webos clean
+          make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 \
+            HAVE_OPENGLES3=1 HAVE_OPENGLES3_1=1 HAVE_OPENGLES3_2=1 -j"$(getconf _NPROCESSORS_ONLN)"
+          mv webos/com.retroarch.webos_${RARCH_VERSION}_arm.ipk \
+             webos/com.retroarch.webos.gles3_${RARCH_VERSION}_arm.ipk
         env:
           DEBUG: ${{ github.event_name == 'release' && '0' || '1' }}
 
-      - name: Get short SHA
-        id: slug
-        run: echo "sha8=$(echo ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_OUTPUT
+      - name: Upload GLES3 artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: com.retroarch.webos.gles3_${{ env.RARCH_VERSION }}_${{ github.sha }}_arm.ipk
+          path: webos/com.retroarch.webos.gles3_${{ env.RARCH_VERSION }}_arm.ipk
+
+      - name: Compile RA (default)
+        shell: bash
+        run: |
+          . /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
+          make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 -j"$(getconf _NPROCESSORS_ONLN)"
+        env:
+          DEBUG: ${{ github.event_name == 'release' && '0' || '1' }}
 
-      - uses: actions/upload-artifact@v4
+      - name: Upload default artifact
+        uses: actions/upload-artifact@v4
         with:
-          name: com.retroarch.webos_${{ steps.slug.outputs.sha8 }}_arm.ipk
-          path: |
-            webos/*.ipk
+          name: com.retroarch.webos_${{ env.RARCH_VERSION }}_${{ github.sha }}_arm.ipk
+          path: webos/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk
 
-      - name: Generate Manifest
+      - name: Generate Manifest (default only)
+        if: github.repository == 'webosbrew/Retroarch'
         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'
+        if: github.event_name == 'release' && github.repository == 'webosbrew/Retroarch'
         uses: ncipollo/release-action@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
@@ -98,4 +119,7 @@ jobs:
           omitNameDuringUpdate: true
           omitBody: true
           omitPrereleaseDuringUpdate: true
-          artifacts: webos/*.ipk,webos/*.manifest.json
+          artifacts: |
+            webos/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk
+            webos/com.retroarch.webos.gles3_${{ env.RARCH_VERSION }}_arm.ipk
+            webos/${{ env.PACKAGE_NAME }}.manifest.json

CHANGES.md

@@ -1,5 +1,10 @@
 # Future
+
+# 1.22.1
 - ANDROID: OnNewIntent handler to allow launchers start new content without closing first
+- ANDROID: Use app-specific storage for Google Play builds of RetroArch
+- ANDROID: Implement support for the Storage Access Framework, to allow the user to mount most directories1 from internal storage, the SD card, other removable storage devices and any document providers provided by other Android apps on the current device.
+- 3DS: Add 800px mode for New 3DS models
 - APPLE: Include sameduck, gearcoleco, geargrafx cores in App Store builds
 - APPLE: Include reminiscence, virtualjaguar, vitaquake2 cores in App Store builds
 - APPLE: Include gam4980 core in App Store builds
@@ -8,17 +13,20 @@
 - APPLE: Don't force fullscreen, allow multitasking on iPad
 - APPLE: AppIntents for Siri, Shortcuts
 - APPLE: Fix ffmpeg camera driver
+- APPLE/MFI: Try harder to own the home button
 - AUDIO: Microphone CoreAudio driver for iOS and macOS
 - AUTOCONF: Autoconfig match extended with a physical identifier
 - CAMERA: Use ffmpeg libavfilter virtual input device as default
 - CHEEVOS: Show additional message for unsupported achievements
-- CHEEVOS: Upgrade to rcheevos 12.0
-- DATABASE: Filter in Database Manager now works for genre and region
+- CHEEVOS: Upgrade to rcheevos 12.1
+- CHEEVOS: Change expired token message from info to error
+- CHEEVOS: Hashing of RVZ files is now supported
 - CLOUDSYNC: Enable icloud_drive cloud sync backend on MacOS / iOS
 - CLOUDSYNC: Don't always trust the server hash
 - CLOUDSYNC: Enable WebDAV support for Android
 - CLOUDSYNC: Speed up cloudsync on Apple
 - DATABASE: Improve multidisk game scanning
+- DATABASE: Filter in Database Manager now works for genre and region
 - EMSCRIPTEN: Support core switching
 - EMSCRIPTEN: Support suspend screensaver
 - EMSCRIPTEN/RWEBCAM: Fix camera driver
@@ -33,6 +41,7 @@
 - INPUT: Fix heavy slowdown when using Bluetooth XInput controllers with rumble
 - INPUT: Reset and close content hotkeys now require confirmation, similar to quit
 - INPUT: Menu toggle and hotkey enable can now be assigned to the same key
+- INPUT: Option to have hotkeys follow the port mapped first to the core
 - INPUT/ANDROID: Favor mouse coordinates for lightgun
 - INPUT/UDEV: Fix lost terminal settings after restart from menu
 - INPUT/BSV/REPLAY: Bumped replay format version to 2. Old replays will still play back fine.
@@ -43,11 +52,18 @@
 - INPUT/BSV/REPLAY: Add hotkeys and text commands to force a checkpoint insertion into the currently recording replay, and to seek backwards to the previous checkpoint and forwards to the next checkpoint.
 - INPUT/BSV/REPLAY: Add a text command to seek to a specific frame of the currently playing/recording replay; it will return via the command replier the actual seeked-to frame (right now it only supports seeking to checkpoints).
 - INTL: Add Irish Gaelic to selectable languages
+- IOS: Use native keyboard in search
 - IOS: Fix crash on iOS9 when fetching refresh rate
+- IOS: Stronger haptics, controllable by setting
+- IOS: Down arrow menu is removed, all 3 options are available by other means now
+- IOS/MACOS: Fix display server resolution and refresh rates
+- IOS/TVOS: Use native keyboard
+- JPEG: Fix clamping bug in JPEG decode
 - LIBRETRO: Deprecate intfstream_open_writable_memory
 - LIBRETRO: New environment function RETRO_ENVIRONMENT_GET_TARGET_SAMPLE_RATE
 - LINUX: Add full complement of key/value pairs to desktop entry
 - MACOS: Fix coreaudio microphone handling
+- MACOS: Fix window size calculation
 - MENU: Common Thumbnail Background option for all menu drivers
 - MENU: Move core options reset from Settings/Configuration to Main Menu / Configuration Files
 - MENU: Use right analog stick for thumbnail cycling in playlists
@@ -68,16 +84,19 @@
 - MENU: Allow kiosk mode and hiding of Settings menu also in GLUI and RGUI
 - MENU: Task widget improvements
 - MENU/GLUI: Show thumbnails in Explore view
+- MENU/XMB: Improvements for mobile/touch. More natural horizontal/vertical scrolling
 - MENU/XMB: Select button toggles thumbnails in playlists
 - MENU/XMB,OZONE: Fix content icons when playlist tabs are hidden
 - MENU/OZONE: Horizontal padding factor option
 - MENU/OZONE: Custom font selection and scaling factor
 - MENU/RGUI: Clock format is now configurable and moved to top header
+- NETPLAY: Push room info to lobby
 - NETWORK: Fixes for nmcli wifi driver
 - NETWORK: Network command interface enabled for Android, iOS, TVOS
 - OTHER: ZStandard support and libchdr update for support of chd files converted with createdvd option
 - OVERLAY: Speed limit on touch pointer tracking
 - OVERLAY: Dedicate each touch pointer to hitboxes or pointing devices
+- OVERLAY: Fix overlay turbo fire
 - PLAYLIST: Built-in playlists are now stored under playlists/builtin
 - PLAYLIST: Fix subsystem information in playlists
 - PS3: Fix psl1ght target of dist-cores.sh
@@ -86,23 +105,32 @@
 - SAVESTATES: Savestate thumbnails are default enabled for x86_64 builds
 - SAVESTATES: Slot is now remembered using the runtime log file
 - SAVESTATES: Slot hotkey widget shows save state thumbnail
+- SCAN: Fix crash with Sega CD
+- SCAN: Log files without database match
+- SCAN: Optimization of database queries by content file size
 - VIDEO: Fix auto swap interval setup
 - VIDEO: Improvements for integer scale half scaling
+- VIDEO: Adjustments to smart integer scaling, considering title safe area
 - VIDEO: Frame delay improvements for the automatic setting
 - VIDEO: Auto-enable GPU recording with HW context cores
 - VIDEO: Fix viewport bias when using custom aspect ratio
 - VIDEO/D3D11/D3D12: snappy extra vsync presentation mode
 - VIDEO/GL: Fallback OpenGL symbol loader for Linux devices with EGL < 1.5
 - VIDEO/GL: Support for Cg and GLSL shaders in the GLCore video driver
+- VIDEO/GL: Improve GLES version detection
 - VIDEO/SHADER: Shader hold function, useful for some lightguns and shader comparison
 - VIDEO/SWITCHRES: Horizontal and vertical geometry adjustment options added
 - VIDEO/SWITCHRES: Game overrides
+- VIDEO/VULKAN: Add VK_EXT_full_screen_exclusive extension support for Windows
 - VIDEO/WAYLAND: Support for xdg-toplevel-icon-v1
 - VIDEO/WAYLAND: Fix deadlock when using Wayland Vulkan driver
+- VIDEO/WAYLAND: Fix fullscreen on auto monitor index (partial)
 - VITA: Touchscreen support for PS Vita
+- VITA: Set RGUI framebuffer to 272 lines to remove blurriness
 - WEBOS: Various fixes and tunings
 - WEBOS: Disable core dumps
 - WEBOS: Debug builds enabled
+- WEBOS: Fix GLES 3/3.1/3.2 option, enable 64-bit option
 
 # 1.21.0
 - 3DS: Fix unique IDs for newer cores

Makefile.common

@@ -302,6 +302,10 @@ OBJ += \
        $(LIBRETRO_COMM_DIR)/streams/network_stream.o \
        $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation.o
 
+ifeq ($(ANDROID), 1)
+   OBJ += $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation_saf.o
+endif
+
 OBJ += \
        $(LIBRETRO_COMM_DIR)/lists/string_list.o \
        $(LIBRETRO_COMM_DIR)/string/stdstring.o \
@@ -2404,6 +2408,12 @@ ifeq ($(HAVE_NETWORKING), 1)
              deps/rcheevos/src/rapi/rc_api_runtime.o \
              deps/rcheevos/src/rapi/rc_api_user.o \
 
+      # RVZ/WIA disc image support for RetroAchievements
+      ifeq ($(HAVE_ZSTD), 1)
+         DEFINES += -DHAVE_CHEEVOS_RVZ
+         OBJ += cheevos/cheevos_rvz.o
+      endif
+
       ifeq ($(HAVE_LUA), 1)
          DEFINES += -DHAVE_LUA \
                     -DLUA_32BITS

Makefile.libnx

@@ -57,6 +57,8 @@ HAVE_CHD = 1
 HAVE_STB_VORBIS = 1
 HAVE_IBXM = 1
 HAVE_CORE_INFO_CACHE = 1
+HAVE_CLOUD_SYNC = 1
+HAVE_SSL = 1
 
 # RetroArch libnx useful flags
 HAVE_THREADS = 1
@@ -148,7 +150,7 @@ LDFLAGS	=	-specs=$(DEVKITPRO)/libnx/switch.specs $(ARCH) -Wl,--allow-multiple-de
 # add things from Makefile.common
 CFLAGS += $(DEF_FLAGS)
 
-LIBS	:= -lswresample -lavformat -lavcodec -lavutil -lswscale -lstdc++ -lbz2 -lpng -lz -lnx -lvpx -lopus -llzma -lm
+LIBS := -lswresample -lavformat -lavcodec -lavutil -lswscale -lstdc++ -lbz2 -lpng -lz -lnx -lvpx -lopus -llzma -lmbedtls -lmbedx509 -lmbedcrypto -lnx -lm
 
 ifeq ($(HAVE_OPENGL), 1)
   LIBS := -lEGL -lglapi -ldrm_nouveau $(LIBS)

Makefile.webos

@@ -1,7 +1,7 @@
 include version.all
 
-ifneq ($(CROSS_COMPILE),arm-webos-linux-gnueabi-)
-    $(error You need webOS toolchain to build this. See https://github.com/webosbrew/native-toolchain)
+ifneq ($(filter $(CROSS_COMPILE),arm-webos-linux-gnueabi- aarch64-webos-linux-gnu-),$(CROSS_COMPILE))
+  $(error You need webOS toolchain to build this. See https://github.com/webosbrew/native-toolchain)
 endif
 
 ifdef SDKTARGETSYSROOT
@@ -24,7 +24,7 @@ SDL2_PREBUILT_ARCHIVE ?= https://github.com/webosbrew/SDL-webOS/releases/downloa
 #########################
 
 APP_PACKAGE_NAME ?= com.retroarch.webos
-PACKAGE_VERSION := $(patsubst "%",%,$(RARCH_VERSION))
+IPK_VERSION := $(shell grep '#define PACKAGE_VERSION' version.all | sed -E 's/.*"([0-9]+\.[0-9]+\.[0-9]+)".*/\1/')
 
 DEBUG ?= 0
 
@@ -80,7 +80,7 @@ HAVE_LANGEXTRA = 1
 HAVE_LIBRETRODB = 1
 HAVE_MENU = 1
 HAVE_MENU_COMMON = 1
-HAVE_NEON = 1
+HAVE_NEON = 0
 HAVE_NETWORKING = 1
 HAVE_IFINFO = 1
 HAVE_NETWORK_CMD = 1
@@ -140,7 +140,12 @@ DEF_FLAGS += -ffunction-sections -fdata-sections
 DEF_FLAGS += -I. -Ideps -Ideps/stb -DWEBOS=1 -MMD
 DEF_FLAGS += -Wall -Wno-unused-variable
 LIBS := -ldl -lz -lrt -pthread
-ARCHFLAGS := -mcpu=cortex-a9 -mtune=cortex-a53 -mfloat-abi=softfp
+ifeq ($(findstring arm64,$(ARCH)),arm64)
+  ARCHFLAGS := -mcpu=cortex-a53
+else
+  ARCHFLAGS := -mcpu=cortex-a9 -mtune=cortex-a53 -mfloat-abi=softfp
+  HAVE_NEON = 1
+endif
 CFLAGS := $(ARCHFLAGS)
 CXXFLAGS := $(ARCHFLAGS) -fno-exceptions -fno-rtti -std=c++11 -D__STDC_CONSTANT_MACROS
 ASFLAGS := $(ARCHFLAGS)
@@ -157,6 +162,15 @@ DEFINES += -DHAVE_NETWORKING -DHAVE_IFINFO -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_A
 DEFINES += -DHAVE_NETWORKGAMEPAD
 DEFINES += -DHAVE_FREETYPE
 DEFINES += -DHAVE_UPDATE_CORE_INFO
+ifneq (,$(filter 1,$(HAVE_OPENGLES3) $(HAVE_OPENGLES3_1) $(HAVE_OPENGLES3_2)))
+  DEFINES += -DHAVE_OPENGLES3
+endif
+ifeq ($(HAVE_OPENGLES3_1),1)
+DEFINES += -DHAVE_OPENGLES3_1
+endif
+ifeq ($(HAVE_OPENGLES3_2),1)
+DEFINES += -DHAVE_OPENGLES3_2
+endif
 
 PKG_CONFIG=pkg-config
 
@@ -169,8 +183,10 @@ 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
+ifeq ($(HAVE_NEON),1)
+  NEON_CFLAGS  += -mfpu=neon
+  NEON_ASFLAGS += -mfpu=neon
+endif
 NETWORKING_LIBS = -lc
 
 OBJDIR_BASE := obj-unix
@@ -201,14 +217,17 @@ RARCH_OBJ := $(addprefix $(OBJDIR)/,$(OBJ))
 define APPINFO
 {
     "id": "$(APP_PACKAGE_NAME)",
-    "version": "$(PACKAGE_VERSION)",
+    "version": "$(IPK_VERSION)",
     "vendor": "webosbrew.org",
     "title": "RetroArch",
     "icon": "icon160.png",
     "main": "retroarch",
     "iconColor": "#333333",
     "type": "native",
-    "appDescription": "Emulation frontend"
+    "appDescription": "Emulation frontend",
+    "cloudgame_active": true,
+    "useAllMouseButtons": true,
+    "useAllKeyboardKeys": true
 }
 endef
 export APPINFO
@@ -297,7 +316,7 @@ endif
 	cd webos && ares-package dist
 
 install: ipk
-	ares-install webos/$(APP_PACKAGE_NAME)_$(PACKAGE_VERSION)_$(ARCH).ipk
+	ares-install webos/$(APP_PACKAGE_NAME)_$(IPK_VERSION)_$(ARCH).ipk
 
 launch: install
 	ares-launch $(APP_PACKAGE_NAME)

README.md

@@ -73,6 +73,7 @@ RetroArch has been ported to the following platforms:
    - Emscripten (WebAssembly and JavaScript)
    - FreeBSD
    - Haiku
+   - LG webOS
    - Linux
    - Original Microsoft Xbox
    - Microsoft Xbox 360 (Libxenon/XeXDK)

audio/common/pipewire.c

@@ -138,7 +138,10 @@ bool pipewire_core_init(pipewire_core_t **pw, const char *loop_name, const struc
 void pipewire_core_deinit(pipewire_core_t *pw)
 {
    if (!pw)
-      return pw_deinit();
+   {
+      pw_deinit();
+      return;
+   }
 
    if (pw->thread_loop)
       pw_thread_loop_stop(pw->thread_loop);

audio/drivers/alsathread.c

@@ -212,10 +212,11 @@ static void alsa_microphone_worker_thread(void *mic_context)
    RARCH_DBG("[ALSA] [capture thread %p] Ending microphone worker thread.\n", thread_id);
 }
 
-static int alsa_thread_microphone_read(void *driver_context, void *mic_context, void *s, size_t len)
+static int alsa_thread_microphone_read(void *driver_context, void *mic_context, void *sv, size_t len)
 {
    snd_pcm_state_t state;
    size_t _len = 0;
+   uint8_t *s  = (uint8_t*)sv;
    alsa_thread_microphone_t       *alsa = (alsa_thread_microphone_t*)driver_context;
    alsa_thread_microphone_handle_t *mic = (alsa_thread_microphone_handle_t*)mic_context;
 

audio/drivers/coreaudio.c

@@ -285,6 +285,10 @@ static void *coreaudio_init(const char *device,
    if (AudioUnitInitialize(dev->dev) != noErr)
       goto error;
 
+   /* Enforce minimum latency to prevent buffer issues */
+   if (latency < 8)
+      latency        = 8;
+
    fifo_size         = (latency * (*new_rate)) / 1000;
    fifo_size        *= 2 * sizeof(float);
    dev->buffer_size  = fifo_size;

audio/drivers/coreaudio_mic_ios.m

@@ -458,16 +458,6 @@ static void coreaudio_microphone_device_list_free(const void *driver_context, st
 {
 }
 
-/* Check if microphone is using float format */
-static bool coreaudio_microphone_use_float(const void *driver_context, const void *microphone_context)
-{
-   coreaudio_microphone_t *microphone = (coreaudio_microphone_t *)microphone_context;
-   if (!microphone)
-      return false;
-
-   return microphone->use_float;
-}
-
 /* CoreAudio microphone driver structure */
 microphone_driver_t microphone_coreaudio = {
     coreaudio_microphone_init,