Merge remote-tracking branch 'sunshine/master'

2025-07-13 23:16:01 +08:00
parent a09c18cf9e 35f0b30845
commit e43420f18b
93 changed files with 2952 additions and 493 deletions
--- a/cmake/compile_definitions/common.cmake
+++ b/cmake/compile_definitions/common.cmake
@@ -52,9 +52,6 @@ include_directories(BEFORE SYSTEM "${CMAKE_SOURCE_DIR}/third-party/nv-codec-head
 file(GLOB NVENC_SOURCES CONFIGURE_DEPENDS "src/nvenc/*.cpp" "src/nvenc/*.h")
 list(APPEND PLATFORM_TARGET_FILES ${NVENC_SOURCES})

-configure_file("${CMAKE_SOURCE_DIR}/src/version.h.in" version.h @ONLY)
-include_directories(BEFORE "${CMAKE_CURRENT_BINARY_DIR}")  # required for importing version.h
-
 set(SUNSHINE_TARGET_FILES
        "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/src/Input.h"
        "${CMAKE_SOURCE_DIR}/third-party/moonlight-common-c/src/Rtsp.h"
--- a/cmake/compile_definitions/linux.cmake
+++ b/cmake/compile_definitions/linux.cmake
@@ -85,18 +85,27 @@ if(CUDA_FOUND)
    add_compile_definitions(SUNSHINE_BUILD_CUDA)
 endif()

-# drm
-if(${SUNSHINE_ENABLE_DRM})
+# libdrm is required for both DRM (KMS) and Wayland
+if(${SUNSHINE_ENABLE_DRM} OR ${SUNSHINE_ENABLE_WAYLAND})
    find_package(LIBDRM REQUIRED)
-    find_package(LIBCAP REQUIRED)
 else()
    set(LIBDRM_FOUND OFF)
+endif()
+if(LIBDRM_FOUND)
+    include_directories(SYSTEM ${LIBDRM_INCLUDE_DIRS})
+    list(APPEND PLATFORM_LIBRARIES ${LIBDRM_LIBRARIES})
+endif()
+
+# drm
+if(${SUNSHINE_ENABLE_DRM})
+    find_package(LIBCAP REQUIRED)
+else()
    set(LIBCAP_FOUND OFF)
 endif()
 if(LIBDRM_FOUND AND LIBCAP_FOUND)
    add_compile_definitions(SUNSHINE_BUILD_DRM)
-    include_directories(SYSTEM ${LIBDRM_INCLUDE_DIRS} ${LIBCAP_INCLUDE_DIRS})
-    list(APPEND PLATFORM_LIBRARIES ${LIBDRM_LIBRARIES} ${LIBCAP_LIBRARIES})
+    include_directories(SYSTEM ${LIBCAP_INCLUDE_DIRS})
+    list(APPEND PLATFORM_LIBRARIES ${LIBCAP_LIBRARIES})
    list(APPEND PLATFORM_TARGET_FILES
            "${CMAKE_SOURCE_DIR}/src/platform/linux/kmsgrab.cpp")
    list(APPEND SUNSHINE_DEFINITIONS EGL_NO_X11=1)
--- a/cmake/compile_definitions/windows.cmake
+++ b/cmake/compile_definitions/windows.cmake
@@ -38,10 +38,17 @@ if(NOT DEFINED SUNSHINE_ICON_PATH)
    set(SUNSHINE_ICON_PATH "${CMAKE_SOURCE_DIR}/apollo.ico")
 endif()

-configure_file("${CMAKE_SOURCE_DIR}/src/platform/windows/windows.rc.in" windows.rc @ONLY)
+# Create a separate object library for the RC file with minimal includes
+add_library(sunshine_rc_object OBJECT "${CMAKE_SOURCE_DIR}/src/platform/windows/windows.rc")
+
+# Set minimal properties for RC compilation - only what's needed for the resource file
+# Otherwise compilation can fail due to "line too long" errors
+set_target_properties(sunshine_rc_object PROPERTIES
+    COMPILE_DEFINITIONS "PROJECT_ICON_PATH=${SUNSHINE_ICON_PATH};PROJECT_NAME=${PROJECT_NAME};PROJECT_VENDOR=${SUNSHINE_PUBLISHER_NAME};PROJECT_VERSION=${PROJECT_VERSION};PROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR};PROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR};PROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH}"  # cmake-lint: disable=C0301
+    INCLUDE_DIRECTORIES ""
+)

 set(PLATFORM_TARGET_FILES
-        "${CMAKE_CURRENT_BINARY_DIR}/windows.rc"
        "${CMAKE_SOURCE_DIR}/src/platform/windows/publish.cpp"
        "${CMAKE_SOURCE_DIR}/src/platform/windows/misc.h"
        "${CMAKE_SOURCE_DIR}/src/platform/windows/misc.cpp"
--- a/cmake/packaging/common.cmake
+++ b/cmake/packaging/common.cmake
@@ -3,7 +3,10 @@
 # common cpack options
 set(CPACK_PACKAGE_NAME ${CMAKE_PROJECT_NAME})
 set(CPACK_PACKAGE_VENDOR "SudoMaker")
-string(REGEX REPLACE "^v" "" CPACK_PACKAGE_VERSION ${PROJECT_VERSION})  # remove the v prefix if it exists
+set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
+set(CPACK_PACKAGE_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PROJECT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PROJECT_VERSION_PATCH})
 set(CPACK_PACKAGE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/cpack_artifacts)
 set(CPACK_PACKAGE_CONTACT "https://www.sudomaker.com")
 set(CPACK_PACKAGE_DESCRIPTION ${CMAKE_PROJECT_DESCRIPTION})
--- a/cmake/packaging/linux.cmake
+++ b/cmake/packaging/linux.cmake
@@ -136,26 +136,13 @@ if(${SUNSHINE_TRAY} STREQUAL 1)
 endif()

 # desktop file
-# todo - validate desktop files with `desktop-file-validate`
-if(NOT ${SUNSHINE_BUILD_FLATPAK})
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sunshine.desktop"
-            DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
-else()
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sunshine.desktop"
-            DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications"
-            RENAME "${PROJECT_FQDN}.desktop")
-endif()
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_FQDN}.desktop"
+        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
 if(NOT ${SUNSHINE_BUILD_APPIMAGE} AND NOT ${SUNSHINE_BUILD_FLATPAK})
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sunshine_terminal.desktop"
+    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_FQDN}.terminal.desktop"
            DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
 endif()

 # metadata file
-# todo - validate file with `appstream-util validate-relax`
-if(NOT ${SUNSHINE_BUILD_FLATPAK})
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/sunshine.appdata.xml"
-            DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
-else()
-    install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_FQDN}.metainfo.xml"
-            DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
-endif()
+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_FQDN}.metainfo.xml"
+        DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo")
--- a/cmake/prep/build_version.cmake
+++ b/cmake/prep/build_version.cmake
@@ -1,18 +1,34 @@
+# Set build variables if env variables are defined
+# These are used in configured files such as manifests for different packages
+if(DEFINED ENV{BRANCH})  # cmake-lint: disable=W0106
+    set(GITHUB_BRANCH $ENV{BRANCH})
+endif()
+if(DEFINED ENV{BUILD_VERSION})  # cmake-lint: disable=W0106
+    set(BUILD_VERSION $ENV{BUILD_VERSION})
+endif()
+if(DEFINED ENV{CLONE_URL})  # cmake-lint: disable=W0106
+    set(GITHUB_CLONE_URL $ENV{CLONE_URL})
+endif()
+if(DEFINED ENV{COMMIT})  # cmake-lint: disable=W0106
+    set(GITHUB_COMMIT $ENV{COMMIT})
+endif()
+if(DEFINED ENV{TAG})  # cmake-lint: disable=W0106
+    set(GITHUB_TAG $ENV{TAG})
+endif()
+
 # Check if env vars are defined before attempting to access them, variables will be defined even if blank
-if((DEFINED ENV{BRANCH}) AND (DEFINED ENV{BUILD_VERSION}) AND (DEFINED ENV{COMMIT}))  # cmake-lint: disable=W0106
-    if(($ENV{BRANCH} STREQUAL "master") AND (NOT $ENV{BUILD_VERSION} STREQUAL ""))
-        # If BRANCH is "master" and BUILD_VERSION is not empty, then we are building a master branch
-        MESSAGE("Got from CI master branch and version $ENV{BUILD_VERSION}")
+if((DEFINED ENV{BRANCH}) AND (DEFINED ENV{BUILD_VERSION}))  # cmake-lint: disable=W0106
+    if((DEFINED ENV{BRANCH}) AND (NOT $ENV{BUILD_VERSION} STREQUAL ""))
+        # If BRANCH is defined and BUILD_VERSION is not empty, then we are building from CI
+        # If BRANCH is master we are building a push/release build
+        MESSAGE("Got from CI '$ENV{BRANCH}' branch and version '$ENV{BUILD_VERSION}'")
        set(PROJECT_VERSION $ENV{BUILD_VERSION})
+        string(REGEX REPLACE "^v" "" PROJECT_VERSION ${PROJECT_VERSION})  # remove the v prefix if it exists
        set(CMAKE_PROJECT_VERSION ${PROJECT_VERSION})  # cpack will use this to set the binary versions
-    elseif((DEFINED ENV{BRANCH}) AND (DEFINED ENV{COMMIT}))
-        # If BRANCH is set but not BUILD_VERSION we are building a PR, we gather only the commit hash
-        MESSAGE("Got from CI $ENV{BRANCH} branch and commit $ENV{COMMIT}")
-        set(PROJECT_VERSION ${PROJECT_VERSION}.$ENV{COMMIT})
    endif()
+else()
    # Generate Sunshine Version based of the git tag
    # https://github.com/nocnokneo/cmake-git-versioning-example/blob/master/LICENSE
-else()
    find_package(Git)
    if(GIT_EXECUTABLE)
        MESSAGE("${CMAKE_SOURCE_DIR}")
@@ -54,3 +70,72 @@ else()
        MESSAGE(WARNING ": Git not found, cannot find git version")
    endif()
 endif()
+
+# set date variables
+set(PROJECT_YEAR "1990")
+set(PROJECT_MONTH "01")
+set(PROJECT_DAY "01")
+
+# Extract year, month, and day (do this AFTER version parsing)
+# Note: Cmake doesn't support "{}" regex syntax
+if(PROJECT_VERSION MATCHES "^([0-9][0-9][0-9][0-9])\\.([0-9][0-9][0-9][0-9]?)\\.([0-9]+)$")
+    message("Extracting year and month/day from PROJECT_VERSION: ${PROJECT_VERSION}")
+    # First capture group is the year
+    set(PROJECT_YEAR "${CMAKE_MATCH_1}")
+
+    # Second capture group contains month and day
+    set(MONTH_DAY "${CMAKE_MATCH_2}")
+
+    # Extract month (first 1-2 digits) and day (last 2 digits)
+    string(LENGTH "${MONTH_DAY}" MONTH_DAY_LENGTH)
+    if(MONTH_DAY_LENGTH EQUAL 3)
+        # Format: MDD (e.g., 703 = month 7, day 03)
+        string(SUBSTRING "${MONTH_DAY}" 0 1 PROJECT_MONTH)
+        string(SUBSTRING "${MONTH_DAY}" 1 2 PROJECT_DAY)
+    elseif(MONTH_DAY_LENGTH EQUAL 4)
+        # Format: MMDD (e.g., 1203 = month 12, day 03)
+        string(SUBSTRING "${MONTH_DAY}" 0 2 PROJECT_MONTH)
+        string(SUBSTRING "${MONTH_DAY}" 2 2 PROJECT_DAY)
+    endif()
+
+    # Ensure month is two digits
+    if(PROJECT_MONTH LESS 10 AND NOT PROJECT_MONTH MATCHES "^0")
+        set(PROJECT_MONTH "0${PROJECT_MONTH}")
+    endif()
+    # Ensure day is two digits
+    if(PROJECT_DAY LESS 10 AND NOT PROJECT_DAY MATCHES "^0")
+        set(PROJECT_DAY "0${PROJECT_DAY}")
+    endif()
+endif()
+
+# Parse PROJECT_VERSION to extract major, minor, and patch components
+if(PROJECT_VERSION MATCHES "([0-9]+)\\.([0-9]+)\\.([0-9]+)")
+    set(PROJECT_VERSION_MAJOR "${CMAKE_MATCH_1}")
+    set(CMAKE_PROJECT_VERSION_MAJOR "${CMAKE_MATCH_1}")
+
+    set(PROJECT_VERSION_MINOR "${CMAKE_MATCH_2}")
+    set(CMAKE_PROJECT_VERSION_MINOR "${CMAKE_MATCH_2}")
+
+    set(PROJECT_VERSION_PATCH "${CMAKE_MATCH_3}")
+    set(CMAKE_PROJECT_VERSION_PATCH "${CMAKE_MATCH_3}")
+endif()
+
+message("PROJECT_NAME: ${PROJECT_NAME}")
+message("PROJECT_VERSION: ${PROJECT_VERSION}")
+message("PROJECT_VERSION_MAJOR: ${PROJECT_VERSION_MAJOR}")
+message("PROJECT_VERSION_MINOR: ${PROJECT_VERSION_MINOR}")
+message("PROJECT_VERSION_PATCH: ${PROJECT_VERSION_PATCH}")
+message("CMAKE_PROJECT_VERSION: ${CMAKE_PROJECT_VERSION}")
+message("CMAKE_PROJECT_VERSION_MAJOR: ${CMAKE_PROJECT_VERSION_MAJOR}")
+message("CMAKE_PROJECT_VERSION_MINOR: ${CMAKE_PROJECT_VERSION_MINOR}")
+message("CMAKE_PROJECT_VERSION_PATCH: ${CMAKE_PROJECT_VERSION_PATCH}")
+message("PROJECT_YEAR: ${PROJECT_YEAR}")
+message("PROJECT_MONTH: ${PROJECT_MONTH}")
+message("PROJECT_DAY: ${PROJECT_DAY}")
+
+list(APPEND SUNSHINE_DEFINITIONS PROJECT_NAME="${PROJECT_NAME}")
+list(APPEND SUNSHINE_DEFINITIONS PROJECT_VERSION="${PROJECT_VERSION}")
+list(APPEND SUNSHINE_DEFINITIONS PROJECT_VERSION_MAJOR="${PROJECT_VERSION_MAJOR}")
+list(APPEND SUNSHINE_DEFINITIONS PROJECT_VERSION_MINOR="${PROJECT_VERSION_MINOR}")
+list(APPEND SUNSHINE_DEFINITIONS PROJECT_VERSION_PATCH="${PROJECT_VERSION_PATCH}")
+list(APPEND SUNSHINE_DEFINITIONS PROJECT_VERSION_COMMIT="${GITHUB_COMMIT}")
--- a/cmake/prep/special_package_configuration.cmake
+++ b/cmake/prep/special_package_configuration.cmake
@@ -12,19 +12,17 @@ elseif(UNIX)
    # configure the .desktop file
    set(SUNSHINE_DESKTOP_ICON "apollo.svg")
    if(${SUNSHINE_BUILD_APPIMAGE})
-        configure_file(packaging/linux/AppImage/sunshine.desktop sunshine.desktop @ONLY)
+        configure_file(packaging/linux/AppImage/${PROJECT_FQDN}.desktop ${PROJECT_FQDN}.desktop @ONLY)
    elseif(${SUNSHINE_BUILD_FLATPAK})
        set(SUNSHINE_DESKTOP_ICON "${PROJECT_FQDN}")
-        configure_file(packaging/linux/flatpak/sunshine.desktop sunshine.desktop @ONLY)
-        configure_file(packaging/linux/flatpak/${PROJECT_FQDN}.metainfo.xml
-                ${PROJECT_FQDN}.metainfo.xml @ONLY)
+        configure_file(packaging/linux/flatpak/${PROJECT_FQDN}.desktop ${PROJECT_FQDN}.desktop @ONLY)
    else()
-        configure_file(packaging/linux/sunshine.desktop sunshine.desktop @ONLY)
-        configure_file(packaging/linux/sunshine_terminal.desktop sunshine_terminal.desktop @ONLY)
+        configure_file(packaging/linux/${PROJECT_FQDN}.desktop ${PROJECT_FQDN}.desktop @ONLY)
+        configure_file(packaging/linux/${PROJECT_FQDN}.terminal.desktop ${PROJECT_FQDN}.terminal.desktop @ONLY)
    endif()

    # configure metadata file
-    configure_file(packaging/linux/sunshine.appdata.xml sunshine.appdata.xml @ONLY)
+    configure_file(packaging/linux/${PROJECT_FQDN}.metainfo.xml ${PROJECT_FQDN}.metainfo.xml @ONLY)

    # configure service
    configure_file(packaging/linux/sunshine.service.in sunshine.service @ONLY)
@@ -38,8 +36,6 @@ elseif(UNIX)
    # configure the flatpak manifest
    if(${SUNSHINE_CONFIGURE_FLATPAK_MAN})
        configure_file(packaging/linux/flatpak/${PROJECT_FQDN}.yml ${PROJECT_FQDN}.yml @ONLY)
-        configure_file(packaging/linux/flatpak/${PROJECT_FQDN}.metainfo.xml
-                ${PROJECT_FQDN}.metainfo.xml @ONLY)
        file(COPY packaging/linux/flatpak/deps/ DESTINATION ${CMAKE_BINARY_DIR})
        file(COPY packaging/linux/flatpak/modules DESTINATION ${CMAKE_BINARY_DIR})
        file(COPY generated-sources.json DESTINATION ${CMAKE_BINARY_DIR})
--- a/cmake/targets/windows.cmake
+++ b/cmake/targets/windows.cmake
@@ -3,5 +3,6 @@ set_target_properties(sunshine PROPERTIES LINK_SEARCH_START_STATIC 1)
 set(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
 find_library(ZLIB ZLIB1)
 list(APPEND SUNSHINE_EXTERNAL_LIBRARIES
+        $<TARGET_OBJECTS:sunshine_rc_object>
        Windowsapp.lib
        Wtsapi32.lib)