summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--x11-misc/xscreensaver/files/xscreensaver-6.12-ffmpeg8.patch8
-rw-r--r--x11-misc/xscreensaver/xscreensaver-6.12-r2.ebuild3
2 files changed, 10 insertions, 1 deletions
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} )