Merge branch 'libretro:master' into warmenhoven/pr/viewport

Author: warmenhoven

.github/workflows/MSYS2.yml

@@ -14,8 +14,21 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sys: [MINGW64, UCRT64,CLANG64]
-    runs-on: windows-latest
+        include:
+          # Existing x64 builds
+          - sys: MINGW64
+            runner: windows-latest
+          - sys: UCRT64
+            runner: windows-latest
+          - sys: CLANG64
+            runner: windows-latest
+
+          # New ARM64 build (native Windows on ARM)
+          - sys: CLANGARM64
+            runner: windows-11-arm
+
+    runs-on: ${{ matrix.runner }}
+
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
@@ -25,7 +38,9 @@ jobs:
         with:
           msystem: ${{ matrix.sys }}
           update: true
-          install: base-devel git
+          install: >-
+            base-devel
+            git
           pacboy: >-
             gettext:p
             gobject-introspection:p
@@ -57,17 +72,18 @@ jobs:
       - name: Configure and build RetroArch
         shell: msys2 {0}
         run: |
-          echo "Building RetroArch in ${{ matrix.sys }} environment"
+          echo "Building RetroArch in ${{ matrix.sys }} on ${{ matrix.runner }}"
           ./configure
-          make -j$(nproc) info all
+          make -j"$(nproc)" info all
 
       - name: Collect DLLs and binaries
         shell: msys2 {0}
         run: |
           echo "Collecting DLLs and binaries"
+          rm -rf dist
           mkdir -p dist
           cp retroarch.exe dist/
-          ldd retroarch.exe|grep $MINGW_PREFIX |awk '{print $3}'|xargs -I {} cp {} dist/
+          ldd retroarch.exe | grep "$MINGW_PREFIX" | awk '{print $3}' | xargs -I {} cp {} dist/ || true
 
       - name: Archive build artifacts
         if: success()

.github/workflows/Windows-ARM64.yml

@@ -0,0 +1,44 @@
+name: CI Windows ARM64 (MSVC)
+
+on:
+  push:
+  pull_request:
+  repository_dispatch:
+    types: [run_build]
+
+permissions:
+  contents: read
+
+env:
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
+
+jobs:
+  msvc:
+    runs-on: windows-11-arm
+    strategy:
+      matrix:
+        version: [2022]
+        configuration: [Debug, Release]
+        platform: [ARM64]
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Add msbuild to PATH
+        uses: microsoft/setup-msbuild@v1
+
+      - name: Compile RA
+        working-directory: "${{ github.workspace }}/pkg/msvc"
+        run: |
+          msbuild -p:"Configuration=${{ matrix.configuration }}" -p:"Platform=${{ matrix.platform }}" .\RetroArch-msvc${{ matrix.version }}.sln
+
+      - name: Get short SHA
+        id: slug
+        shell: powershell
+        run: echo "sha8=$('${{ github.sha }}'.Substring(0,8))"  >> $env:GITHUB_OUTPUT
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: retroarch-${{ matrix.version }}-${{ matrix.configuration }}-${{ matrix.platform }}-${{ steps.slug.outputs.sha8 }}
+          path: |
+            pkg/msvc/${{ matrix.platform }}/${{ matrix.configuration }}/RetroArch-msvc${{ matrix.version }}.exe

.github/workflows/webOS.yml

@@ -68,28 +68,32 @@ jobs:
           RARCH_VERSION=$(grep -Po '(?<=#define PACKAGE_VERSION ")[^"]+' version.all)
           echo "RARCH_VERSION=$RARCH_VERSION" >> "$GITHUB_ENV"
 
-      - name: Compile RA (GLES3 variant)
+      - name: Compile RA (GLES3 and Wayland variant)
         shell: bash
         run: |
           . /tmp/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
+          export SDK_PATH=/tmp/arm-webos-linux-gnueabi_sdk-buildroot
           make -f Makefile.webos clean
+          bash gfx/common/wayland/generate_wayland_protos.sh
           make -f Makefile.webos ipk PACKAGE_NAME=${PACKAGE_NAME} ADD_SDL2_LIB=1 \
+            HAVE_XKBCOMMON=1 HAVE_USERLAND=1 HAVE_EGL=1 HAVE_WAYLAND=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
+             webos/com.retroarch.webos.gles3w_${RARCH_VERSION}_arm.ipk
         env:
           DEBUG: ${{ github.event_name == 'release' && '0' || '1' }}
 
-      - name: Upload GLES3 artifact
+      - name: Upload GLES3 and Wayland 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: com.retroarch.webos.gles3w_${{ env.RARCH_VERSION }}_${{ github.sha }}_arm.ipk
+          path: webos/com.retroarch.webos.gles3w_${{ 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 clean
           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' }}
@@ -121,5 +125,5 @@ jobs:
           omitPrereleaseDuringUpdate: true
           artifacts: |
             webos/com.retroarch.webos_${{ env.RARCH_VERSION }}_arm.ipk
-            webos/com.retroarch.webos.gles3_${{ env.RARCH_VERSION }}_arm.ipk
+            webos/com.retroarch.webos.gles3w_${{ env.RARCH_VERSION }}_arm.ipk
             webos/${{ env.PACKAGE_NAME }}.manifest.json

.gitignore

@@ -242,6 +242,14 @@ 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
+gfx/common/wayland/webos-foreign.c
+gfx/common/wayland/webos-foreign.h
+gfx/common/wayland/webos-input-manager.c
+gfx/common/wayland/webos-input-manager.h
+gfx/common/wayland/webos-shell.c
+gfx/common/wayland/webos-shell.h
+gfx/common/wayland/webos-surface-group.c
+gfx/common/wayland/webos-surface-group.h
 
 # libretro-common samples
 libretro-common/samples/streams/rzip/rzip

.gitlab-ci.yml

@@ -327,7 +327,29 @@ build-retroarch-linux-i686:
     - "cd gfx/video_filters && make -j$NUMPROC build=release && make -j$NUMPROC build=release strip && cd -"
     - "cp -f gfx/video_filters/*.so ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
     - "cp -f gfx/video_filters/*.filt ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video"
-  
+
+build-retroarch-webos-armv7a:
+  image: $CI_SERVER_HOST:5050/libretro-infrastructure/libretro-build-webos:latest
+  stage: build
+  variables:
+    MEDIA_PATH: .media
+  before_script:
+    - export NUMPROC=$(($(nproc)/3))
+    - . /developer/arm-webos-linux-gnueabi_sdk-buildroot/environment-setup
+  artifacts:
+    paths:
+    - retroarch
+    - ${MEDIA_PATH}
+    expire_in: 10 min
+  dependencies: []
+  script:
+    - make -f Makefile.webos retroarch -j$NUMPROC
+    - arm-webos-linux-gnueabi-strip --strip-unneeded retroarch
+    - mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio
+    - mkdir -p ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video
+    - cp -f libretro-common/audio/dsp_filters/*.dsp ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/audio
+    - cp -f gfx/video_filters/*.filt ${MEDIA_PATH}/${CI_PROJECT_NAME}/filters/video
+
 .build-retroarch-macos-xcode:
   # Metal/Universal x86_64 arm64 is default
   tags:

CONTRIBUTING.md

@@ -3,7 +3,7 @@
 If you are a developer who wishes to contribute to the development of _RetroArch_; or if you have
 found a bug and wish to submit a minor patch and/or bug report, please read this document.
 
-Active discussions happen on our [Discord](https://discordapp.com/invite/27Xxm2h), mostly within
+Active discussions happen on our [Discord](https://discord.gg/C4amCeV), mostly within
 the _Programming_ channel category. We value discussions that happen in real time around
 these contributions.
 
@@ -64,7 +64,7 @@ may be merged in when it is fully approved. The final approval of merge requests
 discretion of the project.
 
 If you want to develop a larger feature or make broad changes, please do join our
-[Discord](https://discordapp.com/invite/27Xxm2h) server to discuss. The discussion is
+[Discord](https://discord.gg/C4amCeV) server to discuss. The discussion is
 necessary to prevent the possibility of major work being done which will not be accepted at all.
 
 ## libretro API

Makefile.common

@@ -1289,6 +1289,16 @@ ifeq ($(HAVE_WAYLAND), 1)
       OBJ += gfx/drivers_context/wayland_vk_ctx.o
    endif
 
+   ifeq ($(WEBOS), 1)
+      OBJ += input/common/wayland_common_webos.o
+      OBJ += gfx/common/wayland/webos-shell.o
+      ifeq ($(HAVE_WEBOS_EXTRA_PROTOS), 1)
+         OBJ += gfx/common/wayland/webos-foreign.o
+         OBJ += gfx/common/wayland/webos-input-manager.o
+         OBJ += gfx/common/wayland/webos-surface-group.o
+      endif
+   endif
+
  DEF_FLAGS += $(WAYLAND_CFLAGS) $(WAYLAND_CURSOR_CFLAGS)
  LIBS += $(WAYLAND_LIBS) $(WAYLAND_CURSOR_LIBS)
 
@@ -2698,6 +2708,96 @@ ifeq ($(HAVE_TEST_DRIVERS), 1)
   OBJ += input/drivers/test_input.o
 endif
 
+ifneq (,$(filter 1,$(HAVE_SMBCLIENT) $(HAVE_BUILTINSMBCLIENT)))
+   DEFINES += -DHAVE_SMBCLIENT
+
+   ifeq ($(HAVE_SMBCLIENT),1)
+      # system libsmb2
+      ifeq ($(shell pkg-config --exists libsmb2 && echo yes),yes)
+         CFLAGS += $(shell pkg-config --cflags libsmb2)
+         LIBS   += $(shell pkg-config --libs libsmb2)
+      else
+         LIBS   += -lsmb2
+      endif
+   else ifeq ($(HAVE_BUILTINSMBCLIENT),1)
+      # builtin libsmb2
+      ifneq ($(findstring Win32,$(OS)),)
+         CFLAGS += -D_WINDOWS -DWIN32_LEAN_AND_MEAN
+         CFLAGS += -DNEED_RANDOM -DNEED_SRANDOM -DNEED_GETLOGIN_R
+      endif
+      INCLUDE_DIRS += -I$(DEPS_DIR)/libsmb2/include
+      INCLUDE_DIRS += -I$(DEPS_DIR)/libsmb2/include/smb2
+      CFLAGS += "-D_U_=__attribute__((unused))"
+      CFLAGS += -DHAVE_TIME_H -DHAVE_FCNTL_H -DHAVE_UNISTD_H
+      CFLAGS += -DHAVE_STDLIB_H -DSTDC_HEADERS
+      CFLAGS += -DHAVE_STRING_H
+      CFLAGS += -DHAVE_LINGER
+ifeq ($(findstring Win32,$(OS)),)
+      CFLAGS += -DHAVE_SYS_UIO_H
+      CFLAGS += -DHAVE_POLL_H -DHAVE_NETDB_H
+      CFLAGS += -DHAVE_NETINET_TCP_H -DHAVE_NETINET_IN_H
+      CFLAGS += -DHAVE_SYS_SOCKET_H -DHAVE_ARPA_INET_H
+endif
+      OBJ += \
+         deps/libsmb2/lib/aes.o \
+         deps/libsmb2/lib/aes_apple.o \
+         deps/libsmb2/lib/aes128ccm.o \
+         deps/libsmb2/lib/asn1-ber.o \
+         deps/libsmb2/lib/aes_reference.o \
+         deps/libsmb2/lib/alloc.o \
+         deps/libsmb2/lib/compat.o \
+         deps/libsmb2/lib/dcerpc.o \
+         deps/libsmb2/lib/dcerpc-lsa.o \
+         deps/libsmb2/lib/dcerpc-srvsvc.o \
+         deps/libsmb2/lib/errors.o \
+         deps/libsmb2/lib/hmac.o \
+         deps/libsmb2/lib/hmac-md5.o \
+         deps/libsmb2/lib/init.o \
+         deps/libsmb2/lib/krb5-wrapper.o \
+         deps/libsmb2/lib/libsmb2.o \
+         deps/libsmb2/lib/md4c.o \
+         deps/libsmb2/lib/md5.o \
+         deps/libsmb2/lib/ntlmssp.o \
+         deps/libsmb2/lib/pdu.o \
+         deps/libsmb2/lib/sha1.o \
+         deps/libsmb2/lib/sha224-256.o \
+         deps/libsmb2/lib/sha384-512.o \
+         deps/libsmb2/lib/smb2-cmd-close.o \
+         deps/libsmb2/lib/smb2-cmd-create.o \
+         deps/libsmb2/lib/smb2-cmd-echo.o \
+         deps/libsmb2/lib/smb2-cmd-error.o \
+         deps/libsmb2/lib/smb2-cmd-flush.o \
+         deps/libsmb2/lib/smb2-cmd-ioctl.o \
+         deps/libsmb2/lib/smb2-cmd-lock.o \
+         deps/libsmb2/lib/smb2-cmd-logoff.o \
+         deps/libsmb2/lib/smb2-cmd-negotiate.o \
+         deps/libsmb2/lib/smb2-cmd-oplock-break.o \
+         deps/libsmb2/lib/smb2-cmd-notify-change.o \
+         deps/libsmb2/lib/smb2-cmd-query-directory.o \
+         deps/libsmb2/lib/smb2-cmd-query-info.o \
+         deps/libsmb2/lib/smb2-cmd-read.o \
+         deps/libsmb2/lib/smb2-cmd-session-setup.o \
+         deps/libsmb2/lib/smb2-cmd-set-info.o \
+         deps/libsmb2/lib/smb2-cmd-tree-connect.o \
+         deps/libsmb2/lib/smb2-cmd-tree-disconnect.o \
+         deps/libsmb2/lib/smb2-cmd-write.o \
+         deps/libsmb2/lib/smb2-data-file-info.o \
+         deps/libsmb2/lib/smb2-data-filesystem-info.o \
+         deps/libsmb2/lib/smb2-data-security-descriptor.o \
+         deps/libsmb2/lib/smb2-data-reparse-point.o \
+         deps/libsmb2/lib/smb2-share-enum.o \
+         deps/libsmb2/lib/smb2-signing.o \
+         deps/libsmb2/lib/smb3-seal.o \
+         deps/libsmb2/lib/socket.o \
+         deps/libsmb2/lib/spnego-wrapper.o \
+         deps/libsmb2/lib/sync.o \
+         deps/libsmb2/lib/timestamps.o \
+         deps/libsmb2/lib/usha.o \
+         deps/libsmb2/lib/unicode.o
+   endif
+
+   OBJ += $(LIBRETRO_COMM_DIR)/vfs/vfs_implementation_smb.o
+endif
 
 #####################################
 ### Android Play Feature Delivery ###