From 537b7519c1c8d09fade9a08e8bdeaa6f1a631df1 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Fri, 26 Jun 2026 13:52:07 +0200 Subject: [PATCH 1/2] Use standard cmake macros This will pick up the distro's best generator --- packaging/linux/copr/Sunshine.spec | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/packaging/linux/copr/Sunshine.spec b/packaging/linux/copr/Sunshine.spec index f79c35d2b4c..d1df2c8c353 100644 --- a/packaging/linux/copr/Sunshine.spec +++ b/packaging/linux/copr/Sunshine.spec @@ -224,13 +224,9 @@ cuda_supported_architectures=("x86_64" "aarch64") # prepare CMAKE args cmake_args=( - "-B=%{_builddir}/Sunshine/build" - "-G=Unix Makefiles" - "-S=." "-DBUILD_DOCS=OFF" "-DBUILD_WERROR=ON" "-DCMAKE_BUILD_TYPE=Release" - "-DCMAKE_INSTALL_PREFIX=%{_prefix}" "-DSUNSHINE_ASSETS_DIR=%{_datadir}/sunshine" "-DSUNSHINE_EXECUTABLE_PATH=%{_bindir}/sunshine" "-DSUNSHINE_ENABLE_DRM=ON" @@ -380,8 +376,8 @@ uv sync \ %endif echo "cmake args:" echo "${cmake_args[@]}" -cmake "${cmake_args[@]}" -make -j$(nproc) -C "%{_builddir}/Sunshine/build" +%cmake ${cmake_args[@]} +%cmake_build %check # validate the metainfo file @@ -390,7 +386,7 @@ appstream-util validate %{buildroot}%{_metainfodir}/*.metainfo.xml desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop # run tests -cd %{_builddir}/Sunshine/build +cd %{_builddir}/Sunshine/%_vpath_builddir xvfb-run ./tests/test_sunshine %install @@ -409,8 +405,8 @@ echo "Node.js version: $(node --version)" echo "npm version: $(npm --version)" %endif -cd %{_builddir}/Sunshine/build -%make_install +cd %{_builddir}/Sunshine +%cmake_install %post # Note: this is copied from the postinst script From fa2abc1a7a646d8339dd3d70f3aa991049a64594 Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Tue, 30 Jun 2026 23:22:54 +0200 Subject: [PATCH 2/2] Account for different build dir definition on opensuse --- packaging/linux/copr/Sunshine.spec | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/packaging/linux/copr/Sunshine.spec b/packaging/linux/copr/Sunshine.spec index d1df2c8c353..66f0013902c 100644 --- a/packaging/linux/copr/Sunshine.spec +++ b/packaging/linux/copr/Sunshine.spec @@ -386,8 +386,13 @@ appstream-util validate %{buildroot}%{_metainfodir}/*.metainfo.xml desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop # run tests -cd %{_builddir}/Sunshine/%_vpath_builddir -xvfb-run ./tests/test_sunshine +cd %{_builddir}/Sunshine/ +# TODO: Switch to using %%ctest +%if 0%{?suse_version} +xvfb-run %__builddir/tests/test_sunshine +%else +xvfb-run %_vpath_builddir/tests/test_sunshine +%endif %install # Load NVM for Fedora 44+ so npm is available during make install