commit: 1212b410e318d565bdac86fdbabe9a674837dfcf
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 30 16:47:39 2024 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon Dec 30 20:01:24 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1212b410
media-video/qmplay2: drop IUSE=qt6
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
media-video/qmplay2/qmplay2-24.12.28.ebuild | 27 +++++++--------------------
media-video/qmplay2/qmplay2-9999.ebuild | 29 ++++++++---------------------
2 files changed, 15 insertions(+), 41 deletions(-)
diff --git a/media-video/qmplay2/qmplay2-24.12.28.ebuild
b/media-video/qmplay2/qmplay2-24.12.28.ebuild
index 08b367fb933f..389e940a75d0 100644
--- a/media-video/qmplay2/qmplay2-24.12.28.ebuild
+++ b/media-video/qmplay2/qmplay2-24.12.28.ebuild
@@ -21,7 +21,7 @@ LICENSE="LGPL-3"
SLOT="0"
IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
- modplug notifications opengl pipewire portaudio pulseaudio qt6 sid
+ modplug notifications opengl pipewire portaudio pulseaudio sid
shaders +taglib vaapi videofilters visualizations vulkan xv"
REQUIRED_USE="
@@ -30,25 +30,13 @@ REQUIRED_USE="
"
RDEPEND="
+ dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl?,ssl,vulkan?,widgets]
+ dev-qt/qt5compat:6
+ dev-qt/qtsvg:6
media-video/ffmpeg:=[vaapi?]
- !qt6? (
- 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
- extensions? ( dev-qt/qtdeclarative:5 )
- videofilters? ( dev-qt/qtconcurrent:5 )
- )
- qt6? (
-
dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl?,ssl,vulkan?,widgets]
- dev-qt/qt5compat:6
- dev-qt/qtsvg:6
- extensions? ( dev-qt/qtdeclarative:6 )
- )
alsa? ( media-libs/alsa-lib )
cdio? ( dev-libs/libcdio[cddb] )
+ extensions? ( dev-qt/qtdeclarative:6 )
gme? ( media-libs/game-music-emu )
libass? ( media-libs/libass )
opengl? ( virtual/opengl )
@@ -64,8 +52,7 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
BDEPEND="
- !qt6? ( dev-qt/linguist-tools:5 )
- qt6? ( dev-qt/qttools:6[linguist] )
+ dev-qt/qttools:6[linguist]
"
src_prepare() {
@@ -80,7 +67,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DBUILD_WITH_QT6=$(usex qt6)
+ -DBUILD_WITH_QT6=ON
# core
-DUSE_UPDATES=OFF
-DUSE_ALSA=$(usex alsa)
diff --git a/media-video/qmplay2/qmplay2-9999.ebuild
b/media-video/qmplay2/qmplay2-9999.ebuild
index 88438e2c0dd5..389e940a75d0 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -21,7 +21,7 @@ LICENSE="LGPL-3"
SLOT="0"
IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
- modplug notifications opengl pipewire portaudio pulseaudio qt6 sid
+ modplug notifications opengl pipewire portaudio pulseaudio sid
shaders +taglib vaapi videofilters visualizations vulkan xv"
REQUIRED_USE="
@@ -30,25 +30,13 @@ REQUIRED_USE="
"
RDEPEND="
+ dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl?,ssl,vulkan?,widgets]
+ dev-qt/qt5compat:6
+ dev-qt/qtsvg:6
media-video/ffmpeg:=[vaapi?]
- !qt6? (
- 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
- extensions? ( dev-qt/qtdeclarative:5 )
- videofilters? ( dev-qt/qtconcurrent:5 )
- )
- qt6? (
-
dev-qt/qtbase:6[concurrent,dbus,gui,network,opengl?,ssl,vulkan?,widgets]
- dev-qt/qt5compat:6
- dev-qt/qtsvg:6
- extensions? ( dev-qt/qtdeclarative:6 )
- )
alsa? ( media-libs/alsa-lib )
cdio? ( dev-libs/libcdio[cddb] )
+ extensions? ( dev-qt/qtdeclarative:6 )
gme? ( media-libs/game-music-emu )
libass? ( media-libs/libass )
opengl? ( virtual/opengl )
@@ -57,15 +45,14 @@ RDEPEND="
pulseaudio? ( media-libs/libpulse )
sid? ( media-libs/libsidplayfp )
shaders? ( >=media-libs/shaderc-2020.1 )
- taglib? ( media-libs/taglib:= )
+ taglib? ( media-libs/taglib:= )
vaapi? ( media-libs/libva[X] )
vulkan? ( >=media-libs/vulkan-loader-1.2.133 )
xv? ( x11-libs/libXv )
"
DEPEND="${RDEPEND}"
BDEPEND="
- !qt6? ( dev-qt/linguist-tools:5 )
- qt6? ( dev-qt/qttools:6[linguist] )
+ dev-qt/qttools:6[linguist]
"
src_prepare() {
@@ -80,7 +67,7 @@ src_prepare() {
src_configure() {
local mycmakeargs=(
- -DBUILD_WITH_QT6=$(usex qt6)
+ -DBUILD_WITH_QT6=ON
# core
-DUSE_UPDATES=OFF
-DUSE_ALSA=$(usex alsa)
