Merge branch 'libretro:master' into master

Author: TheRhysWyrill

.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/release-downloader@v1.9
+        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

.gitignore

@@ -241,6 +241,8 @@ gfx/common/wayland/content-type-v1.h
 gfx/common/wayland/content-type-v1.c
 gfx/common/wayland/single-pixel-buffer-v1.h
 gfx/common/wayland/single-pixel-buffer-v1.c
+gfx/common/wayland/xdg-toplevel-icon-v1.h
+gfx/common/wayland/xdg-toplevel-icon-v1.c
 
 # libretro-common samples
 libretro-common/samples/streams/rzip/rzip

CHANGES.md

@@ -1,4 +1,9 @@
 # Future
+- EMSCRIPTEN: Support suspend screensaver
+- EMSCRIPTEN/RWEBCAM: Fix camera driver
+- EMSCRIPTEN/RWEBINPUT: Add accelerometer/gyroscope support
+- EMSCRIPTEN/RWEBPAD: Add rumble support
+- EMSCRIPTEN/RWEBAUDIO: Rewrite driver, set as default audio driver
 
 # 1.21.0
 - 3DS: Fix unique IDs for newer cores

Makefile

@@ -45,7 +45,6 @@ else
    OBJDIR := $(OBJDIR_BASE)/release
    CFLAGS ?= -O3
    CXXFLAGS ?= -O3
-   DEF_FLAGS += -ffast-math
 endif
 
 DEF_FLAGS += -Wall -Wsign-compare

Makefile.common

@@ -1284,6 +1284,7 @@ ifeq ($(HAVE_WAYLAND), 1)
         gfx/common/wayland_common.o \
         gfx/common/wayland/fractional-scale-v1.o \
         gfx/common/wayland/viewporter.o \
+        gfx/common/wayland/xdg-toplevel-icon-v1.o \
         gfx/common/wayland/xdg-shell.o \
         gfx/common/wayland/idle-inhibit-unstable-v1.o \
         gfx/common/wayland/xdg-decoration-unstable-v1.o \

Makefile.ctr

@@ -154,11 +154,7 @@ LIBDIRS := -L. -L$(CTRULIB)/lib
 
 ARCH     := -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
 
-CFLAGS	+= -mword-relocations \
-	   -ffast-math \
-	   $(ARCH)
-
-#CFLAGS	+= -Wall
+CFLAGS	+= -mword-relocations $(ARCH)
 CFLAGS	+= -DARM11 -D_3DS
 
 ifeq ($(strip $(USE_CTRULIB_2)),1)
@@ -202,7 +198,7 @@ CFLAGS += -Werror=implicit-function-declaration
 
 ASFLAGS	 := -g $(ARCH) -O3
 LDFLAGS  += -specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
-CFLAGS   += -std=gnu99 -ffast-math
+CFLAGS   += -std=gnu99
 
 LIB_CORE      :=
 LIB_CORE_FULL :=

Makefile.ctr.salamander

@@ -83,11 +83,7 @@ LIBDIRS := -L. -L$(CTRULIB)/lib
 
 ARCH     := -march=armv6k -mtune=mpcore -mfloat-abi=hard -marm -mfpu=vfp -mtp=soft
 
-CFLAGS	+=	-mword-relocations \
-			-fomit-frame-pointer -ffast-math \
-			$(ARCH)
-
-#CFLAGS	+= -Wall
+CFLAGS	+=	-mword-relocations -fomit-frame-pointer $(ARCH)
 CFLAGS	+=	-DARM11 -D_3DS
 
 ifeq ($(strip $(USE_CTRULIB_2)),1)
@@ -115,7 +111,7 @@ CFLAGS += -Werror=implicit-function-declaration
 ASFLAGS	:=	-g $(ARCH) -O3
 LDFLAGS  +=	-specs=ctr/3dsx_custom.specs -g $(ARCH) -Wl,-Map,$(notdir $*.map)
 
-CFLAGS   += -std=gnu99 -ffast-math
+CFLAGS   += -std=gnu99
 
 LIBS	:= -lctru -lm
 

Makefile.dingux

@@ -107,7 +107,7 @@ OPK_NAME = retroarch.opk
 
 OBJ :=
 LINK := $(CXX)
-DEF_FLAGS := -march=mips32 -mtune=mips32r2 -mhard-float -ffast-math -fomit-frame-pointer
+DEF_FLAGS := -march=mips32 -mtune=mips32r2 -mhard-float -fomit-frame-pointer
 DEF_FLAGS += -mplt -mno-shared
 DEF_FLAGS += -ffunction-sections -fdata-sections
 DEF_FLAGS += -I. -Ideps -Ideps/stb -DDINGUX=1 -MMD

Makefile.dos

@@ -120,7 +120,7 @@ APP_ICON := pkg/libnx/retroarch.jpg
 #---------------------------------------------------------------------------------
 ARCH	:=
 
-CFLAGS := -g -Wall -O3 -fcommon -ffast-math -ffunction-sections \
+CFLAGS := -g -Wall -O3 -fcommon -ffunction-sections \
           $(ARCH) $(DEFINES) $(INCLUDE_DIRS)
 
 CFLAGS += $(INCLUDE)

Makefile.emscripten

@@ -11,7 +11,7 @@ TARGET_BASE := $(subst .js,,$(TARGET))
 
 OS = Emscripten
 OBJ :=
-DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN -DEMSCRIPTEN -DNO_CANVAS_RESIZE
+DEFINES := -DRARCH_INTERNAL -DHAVE_MAIN -DEMSCRIPTEN
 DEFINES += -DHAVE_FILTERS_BUILTIN -DHAVE_ONLINE_UPDATER -DHAVE_UPDATE_ASSETS -DHAVE_UPDATE_CORE_INFO
 
 HAVE_PATCH = 1
@@ -27,7 +27,7 @@ HAVE_GLSL = 1
 HAVE_SCREENSHOTS = 1
 HAVE_REWIND = 1
 HAVE_AUDIOMIXER = 1
-HAVE_CC_RESAMPLER = 1
+HAVE_CC_RESAMPLER ?= 1
 HAVE_EGL ?= 0
 HAVE_OPENGLES = 1
 HAVE_RJPEG = 0
@@ -54,27 +54,21 @@ HAVE_BSV_MOVIE = 1
 HAVE_CHD ?= 0
 HAVE_NETPLAYDISCOVERY ?= 0
 
-HAVE_AL ?= 1
-
 # enables pthreads, requires special headers on the web server:
 # see https://web.dev/articles/coop-coep
 HAVE_THREADS ?= 0
 
 # requires HAVE_THREADS
 HAVE_AUDIOWORKLET ?= 0
 
-# WARNING -- READ BEFORE ENABLING
-# The rwebaudio driver is known to have several audio bugs, such as
-#  minor crackling, or the entire page freezing/crashing.
-#  It works perfectly on chrome, but even firefox has really bad audio quality.
-#  I should also note, the driver on iOS is completely broken (crashes the page).
-#  You have been warned.
-HAVE_RWEBAUDIO ?= 0
-
-# whether the browser thread is allowed to block to wait for audio to play,
-# may lead to the issues mentioned above.
-# currently this variable is only used by audioworklet;
-# rwebaudio will always busywait and openal will never busywait.
+# doesn't work on PROXY_TO_PTHREAD
+HAVE_RWEBAUDIO ?= 1
+
+# requires ASYNC or PROXY_TO_PTHREAD
+HAVE_AL ?= 0
+
+# whether the browser thread is allowed to block to wait for audio to play, not CPU usage-friendly!
+# currently this variable is only used by rwebaudio and audioworklet; openal will never busywait.
 ALLOW_AUDIO_BUSYWAIT ?= 0
 
 # minimal asyncify; better performance than full asyncify,
@@ -106,6 +100,9 @@ ASYNC ?= 0
 LTO ?= 0
 PTHREAD_POOL_SIZE ?= 4
 
+ASYNCIFY_ADD ?= dynCall_*,emscripten_mainloop
+ASYNCIFY_REMOVE ?= threaded_worker
+
 STACK_SIZE ?= 4194304
 INITIAL_HEAP ?= 134217728
 
@@ -123,7 +120,7 @@ INITIAL_HEAP ?= 134217728
 
 OBJDIR := obj-emscripten
 
-EXPORTED_FUNCTIONS = _main,_malloc,_free,_cmd_savefiles,_cmd_save_state,_cmd_load_state,_cmd_undo_save_state,_cmd_undo_load_state,_cmd_take_screenshot,\
+EXPORTED_FUNCTIONS = _main,_malloc,_free,_cmd_savefiles,_cmd_save_state,_cmd_load_state,_cmd_undo_save_state,_cmd_undo_load_state,_cmd_toggle_fullscreen,_cmd_take_screenshot,\
 _cmd_toggle_menu,_cmd_reload_config,_cmd_toggle_grab_mouse,_cmd_toggle_game_focus,_cmd_reset,_cmd_toggle_pause,_cmd_pause,_cmd_unpause,\
 _cmd_set_volume,_cmd_set_shader,_cmd_cheat_set_code,_cmd_cheat_get_code,_cmd_cheat_toggle_index,_cmd_cheat_get_code_state,_cmd_cheat_realloc,\
 _cmd_cheat_get_size,_cmd_cheat_apply_cheats,EmscriptenSendCommand,EmscriptenReceiveCommandReply
@@ -168,7 +165,7 @@ LDFLAGS := -L. --no-heap-copy -s STACK_SIZE=$(STACK_SIZE) -s INITIAL_MEMORY=$(IN
            -s ALLOW_MEMORY_GROWTH=1 -s EXPORTED_FUNCTIONS="$(EXPORTED_FUNCTIONS)" \
            -s MODULARIZE=1 -s EXPORT_ES6=1 -s EXPORT_NAME="libretro_$(subst -,_,$(LIBRETRO))" \
            -s DISABLE_DEPRECATED_FIND_EVENT_TARGET_BEHAVIOR=0 \
-           -s ENVIRONMENT=web,worker \
+           -s ENVIRONMENT=web,worker -s WASM_BIGINT=1 \
            --extern-pre-js emscripten/pre.js \
            --js-library emscripten/library_rwebcam.js \
            --js-library emscripten/library_platform_emscripten.js
@@ -193,6 +190,9 @@ endif
 ifeq ($(HAVE_RWEBAUDIO), 1)
    LDFLAGS += --js-library emscripten/library_rwebaudio.js
    DEFINES += -DHAVE_RWEBAUDIO
+   ifeq ($(PROXY_TO_PTHREAD), 1)
+      $(error ERROR: RWEBAUDIO is incompatible with PROXY_TO_PTHREAD)
+   endif
 endif
 
 ifeq ($(HAVE_AUDIOWORKLET), 1)
@@ -202,18 +202,24 @@ ifeq ($(HAVE_AUDIOWORKLET), 1)
    ifeq ($(HAVE_THREADS), 0)
       $(error ERROR: AUDIOWORKLET requires HAVE_THREADS)
    endif
-   ifeq ($(PROXY_TO_PTHREAD), 1)
-   else ifeq ($(ASYNC), 1)
+endif
+
+ifeq ($(HAVE_AL), 1)
+   LDFLAGS += -lopenal
+   DEFINES += -DHAVE_AL
+endif
+
+ifeq ($(PROXY_TO_PTHREAD), 1)
+else ifeq ($(ASYNC), 1)
+else
+   DEFINES += -DEMSCRIPTEN_AUDIO_EXTERNAL_BLOCK
+   ifeq ($(MIN_ASYNC), 1)
+      DEFINES += -DEMSCRIPTEN_AUDIO_ASYNC_BLOCK
    else
-      DEFINES += -DEMSCRIPTEN_AUDIO_EXTERNAL_BLOCK
-      ifeq ($(MIN_ASYNC), 1)
-         DEFINES += -DEMSCRIPTEN_AUDIO_ASYNC_BLOCK
-      else
-         DEFINES += -DEMSCRIPTEN_AUDIO_FAKE_BLOCK
-      endif
-      ifneq ($(ALLOW_AUDIO_BUSYWAIT), 1)
-         DEFINES += -DEMSCRIPTEN_AUDIO_EXTERNAL_WRITE_BLOCK
-      endif
+      DEFINES += -DEMSCRIPTEN_AUDIO_FAKE_BLOCK
+   endif
+   ifneq ($(ALLOW_AUDIO_BUSYWAIT), 1)
+      DEFINES += -DEMSCRIPTEN_AUDIO_EXTERNAL_WRITE_BLOCK
    endif
 endif
 
@@ -224,23 +230,18 @@ endif
 # explanation of some of these defines:
 # EMSCRIPTEN_AUDIO_EXTERNAL_BLOCK: audio blocking occurs in the main loop instead of in the audio driver functions.
 # EMSCRIPTEN_AUDIO_EXTERNAL_WRITE_BLOCK: along with above, enables external blocking in the write function.
-# ALLOW_AUDIO_BUSYWAIT: write function will busywait. init function may still use an external block.
+# EMSCRIPTEN_AUDIO_BUSYWAIT: write function will busywait. init function may still use an external block.
 # EMSCRIPTEN_AUDIO_ASYNC_BLOCK: external block uses emscripten_sleep (requires MIN_ASYNC).
 # EMSCRIPTEN_AUDIO_FAKE_BLOCK: external block uses main loop timing (doesn't require asyncify).
 # when building with either PROXY_TO_PTHREAD or ASYNC (full asyncify), none of the above are required.
 
-ifeq ($(HAVE_AL), 1)
-   LDFLAGS += -lopenal
-   DEFINES += -DHAVE_AL
-endif
-
 ifeq ($(HAVE_THREADS), 1)
    LDFLAGS += -pthread -s PTHREAD_POOL_SIZE=$(PTHREAD_POOL_SIZE)
    CFLAGS += -pthread -s SHARED_MEMORY
 endif
 
 ifeq ($(WASM_WORKERS), 1)
-   LDFLAGS += -s WASM_WORKERS=2
+   LDFLAGS += -s WASM_WORKERS=1
 endif
 
 ifeq ($(ASYNC), 1)
@@ -251,7 +252,7 @@ ifeq ($(ASYNC), 1)
    endif
 else ifeq ($(MIN_ASYNC), 1)
    DEFINES += -DEMSCRIPTEN_ASYNCIFY -DEMSCRIPTEN_MIN_ASYNCIFY
-   LDFLAGS += -s ASYNCIFY=1 -s ASYNCIFY_STACK_SIZE=8192 -s ASYNCIFY_IGNORE_INDIRECT=1 -s ASYNCIFY_ADD='dynCall_*,emscripten_mainloop' -s ASYNCIFY_REMOVE='threaded_worker'
+   LDFLAGS += -s ASYNCIFY=1 -s ASYNCIFY_STACK_SIZE=8192 -s ASYNCIFY_IGNORE_INDIRECT=1 -s ASYNCIFY_ADD='$(ASYNCIFY_ADD)' -s ASYNCIFY_REMOVE='$(ASYNCIFY_REMOVE)'
    ifeq ($(DEBUG), 1)
       LDFLAGS += -s ASYNCIFY_ADVISE #-s ASYNCIFY_DEBUG=1
    endif
@@ -297,21 +298,11 @@ all: $(TARGET)
 $(libretro_new): ;
 
 mv_libretro:
-	mv -f $(libretro) $(libretro_new) || true
+	$(Q)mv -f $(libretro) $(libretro_new) || true
 
-# until emscripten adds something like WASM_WORKERS=2 but for audio worklets, DIY.
-ifeq ($(HAVE_AUDIOWORKLET), 1)
 $(TARGET): $(RARCH_OBJ) $(libretro_new) mv_libretro
 	@$(if $(Q), $(shell echo echo "LD $@ \<obj\> $(libretro_new) $(LIBS) $(LDFLAGS)"),)
 	$(Q)$(LD) -o $@ $(RARCH_OBJ) $(libretro_new) $(LIBS) $(LDFLAGS)
-	$(Q)tr -d '\n' < "$(TARGET_BASE).aw.js" | sed -e "s/[\/&]/\\\\&/g" -e "s/'/\\\\\\\\&/g" > _audioworklet.js
-	$(Q)sed -i.bak -e "s/\"$(TARGET_BASE)\.aw\.js\"/URL.createObjectURL(new Blob(['$$(cat _audioworklet.js)'],{type:'text\/javascript'}))/" -- "$@"
-	$(Q)rm -f "$(TARGET_BASE).aw.js" _audioworklet.js "$@".bak
-else
-$(TARGET): $(RARCH_OBJ) $(libretro_new) mv_libretro
-	@$(if $(Q), $(shell echo echo "LD $@ \<obj\> $(libretro_new) $(LIBS) $(LDFLAGS)"),)
-	$(Q)$(LD) -o $@ $(RARCH_OBJ) $(libretro_new) $(LIBS) $(LDFLAGS)
-endif
 
 $(OBJDIR)/%.o: %.c
 	@mkdir -p $(dir $@)