Merge branch 'master' into master

Author: sam1am

.github/workflows/ci-bundle.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e  # v6.4.0
 
       - name: Install npm dependencies
-        run: npm install --ignore-scripts
+        run: npm ci --ignore-scripts
 
       - name: Debug install
         if: always()

.github/workflows/ci-flatpak.yml

@@ -44,18 +44,6 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Setup node
-        id: node
-        uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e  # v6.4.0
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-
-      - name: Install npm dependencies
-        run: npm install --ignore-scripts --package-lock-only
-
-      - name: Debug package-lock.json
-        run: cat package-lock.json
-
       - name: Setup python
         id: python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405  # v6.2.0
@@ -209,9 +197,9 @@ jobs:
           mkdir -p flathub/modules
           cp "./build/generated-sources.json" "./flathub/"
           cp "./build/glad-dependencies.json" "./flathub/"
-          cp "./build/package-lock.json" "./flathub/"
           cp "./build/${APP_ID}.yml" "./flathub/"
           cp "./build/${APP_ID}.metainfo.xml" "./flathub/"
+          cp "./package-lock.json" "./flathub/"
           cp "./packaging/linux/flatpak/README.md" "./flathub/"
           cp "./packaging/linux/flatpak/flathub.json" "./flathub/"
           cp -r "./packaging/linux/flatpak/modules/." "./flathub/modules/"

.github/workflows/ci-freebsd.yml

@@ -173,6 +173,7 @@ jobs:
             -DSUNSHINE_EXECUTABLE_PATH=/usr/local/bin/sunshine \
             -DSUNSHINE_ENABLE_CUDA=OFF \
             -DSUNSHINE_ENABLE_DRM=OFF \
+            -DSUNSHINE_ENABLE_KWIN=ON \
             -DSUNSHINE_ENABLE_PORTAL=ON \
             -DSUNSHINE_ENABLE_WAYLAND=ON \
             -DSUNSHINE_ENABLE_X11=ON \

.github/workflows/ci-windows.yml

@@ -111,7 +111,6 @@ jobs:
             dependencies+=(
               "mingw-w64-${TOOLCHAIN}-MinHook"
               "mingw-w64-${TOOLCHAIN}-nsis"
-              "mingw-w64-${TOOLCHAIN}-nodejs"
             )
           fi
 
@@ -177,14 +176,11 @@ jobs:
           dotnet-version: '10.x'
 
       - name: Setup NodeJS
-        # Clang compiled NodeJS has issues when running rollup webpack
-        if: matrix.msystem != 'ucrt64'
         uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e  # v6.4.0
         with:
           node-version: 'lts/*'
 
       - name: NodeJS Path
-        if: matrix.msystem != 'ucrt64'
         shell: pwsh
         run: |
           # get NodeJS PATH
@@ -226,10 +222,8 @@ jobs:
           COMMIT: ${{ inputs.release_commit }}
         run: |
           # setup NodeJS PATH
-          if [[ "${MATRIX_MSYSTEM}" != "ucrt64" ]]; then
-            NODEJS_PATH=$(cygpath "$NODEJS_PATH")
-            export PATH="$PATH:$NODEJS_PATH"
-          fi
+          NODEJS_PATH=$(cygpath "$NODEJS_PATH")
+          export PATH="$PATH:$NODEJS_PATH"
 
           mkdir -p build
           cmake \

.github/workflows/release-notifier-moonlight.yml

@@ -44,7 +44,6 @@ docs/doxyconfig*
 
 # npm
 node_modules/
-package-lock.json
 
 # Translations
 *.mo

.gitignore

@@ -45,6 +45,10 @@
 	path = third-party/nvapi
 	url = https://github.com/NVIDIA/nvapi.git
 	branch = main
+[submodule "third-party/plasma-wayland-protocols"]
+	path = third-party/plasma-wayland-protocols
+	url = https://github.com/KDE/plasma-wayland-protocols.git
+	branch = master
 [submodule "third-party/Simple-Web-Server"]
 	path = third-party/Simple-Web-Server
 	url = https://github.com/LizardByte-infrastructure/Simple-Web-Server.git

.gitmodules

@@ -276,6 +276,13 @@ LizardByte has the full documentation hosted on [Read the Docs](https://docs.liz
         <td>➖</td>
         <td>➖</td>
     </tr>
+    <tr>
+        <td>KWin Screencast</td>
+        <td>✅</td>
+        <td>✅</td>
+        <td>➖</td>
+        <td>➖</td>
+    </tr>
 </table>
 
 <table>
@@ -322,6 +329,13 @@ LizardByte has the full documentation hosted on [Read the Docs](https://docs.liz
         <td>✅</td>
         <td>✅</td>
     </tr>
+    <tr>
+        <td>KWin Screencast</td>
+        <td>✅</td>
+        <td>✅</td>
+        <td>✅</td>
+        <td>✅</td>
+    </tr>
 </table>
 
 **Legend:** ✅ Supported | 🟡 Partial Support | ❌ Not Yet Supported | ➖ Not Applicable

README.md

@@ -76,8 +76,8 @@ if(CUDA_FOUND)
     add_compile_definitions(SUNSHINE_BUILD_CUDA)
 endif()
 
-# libdrm is required for both DRM (KMS) and Wayland
-if(${SUNSHINE_ENABLE_DRM} OR ${SUNSHINE_ENABLE_WAYLAND})
+# libdrm is required for DRM (KMS), KWin ScreenCast and Wayland
+if(${SUNSHINE_ENABLE_DRM} OR ${SUNSHINE_ENABLE_KWIN} OR ${SUNSHINE_ENABLE_WAYLAND})
     find_package(LIBDRM REQUIRED)
 else()
     set(LIBDRM_FOUND OFF)
@@ -122,8 +122,14 @@ endif()
 
 # vulkan video encoding (via FFmpeg)
 if(${SUNSHINE_ENABLE_VULKAN})
-    # use Vulkan headers from build-deps submodule (system headers may be too old, e.g. Ubuntu 22.04)
-    set(VULKAN_HEADERS_DIR "${CMAKE_SOURCE_DIR}/third-party/build-deps/third-party/FFmpeg/Vulkan-Headers/include")
+    if(NOT SUNSHINE_SYSTEM_VULKAN_HEADERS)
+        # use Vulkan headers from build-deps submodule (system headers may be too old, e.g. Ubuntu 22.04)
+        set(VULKAN_HEADERS_DIR "${CMAKE_SOURCE_DIR}/third-party/build-deps/third-party/FFmpeg/Vulkan-Headers/include")
+    else()
+        find_package(VulkanHeaders REQUIRED)
+        get_target_property(VULKAN_HEADERS_DIR Vulkan::Headers INTERFACE_INCLUDE_DIRECTORIES)
+    endif()
+
     if(NOT EXISTS "${VULKAN_HEADERS_DIR}/vulkan/vulkan.h")
         message(FATAL_ERROR "Vulkan headers not found in build-deps submodule")
     endif()
@@ -243,7 +249,7 @@ if(GIO_FOUND)
 endif()
 
 # Pipewire
-if(${SUNSHINE_ENABLE_PORTAL})
+if(${SUNSHINE_ENABLE_KWIN} OR ${SUNSHINE_ENABLE_PORTAL})
     pkg_check_modules(PIPEWIRE libpipewire-0.3 REQUIRED)
 else()
     set(PIPEWIRE_FOUND OFF)
@@ -264,13 +270,27 @@ if(PIPEWIRE_FOUND AND GIO_FOUND AND ${SUNSHINE_ENABLE_PORTAL})
             "${CMAKE_SOURCE_DIR}/src/platform/linux/portalgrab.cpp")
 endif()
 
+# KWin ScreenCast (direct Wayland protocol, bypasses portal)
+set(KWIN_FOUND OFF)
+if(PIPEWIRE_FOUND AND WAYLAND_FOUND AND ${SUNSHINE_ENABLE_KWIN})
+    set(KWIN_FOUND ON)
+    add_compile_definitions(SUNSHINE_BUILD_KWIN)
+    GEN_WAYLAND("${CMAKE_SOURCE_DIR}/third-party/plasma-wayland-protocols/src/protocols" "" kde-output-order-v1)
+    GEN_WAYLAND("${CMAKE_SOURCE_DIR}/third-party/plasma-wayland-protocols/src/protocols" "" zkde-screencast-unstable-v1)
+    list(APPEND PLATFORM_TARGET_FILES
+            "${CMAKE_SOURCE_DIR}/src/platform/linux/kwingrab.cpp")
+elseif(${SUNSHINE_ENABLE_KWIN} AND NOT WAYLAND_FOUND)
+    message(FATAL_ERROR "SUNSHINE_ENABLE_KWIN requires SUNSHINE_ENABLE_WAYLAND — KWin capture disabled")
+endif()
+
 if(NOT ${CUDA_FOUND}
-        AND NOT ${WAYLAND_FOUND}
-        AND NOT ${X11_FOUND}
-        AND NOT ${PORTAL_FOUND}
         AND NOT (${LIBDRM_FOUND} AND ${LIBCAP_FOUND})
-        AND NOT ${LIBVA_FOUND})
-    message(FATAL_ERROR "Couldn't find either cuda, libva, pipewire, wayland, x11, or (libdrm and libcap)")
+        AND NOT ${LIBVA_FOUND}
+        AND NOT ${KWIN_FOUND}
+        AND NOT ${PORTAL_FOUND}
+        AND NOT ${WAYLAND_FOUND}
+        AND NOT ${X11_FOUND})
+    message(FATAL_ERROR "Couldn't find either cuda, (libdrm and libcap), libva, kwin, pipewire, portal, wayland or x11")
 endif()
 
 # tray icon

cmake/compile_definitions/linux.cmake

@@ -173,6 +173,10 @@ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_FQDN}.desktop"
 if(NOT ${SUNSHINE_BUILD_APPIMAGE} AND NOT ${SUNSHINE_BUILD_FLATPAK})
     install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_FQDN}.terminal.desktop"
             DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
+    if(${SUNSHINE_ENABLE_KWIN})
+        install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_FQDN}.kwin.desktop"
+                DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
+    endif()
 endif()
 
 # metadata file