From ff667ec802d90896d4ae40e24998cbca15129731 Mon Sep 17 00:00:00 2001 From: Yukino Song Date: Fri, 31 Jan 2025 20:57:23 +0800 Subject: [PATCH] Fix build for Linux --- cmake/packaging/linux.cmake | 14 +++++++------- cmake/prep/special_package_configuration.cmake | 2 +- packaging/linux/fedora/Sunshine.spec | 4 ++-- scripts/icons/convert_and_pack.sh | 8 ++++---- src/process.cpp | 6 ++---- 5 files changed, 16 insertions(+), 18 deletions(-) diff --git a/cmake/packaging/linux.cmake b/cmake/packaging/linux.cmake index 14b89ead..785ecb61 100644 --- a/cmake/packaging/linux.cmake +++ b/cmake/packaging/linux.cmake @@ -90,24 +90,24 @@ set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF) # application icon if(NOT ${SUNSHINE_BUILD_FLATPAK}) - install(FILES "${CMAKE_SOURCE_DIR}/sunshine.svg" + install(FILES "${CMAKE_SOURCE_DIR}/apollo.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps") else() - install(FILES "${CMAKE_SOURCE_DIR}/sunshine.svg" + install(FILES "${CMAKE_SOURCE_DIR}/apollo.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "${PROJECT_FQDN}.svg") endif() # tray icon if(${SUNSHINE_TRAY} STREQUAL 1) - install(FILES "${CMAKE_SOURCE_DIR}/sunshine.svg" + install(FILES "${CMAKE_SOURCE_DIR}/apollo.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/status" - RENAME "sunshine-tray.svg") - install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/public/images/sunshine-playing.svg" + RENAME "apollo-tray.svg") + install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/public/images/apollo-playing.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/status") - install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/public/images/sunshine-pausing.svg" + install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/public/images/apollo-pausing.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/status") - install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/public/images/sunshine-locked.svg" + install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/public/images/apollo-locked.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/status") set(CPACK_DEBIAN_PACKAGE_DEPENDS "\ diff --git a/cmake/prep/special_package_configuration.cmake b/cmake/prep/special_package_configuration.cmake index df1bbb36..d0928712 100644 --- a/cmake/prep/special_package_configuration.cmake +++ b/cmake/prep/special_package_configuration.cmake @@ -10,7 +10,7 @@ if(APPLE) endif() elseif(UNIX) # configure the .desktop file - set(SUNSHINE_DESKTOP_ICON "sunshine.svg") + set(SUNSHINE_DESKTOP_ICON "apollo.svg") if(${SUNSHINE_BUILD_APPIMAGE}) configure_file(packaging/linux/AppImage/sunshine.desktop sunshine.desktop @ONLY) elseif(${SUNSHINE_BUILD_FLATPAK}) diff --git a/packaging/linux/fedora/Sunshine.spec b/packaging/linux/fedora/Sunshine.spec index ca08f480..e6afbce1 100644 --- a/packaging/linux/fedora/Sunshine.spec +++ b/packaging/linux/fedora/Sunshine.spec @@ -247,8 +247,8 @@ rm -f /usr/lib/modules-load.d/uhid.conf %{_datadir}/applications/sunshine*.desktop # Icons -%{_datadir}/icons/hicolor/scalable/apps/sunshine.svg -%{_datadir}/icons/hicolor/scalable/status/sunshine*.svg +%{_datadir}/icons/hicolor/scalable/apps/apollo.svg +%{_datadir}/icons/hicolor/scalable/status/apollo*.svg # Metainfo %{_datadir}/metainfo/sunshine.appdata.xml diff --git a/scripts/icons/convert_and_pack.sh b/scripts/icons/convert_and_pack.sh index 950effc9..e2bae63f 100644 --- a/scripts/icons/convert_and_pack.sh +++ b/scripts/icons/convert_and_pack.sh @@ -37,10 +37,10 @@ icon_sizes=${!icon_sizes_keys[@]} echo "using icon sizes:" echo ${icon_sizes[@]} -src_vectors=("../../src_assets/common/assets/web/public/images/sunshine-locked.svg" - "../../src_assets/common/assets/web/public/images/sunshine-pausing.svg" - "../../src_assets/common/assets/web/public/images/sunshine-playing.svg" - "../../sunshine.svg") +src_vectors=("../../src_assets/common/assets/web/public/images/apollo-locked.svg" + "../../src_assets/common/assets/web/public/images/apollo-pausing.svg" + "../../src_assets/common/assets/web/public/images/apollo-playing.svg" + "../../apollo.svg") echo "using sources vectors:" echo ${src_vectors[@]} diff --git a/src/process.cpp b/src/process.cpp index fa03cd52..ac28d7fc 100644 --- a/src/process.cpp +++ b/src/process.cpp @@ -192,9 +192,6 @@ namespace proc { launch_session->width = render_width; launch_session->height = render_height; -#ifdef _WIN32 - bool create_virtual_display = config::video.headless_mode || launch_session->virtual_display || _app.virtual_display; - this->initial_display = config::video.output_name; // Executed when returning from function auto fg = util::fail_guard([&]() { @@ -204,7 +201,8 @@ namespace proc { display_device::revert_configuration(); }); - if (create_virtual_display) { +#ifdef _WIN32 + if (config::video.headless_mode || launch_session->virtual_display || _app.virtual_display) { if (vDisplayDriverStatus != VDISPLAY::DRIVER_STATUS::OK) { // Try init driver again initVDisplayDriver();