commit: 2dbc9c50588f46c4ef58a386c16d07b883c6df70
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 28 18:26:17 2023 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Wed Jun 28 18:30:21 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dbc9c50
media-video/qmplay2: depend on slot ffmpeg
Also sort out use deps dependencies.
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
...ay2-23.06.17.ebuild => qmplay2-23.06.17-r1.ebuild} | 15 ++++-----------
media-video/qmplay2/qmplay2-9999.ebuild | 19 +++++--------------
2 files changed, 9 insertions(+), 25 deletions(-)
diff --git a/media-video/qmplay2/qmplay2-23.06.17.ebuild
b/media-video/qmplay2/qmplay2-23.06.17-r1.ebuild
similarity index 92%
rename from media-video/qmplay2/qmplay2-23.06.17.ebuild
rename to media-video/qmplay2/qmplay2-23.06.17-r1.ebuild
index 41412c90d14c..9c898d587e0e 100644
--- a/media-video/qmplay2/qmplay2-23.06.17.ebuild
+++ b/media-video/qmplay2/qmplay2-23.06.17-r1.ebuild
@@ -31,11 +31,11 @@ REQUIRED_USE="
RDEPEND="
dev-qt/qtcore:5
dev-qt/qtdbus:5
- dev-qt/qtgui:5[X(-)]
+ dev-qt/qtgui:5[X(-),vulkan?]
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
- media-video/ffmpeg
+ media-video/ffmpeg:=[vaapi?,vdpau?]
alsa? ( media-libs/alsa-lib )
cdio? ( dev-libs/libcdio[cddb] )
extensions? ( dev-qt/qtdeclarative:5 )
@@ -48,16 +48,9 @@ RDEPEND="
sid? ( media-libs/libsidplayfp )
shaders? ( >=media-libs/shaderc-2020.1 )
taglib? ( media-libs/taglib )
- vaapi? (
- >=media-video/ffmpeg-4.1.3[vaapi]
- media-libs/libva[X]
- )
- vdpau? ( media-video/ffmpeg[vdpau] )
+ vaapi? ( media-libs/libva[X] )
videofilters? ( dev-qt/qtconcurrent:5 )
- vulkan? (
- >=dev-qt/qtgui-5.14.1:5[vulkan]
- >=media-libs/vulkan-loader-1.2.133
- )
+ vulkan? ( >=media-libs/vulkan-loader-1.2.133 )
xv? ( x11-libs/libXv )
"
DEPEND="${RDEPEND}"
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild
b/media-video/qmplay2/qmplay2-9999.ebuild
index 131c3cf98f39..9c898d587e0e 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -31,14 +31,11 @@ REQUIRED_USE="
RDEPEND="
dev-qt/qtcore:5
dev-qt/qtdbus:5
+ dev-qt/qtgui:5[X(-),vulkan?]
dev-qt/qtsvg:5
dev-qt/qtwidgets:5
dev-qt/qtx11extras:5
- media-video/ffmpeg
- || (
- dev-qt/qtgui:5[X(-)]
- dev-qt/qtgui:5[xcb(-)]
- )
+ media-video/ffmpeg:=[vaapi?,vdpau?]
alsa? ( media-libs/alsa-lib )
cdio? ( dev-libs/libcdio[cddb] )
extensions? ( dev-qt/qtdeclarative:5 )
@@ -51,16 +48,9 @@ RDEPEND="
sid? ( media-libs/libsidplayfp )
shaders? ( >=media-libs/shaderc-2020.1 )
taglib? ( media-libs/taglib )
- vaapi? (
- >=media-video/ffmpeg-4.1.3[vaapi]
- media-libs/libva
- )
- vdpau? ( media-video/ffmpeg[vdpau] )
+ vaapi? ( media-libs/libva[X] )
videofilters? ( dev-qt/qtconcurrent:5 )
- vulkan? (
- >=dev-qt/qtgui-5.14.1:5[vulkan]
- >=media-libs/vulkan-loader-1.2.133
- )
+ vulkan? ( >=media-libs/vulkan-loader-1.2.133 )
xv? ( x11-libs/libXv )
"
DEPEND="${RDEPEND}"
@@ -78,6 +68,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
+ -DBUILD_WITH_QT6=Off
# core
-DUSE_LINK_TIME_OPTIMIZATION=false
-DUSE_UPDATES=OFF
