commit: ee93b6f79d93567fd37b309705ed940d39ea0d56 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Feb 27 09:27:25 2024 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Feb 27 09:30:15 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee93b6f7
dev-qt/qtmultimedia: depend on qtbase[concurrent] with ffmpeg Intentionally skipping revbump, see bug #925597's comments. Closes: https://bugs.gentoo.org/925597 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> dev-qt/qtmultimedia/qtmultimedia-6.6.2.ebuild | 2 +- dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild | 2 +- dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild | 2 +- dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.6.2.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.6.2.ebuild index bb4dfe70b0e0..d5bbc2f721e3 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.6.2.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.6.2.ebuild @@ -24,7 +24,7 @@ RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] alsa? ( media-libs/alsa-lib ) ffmpeg? ( - ~dev-qt/qtbase-${PV}:6[X=,eglfs=] + ~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=] media-video/ffmpeg:=[vaapi?] X? ( x11-libs/libX11 diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild index 7a0c7fa01e1c..2359fc0aabd3 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.6.9999.ebuild @@ -24,7 +24,7 @@ RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] alsa? ( media-libs/alsa-lib ) ffmpeg? ( - ~dev-qt/qtbase-${PV}:6[X=,eglfs=] + ~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=] media-video/ffmpeg:=[vaapi?] X? ( x11-libs/libX11 diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild index 7a0c7fa01e1c..2359fc0aabd3 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.7.9999.ebuild @@ -24,7 +24,7 @@ RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] alsa? ( media-libs/alsa-lib ) ffmpeg? ( - ~dev-qt/qtbase-${PV}:6[X=,eglfs=] + ~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=] media-video/ffmpeg:=[vaapi?] X? ( x11-libs/libX11 diff --git a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild index 7a0c7fa01e1c..2359fc0aabd3 100644 --- a/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild +++ b/dev-qt/qtmultimedia/qtmultimedia-6.9999.ebuild @@ -24,7 +24,7 @@ RDEPEND=" ~dev-qt/qtbase-${PV}:6[gui,network,opengl=,vulkan=,widgets] alsa? ( media-libs/alsa-lib ) ffmpeg? ( - ~dev-qt/qtbase-${PV}:6[X=,eglfs=] + ~dev-qt/qtbase-${PV}:6[X=,concurrent,eglfs=] media-video/ffmpeg:=[vaapi?] X? ( x11-libs/libX11
