commit: 213f189bafa6e425e971bcd4f23ad3f937dfba4d Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Oct 21 10:52:42 2025 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Oct 21 11:00:52 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=213f189b
x11-misc/xscreensaver: fix build with ffmpeg-8 Quick non-maintainer self-fix given will be looking at rekeywording ffmpeg-8 likely soon'ish. Unknown if been reported upstream given apparently(?) no public bug tracker, but probably good odds it'll be fixed next release nonetheless (note that the current fix requires >=ffmpeg-6.1 thus the RDEPEND bump, may possibly not be needed next release but not that needing >=6.1 is a problem in Gentoo). Very trivial fix so no real need for a revbump+re-stabilizing over. Closes: https://bugs.gentoo.org/963416 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> x11-misc/xscreensaver/files/xscreensaver-6.12-ffmpeg8.patch | 8 ++++++++ x11-misc/xscreensaver/xscreensaver-6.12-r2.ebuild | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/x11-misc/xscreensaver/files/xscreensaver-6.12-ffmpeg8.patch b/x11-misc/xscreensaver/files/xscreensaver-6.12-ffmpeg8.patch new file mode 100644 index 000000000000..28de6f8d3a5f --- /dev/null +++ b/x11-misc/xscreensaver/files/xscreensaver-6.12-ffmpeg8.patch @@ -0,0 +1,8 @@ +https://bugs.gentoo.org/963416 +--- a/hacks/ffmpeg-out.c ++++ b/hacks/ffmpeg-out.c +@@ -405,3 +405,3 @@ + ffst->video_ost.ctx->pix_fmt = pix_fmt; +- ffst->video_ost.ctx->profile = FF_PROFILE_H264_HIGH; ++ ffst->video_ost.ctx->profile = AV_PROFILE_H264_HIGH; + diff --git a/x11-misc/xscreensaver/xscreensaver-6.12-r2.ebuild b/x11-misc/xscreensaver/xscreensaver-6.12-r2.ebuild index 125741a91367..f9020b127a9c 100644 --- a/x11-misc/xscreensaver/xscreensaver-6.12-r2.ebuild +++ b/x11-misc/xscreensaver/xscreensaver-6.12-r2.ebuild @@ -50,7 +50,7 @@ COMMON_DEPEND=" elogind? ( sys-auth/elogind ) gdk-pixbuf? ( >=x11-libs/gdk-pixbuf-2.42.0:2[jpeg?] ) gtk? ( >=x11-libs/gtk+-3.0.0:3 ) - ffmpeg? ( media-video/ffmpeg:= ) + ffmpeg? ( >=media-video/ffmpeg-6.1:= ) jpeg? ( media-libs/libjpeg-turbo:= ) locking? ( virtual/libcrypt:= ) new-login? ( @@ -102,6 +102,7 @@ PATCHES=( "${FILESDIR}"/${PN}-6.07-allow-no-pam.patch "${FILESDIR}"/${PN}-6.07-fix-desktop-files.patch "${FILESDIR}"/${PN}-6.09-ffmpeg.patch + "${FILESDIR}"/${PN}-6.12-ffmpeg8.patch ) DOCS=( README{,.hacking} )
