commit: cd0b8120c0e0e3028d37819d8e181e46d920538a Author: Alexey Sokolov <alexey+gentoo <AT> asokolov <DOT> org> AuthorDate: Sun Nov 23 21:06:17 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 24 13:28:03 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd0b8120
media-sound/scream: update cmake compatibility Closes: https://bugs.gentoo.org/964612 Signed-off-by: Alexey Sokolov <alexey+gentoo <AT> asokolov.org> Part-of: https://github.com/gentoo/gentoo/pull/44747 Closes: https://github.com/gentoo/gentoo/pull/44747 Signed-off-by: Sam James <sam <AT> gentoo.org> media-sound/scream/files/scream-4.0-cmake.patch | 11 +++++++++++ media-sound/scream/files/scream-4.0-gcc15.patch | 4 ++-- .../scream/{scream-4.0-r1.ebuild => scream-4.0-r2.ebuild} | 3 ++- media-sound/scream/scream-9999.ebuild | 4 ++-- 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/media-sound/scream/files/scream-4.0-cmake.patch b/media-sound/scream/files/scream-4.0-cmake.patch new file mode 100644 index 000000000000..e07f7514f2e3 --- /dev/null +++ b/media-sound/scream/files/scream-4.0-cmake.patch @@ -0,0 +1,11 @@ +https://github.com/duncanthrax/scream/pull/234 +https://bugs.gentoo.org/964612 + +--- a/Receivers/unix/CMakeLists.txt ++++ b/Receivers/unix/CMakeLists.txt +@@ -1,4 +1,4 @@ +-cmake_minimum_required(VERSION 3.7) ++cmake_minimum_required(VERSION 3.7...4.0) + + project(scream LANGUAGES C) + diff --git a/media-sound/scream/files/scream-4.0-gcc15.patch b/media-sound/scream/files/scream-4.0-gcc15.patch index fc1b852be61d..d151b349d4e7 100644 --- a/media-sound/scream/files/scream-4.0-gcc15.patch +++ b/media-sound/scream/files/scream-4.0-gcc15.patch @@ -1,5 +1,5 @@ ---- a/jack.c -+++ b/jack.c +--- a/Receivers/unix/jack.c ++++ b/Receivers/unix/jack.c @@ -107,7 +107,7 @@ jo_data; static int init_resampler(); static int init_channels(); diff --git a/media-sound/scream/scream-4.0-r1.ebuild b/media-sound/scream/scream-4.0-r2.ebuild similarity index 93% rename from media-sound/scream/scream-4.0-r1.ebuild rename to media-sound/scream/scream-4.0-r2.ebuild index b2addd13fd39..c93e9b3d39d2 100644 --- a/media-sound/scream/scream-4.0-r1.ebuild +++ b/media-sound/scream/scream-4.0-r2.ebuild @@ -7,7 +7,7 @@ inherit cmake DESCRIPTION="Plays sound received from network or from a QEMU Windows VM" HOMEPAGE="https://github.com/duncanthrax/scream"; -S="${WORKDIR}/${P}/Receivers/unix" +CMAKE_USE_DIR="${S}/Receivers/unix" if [[ ${PV} == *9999 ]]; then inherit git-r3 @@ -34,6 +34,7 @@ BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}/${P}-gcc15.patch" + "${FILESDIR}/${P}-cmake.patch" ) src_configure() { diff --git a/media-sound/scream/scream-9999.ebuild b/media-sound/scream/scream-9999.ebuild index 75ab1107c4f1..bc4d9e308dea 100644 --- a/media-sound/scream/scream-9999.ebuild +++ b/media-sound/scream/scream-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -7,7 +7,7 @@ inherit cmake DESCRIPTION="Plays sound received from network or from a QEMU Windows VM" HOMEPAGE="https://github.com/duncanthrax/scream"; -S="${WORKDIR}/${P}/Receivers/unix" +CMAKE_USE_DIR="${S}/Receivers/unix" if [[ ${PV} == *9999 ]]; then inherit git-r3
