commit:     9a63a1d09a9c89716e5db01a11a99dc1111c8c05
Author:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 29 09:10:48 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Sat Jan 29 09:13:26 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9a63a1d0

media-video/qmplay2: sync live version

Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 media-video/qmplay2/qmplay2-9999.ebuild | 49 +++++++++++++++++----------------
 1 file changed, 26 insertions(+), 23 deletions(-)

diff --git a/media-video/qmplay2/qmplay2-9999.ebuild 
b/media-video/qmplay2/qmplay2-9999.ebuild
index d6a9054ddf1c..7f6b9471ab08 100644
--- a/media-video/qmplay2/qmplay2-9999.ebuild
+++ b/media-video/qmplay2/qmplay2-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit cmake xdg
 
@@ -13,24 +13,24 @@ if [[ ${PV} == *9999 ]]; then
        EGIT_REPO_URI="https://github.com/zaps166/QMPlay2";
 else
        
SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz";
-       KEYWORDS="~amd64 ~x86"
        S="${WORKDIR}/QMPlay2-src-${PV}"
+       KEYWORDS="~amd64 ~x86"
 fi
 
 LICENSE="LGPL-3"
 SLOT="0"
 
-IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions
-       gme inputs libass modplug notifications opengl pipewire portaudio
-       pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan 
xv"
+IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass
+       modplug notifications opengl pipewire portaudio pulseaudio sid shaders
+       +taglib vaapi vdpau videofilters visualizations vulkan xv"
 
 REQUIRED_USE="
        audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) )
-       extensions? ( dbus )
        shaders? ( vulkan )"
 
 RDEPEND="
        dev-qt/qtcore:5
+       dev-qt/qtdbus:5
        dev-qt/qtsvg:5
        dev-qt/qtwidgets:5
        dev-qt/qtx11extras:5
@@ -41,11 +41,7 @@ RDEPEND="
        )
        alsa? ( media-libs/alsa-lib )
        cdio? ( dev-libs/libcdio[cddb] )
-       dbus? ( dev-qt/qtdbus:5 )
-       extensions? (
-               dev-qt/qtdeclarative:5
-               media-libs/taglib
-       )
+       extensions? ( dev-qt/qtdeclarative:5 )
        gme? ( media-libs/game-music-emu )
        libass? ( media-libs/libass )
        opengl? ( virtual/opengl )
@@ -54,6 +50,7 @@ RDEPEND="
        pulseaudio? ( media-sound/pulseaudio )
        sid? ( media-libs/libsidplayfp )
        shaders? ( >=media-libs/shaderc-2020.1 )
+       taglib? ( media-libs/taglib     )
        vaapi? (
                >=media-video/ffmpeg-4.1.3[vaapi]
                x11-libs/libva[drm,opengl]
@@ -64,12 +61,10 @@ RDEPEND="
                >=dev-qt/qtgui-5.14.1:5[vulkan]
                >=media-libs/vulkan-loader-1.2.133
        )
-       xv? ( x11-libs/libXv )"
-
+       xv? ( x11-libs/libXv )
+"
 DEPEND="${RDEPEND}"
-BDEPEND="
-       dev-qt/linguist-tools:5
-       virtual/pkgconfig"
+BDEPEND="dev-qt/linguist-tools:5"
 
 src_prepare() {
        # disable compress man pages
@@ -85,9 +80,11 @@ src_configure() {
        local mycmakeargs=(
                # core
                -DUSE_LINK_TIME_OPTIMIZATION=false
+               -DUSE_UPDATES=OFF
                -DUSE_ALSA=$(usex alsa)
                -DUSE_AUDIOCD=$(usex cdio)
-               -DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # 
https://github.com/zaps166/QMPlay2/issues/134
+               -DUSE_DBUS_SUSPEND=ON
+               -DUSE_FREEDESKTOP_NOTIFICATIONS=ON
                -DUSE_LIBASS=$(usex libass)
                -DUSE_NOTIFY=$(usex notifications)
                -DUSE_OPENGL=$(usex opengl)
@@ -112,18 +109,24 @@ src_configure() {
                -DUSE_PIPEWIRE=$(usex pipewire)
                -DUSE_PORTAUDIO=$(usex portaudio)
                -DUSE_PULSEAUDIO=$(usex pulseaudio)
+               -DUSE_TAGLIB=$(usex taglib)
                -DUSE_VIDEOFILTERS=$(usex videofilters)
                -DUSE_VISUALIZATIONS=$(usex visualizations)
 
                # extensions
                -DUSE_EXTENSIONS=$(usex extensions)
-               -DUSE_TAGLIB=$(usex extensions)
-               -DUSE_LASTFM=$(usex extensions)
-               -DUSE_LYRICS=$(usex extensions)
-               -DUSE_MEDIABROWSER=$(usex extensions)
-               -DUSE_MPRIS2=$(usex extensions)
        )
 
+       if use extensions; then
+               # Move inside an if, to remove unused option warning
+               mycmakeargs+=(
+                       -DUSE_LASTFM=ON
+                       -DUSE_LYRICS=ON
+                       -DUSE_MEDIABROWSER=ON
+                       -DUSE_MPRIS2=ON
+               )
+       fi
+
        if [[ ${PV} == *9999 ]]; then
                mycmakeargs+=( -DUSE_GIT_VERSION=true )
        else

Reply via email to