izackp/Apollo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build for Linux

Browse Source
This commit is contained in:
Yukino Song
2025-01-31 20:57:23 +08:00
parent 2e38a2640a
commit ff667ec802
5 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
cmake/packaging/linux.cmake
View File

@@ -90,24 +90,24 @@ set(CPACK_DEBIAN_PACKAGE_SHLIBDEPS OFF)
# application icon # application icon
if(NOT ${SUNSHINE_BUILD_FLATPAK}) 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") DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps")
else() else()
install(FILES "${CMAKE_SOURCE_DIR}/sunshine.svg" install(FILES "${CMAKE_SOURCE_DIR}/apollo.svg"
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps"
RENAME "${PROJECT_FQDN}.svg") RENAME "${PROJECT_FQDN}.svg")
endif() endif()
# tray icon # tray icon
if(${SUNSHINE_TRAY} STREQUAL 1) 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" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/status"
RENAME "sunshine-tray.svg") RENAME "apollo-tray.svg")
install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/public/images/sunshine-playing.svg" install(FILES "${SUNSHINE_SOURCE_ASSETS_DIR}/common/assets/web/public/images/apollo-playing.svg"
DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/status") 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") 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") DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/status")
set(CPACK_DEBIAN_PACKAGE_DEPENDS "\ set(CPACK_DEBIAN_PACKAGE_DEPENDS "\

2
cmake/prep/special_package_configuration.cmake
View File

@@ -10,7 +10,7 @@ if(APPLE)
endif() endif()
elseif(UNIX) elseif(UNIX)
# configure the .desktop file # configure the .desktop file
set(SUNSHINE_DESKTOP_ICON "sunshine.svg") set(SUNSHINE_DESKTOP_ICON "apollo.svg")
if(${SUNSHINE_BUILD_APPIMAGE}) if(${SUNSHINE_BUILD_APPIMAGE})
configure_file(packaging/linux/AppImage/sunshine.desktop sunshine.desktop @ONLY) configure_file(packaging/linux/AppImage/sunshine.desktop sunshine.desktop @ONLY)
elseif(${SUNSHINE_BUILD_FLATPAK}) elseif(${SUNSHINE_BUILD_FLATPAK})

4
packaging/linux/fedora/Sunshine.spec
View File

@@ -247,8 +247,8 @@ rm -f /usr/lib/modules-load.d/uhid.conf
%{_datadir}/applications/sunshine*.desktop %{_datadir}/applications/sunshine*.desktop
# Icons # Icons
%{_datadir}/icons/hicolor/scalable/apps/sunshine.svg %{_datadir}/icons/hicolor/scalable/apps/apollo.svg
%{_datadir}/icons/hicolor/scalable/status/sunshine*.svg %{_datadir}/icons/hicolor/scalable/status/apollo*.svg
# Metainfo # Metainfo
%{_datadir}/metainfo/sunshine.appdata.xml %{_datadir}/metainfo/sunshine.appdata.xml

8
scripts/icons/convert_and_pack.sh
View File

@@ -37,10 +37,10 @@ icon_sizes=${!icon_sizes_keys[@]}
echo "using icon sizes:" echo "using icon sizes:"
echo ${icon_sizes[@]} echo ${icon_sizes[@]}
src_vectors=("../../src_assets/common/assets/web/public/images/sunshine-locked.svg" src_vectors=("../../src_assets/common/assets/web/public/images/apollo-locked.svg"
"../../src_assets/common/assets/web/public/images/sunshine-pausing.svg" "../../src_assets/common/assets/web/public/images/apollo-pausing.svg"
"../../src_assets/common/assets/web/public/images/sunshine-playing.svg" "../../src_assets/common/assets/web/public/images/apollo-playing.svg"
"../../sunshine.svg") "../../apollo.svg")
echo "using sources vectors:" echo "using sources vectors:"
echo ${src_vectors[@]} echo ${src_vectors[@]}

6
src/process.cpp
View File

@@ -192,9 +192,6 @@ namespace proc {
launch_session->width = render_width; launch_session->width = render_width;
launch_session->height = render_height; 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; this->initial_display = config::video.output_name;
// Executed when returning from function // Executed when returning from function
auto fg = util::fail_guard([&]() { auto fg = util::fail_guard([&]() {
@@ -204,7 +201,8 @@ namespace proc {
display_device::revert_configuration(); 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) { if (vDisplayDriverStatus != VDISPLAY::DRIVER_STATUS::OK) {
// Try init driver again // Try init driver again
initVDisplayDriver(); initVDisplayDriver();