commit: 6fcc77235fdaf6e67448aba0ae0f7be445604576 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu May 22 18:08:50 2025 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu May 22 20:09:06 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fcc7723
media-video/simplescreenrecorder: Fix build w/ cmake-4 See also: https://github.com/MaartenBaert/ssr/issues/1060 Bug: https://bugs.gentoo.org/948390 Closes: https://bugs.gentoo.org/955653 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/simplescreenrecorder/Manifest | 1 + .../files/simplescreenrecorder-0.4.4_p20250125-cmake4.patch | 11 +++++++++++ ...9.ebuild => simplescreenrecorder-0.4.4_p20250125.ebuild} | 13 ++++++++----- .../simplescreenrecorder/simplescreenrecorder-9999.ebuild | 8 ++++---- 4 files changed, 24 insertions(+), 9 deletions(-) diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest index 94e6381b4d4d..145189159e10 100644 --- a/media-video/simplescreenrecorder/Manifest +++ b/media-video/simplescreenrecorder/Manifest @@ -1 +1,2 @@ DIST simplescreenrecorder-0.4.4.tar.gz 1961269 BLAKE2B 05c7635840f8461ab324f740f0cc554eb544ed91b00cdf39c80f861e6a8631f59afbdcc9fe958830b0f1e31eedb90f11d29c114ce4bbb612f1756264502f069f SHA512 a90549a2709490482d70559073e505e669417a93abf16124b98c021e6d2bf08b91b53eb68e006df4f80fcee9fe4da2624bf8de979618953adb3f37eb1d471525 +DIST simplescreenrecorder-0.4.4_p20250125-c50e83ee.tar.gz 2022170 BLAKE2B 61ae94c127aba522464b481f16ba706efe0caf6109e3906dc37680a72f1aefc372d149f159f5f08e7b0a973b038e6d6f23d08e9ccea52d9098d2f2c21318fced SHA512 178b7cf1650c7c9e3e662f52914e3a8b97672bee24e2832df0e1c1815e465aeb7e0a07fdb79c24a3178143fc090180c0914b7d1feb60598252ea9ed40e22261f diff --git a/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.4_p20250125-cmake4.patch b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.4_p20250125-cmake4.patch new file mode 100644 index 000000000000..11e511435b0c --- /dev/null +++ b/media-video/simplescreenrecorder/files/simplescreenrecorder-0.4.4_p20250125-cmake4.patch @@ -0,0 +1,11 @@ +https://github.com/MaartenBaert/ssr/issues/1060 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -1,5 +1,4 @@ +-cmake_minimum_required(VERSION 3.1) +-cmake_policy(VERSION 3.1) ++cmake_minimum_required(VERSION 3.5) + + if(POLICY CMP0072) + cmake_policy(SET CMP0072 NEW) diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4_p20250125.ebuild similarity index 90% copy from media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild copy to media-video/simplescreenrecorder/simplescreenrecorder-0.4.4_p20250125.ebuild index 40b51c491dc9..1ebedceab8b9 100644 --- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild +++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4_p20250125.ebuild @@ -9,13 +9,14 @@ inherit cmake-multilib flag-o-matic xdg DESCRIPTION="Simple Screen Recorder" HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/"; if [[ ${PV} == *9999* ]]; then - inherit git-r3 EGIT_REPO_URI="https://github.com/MaartenBaert/${MY_PN}.git"; EGIT_BOOTSTRAP="" + inherit git-r3 else - SRC_URI="https://github.com/MaartenBaert/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + COMMIT="c50e83eea53f45eff503af58e6c86d0e928222f3" + SRC_URI="https://github.com/MaartenBaert/${MY_PN}/archive/${COMMIT}.tar.gz -> ${P}-${COMMIT:0:8}.tar.gz" + S="${WORKDIR}/${MY_PN}-${COMMIT}" KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/${MY_PN}-${PV}" fi LICENSE="GPL-3" @@ -27,7 +28,7 @@ REQUIRED_USE="abi_x86_32? ( opengl )" RDEPEND=" dev-qt/qtbase:6[gui,widgets] media-libs/alsa-lib:0= - media-video/ffmpeg:=[vorbis?,vpx?,x264?,theora?] + media-video/ffmpeg:=[theora?,vorbis?,vpx?,x264?] x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext x11-libs/libXfixes[${MULTILIB_USEDEP}] @@ -35,14 +36,16 @@ RDEPEND=" x11-libs/libXinerama virtual/glu[${MULTILIB_USEDEP}] jack? ( virtual/jack ) - opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] ) mp3? ( media-video/ffmpeg[lame(-)] ) + opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] ) pulseaudio? ( media-libs/libpulse ) v4l? ( media-libs/libv4l ) " DEPEND="${RDEPEND}" BDEPEND="dev-qt/qttools:6[linguist]" +PATCHES=( "${FILESDIR}"/${P}-cmake4.patch ) + pkg_pretend() { if use amd64 && ! use abi_x86_32 ; then einfo "You may want to add USE flag 'abi_x86_32' when running a 64bit system" diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild index 40b51c491dc9..9296c2d24463 100644 --- a/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild +++ b/media-video/simplescreenrecorder/simplescreenrecorder-9999.ebuild @@ -9,13 +9,13 @@ inherit cmake-multilib flag-o-matic xdg DESCRIPTION="Simple Screen Recorder" HOMEPAGE="https://www.maartenbaert.be/simplescreenrecorder/"; if [[ ${PV} == *9999* ]]; then - inherit git-r3 EGIT_REPO_URI="https://github.com/MaartenBaert/${MY_PN}.git"; EGIT_BOOTSTRAP="" + inherit git-r3 else SRC_URI="https://github.com/MaartenBaert/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" S="${WORKDIR}/${MY_PN}-${PV}" + KEYWORDS="~amd64 ~x86" fi LICENSE="GPL-3" @@ -27,7 +27,7 @@ REQUIRED_USE="abi_x86_32? ( opengl )" RDEPEND=" dev-qt/qtbase:6[gui,widgets] media-libs/alsa-lib:0= - media-video/ffmpeg:=[vorbis?,vpx?,x264?,theora?] + media-video/ffmpeg:=[theora?,vorbis?,vpx?,x264?] x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext x11-libs/libXfixes[${MULTILIB_USEDEP}] @@ -35,8 +35,8 @@ RDEPEND=" x11-libs/libXinerama virtual/glu[${MULTILIB_USEDEP}] jack? ( virtual/jack ) - opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] ) mp3? ( media-video/ffmpeg[lame(-)] ) + opengl? ( media-libs/libglvnd[${MULTILIB_USEDEP},X] ) pulseaudio? ( media-libs/libpulse ) v4l? ( media-libs/libv4l ) "
