commit:     30545fc0b6b7c3ed713e188ed42a3891a96d0b84
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 18 11:42:14 2022 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 11:43:49 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30545fc0

media-sound/mixxx: Revbump to fix dependencies

Closes: https://bugs.gentoo.org/831399
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-sound/mixxx/metadata.xml                     |  1 +
 .../{mixxx-2.3.1.ebuild => mixxx-2.3.1-r1.ebuild}  | 22 ++++++++++++++--------
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
index 6cfda3f97a3e..38deddc8020f 100644
--- a/media-sound/mixxx/metadata.xml
+++ b/media-sound/mixxx/metadata.xml
@@ -8,6 +8,7 @@
        <use>
                <flag name="hid">Enable HID controller support</flag>
                <flag name="keyfinder">Enable musical key detection support via 
<pkg>media-libs/libkeyfinder</pkg></flag>
+               <flag name="modplug">Add libmodplug support</flag>
                <flag name="lv2">Add support for Ladspa V2 via 
<pkg>media-libs/lilv</pkg></flag>
                <flag name="qtkeychain">Enable Secure credential storage 
support via <pkg>dev-libs/qtkeychain</pkg></flag>
                <flag name="shout">Enable broadcasting support via 
<pkg>media-libs/libshout</pkg></flag>

diff --git a/media-sound/mixxx/mixxx-2.3.1.ebuild 
b/media-sound/mixxx/mixxx-2.3.1-r1.ebuild
similarity index 90%
rename from media-sound/mixxx/mixxx-2.3.1.ebuild
rename to media-sound/mixxx/mixxx-2.3.1-r1.ebuild
index c949498e285a..e29605db4680 100644
--- a/media-sound/mixxx/mixxx-2.3.1.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.1-r1.ebuild
@@ -20,13 +20,12 @@ else
 fi
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
+IUSE="aac doc ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout 
wavpack"
 
 RDEPEND="
        dev-db/sqlite
        dev-libs/glib:2
        dev-libs/protobuf:0=
-       dev-qt/qtconcurrent:5
        dev-qt/qtcore:5
        dev-qt/qtdbus:5
        dev-qt/qtgui:5
@@ -51,6 +50,7 @@ RDEPEND="
        media-libs/rubberband
        media-libs/taglib
        media-libs/vamp-plugin-sdk
+       media-sound/lame
        sci-libs/fftw:3.0=
        sys-power/upower
        virtual/glu
@@ -66,6 +66,7 @@ RDEPEND="
        hid? ( dev-libs/hidapi )
        keyfinder? ( media-libs/libkeyfinder )
        lv2? ( media-libs/lilv )
+       modplug? ( media-libs/libmodplug )
        mp3? ( media-libs/libmad )
        mp4? ( media-libs/libmp4v2:= )
        opus? ( media-libs/opusfile )
@@ -74,7 +75,9 @@ RDEPEND="
        wavpack? ( media-sound/wavpack )
        "
 
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+       dev-qt/qtconcurrent:5
+"
 BDEPEND="virtual/pkgconfig
        dev-qt/qttest:5
        dev-qt/qtxmlpatterns:5"
@@ -91,20 +94,23 @@ src_prepare() {
 
 src_configure() {
        local mycmakeargs=(
+               # Not available on Linux yet and requires additional deps
+               -DBATTERY="off"
+               -DBROADCAST="$(usex shout on off)"
+               -DCCACHE_SUPPORT="off"
                -DFAAD="$(usex aac on off)"
                -DFFMPEG="$(usex ffmpeg on off)"
                -DHID="$(usex hid on off)"
+               -DINSTALL_USER_UDEV_RULES=OFF
+               -DKEYFINDER="$(usex keyfinder on off)"
                -DLILV="$(usex lv2 on off)"
                -DMAD="$(usex mp3 on off)"
+               -DMODPLUG="$(usex modplug on off)"
                -DOPTIMIZE="off"
-               -DCCACHE_SUPPORT="off"
                -DOPUS="$(usex opus on off)"
-               -DBROADCAST="$(usex shout on off)"
+               -DQTKEYCHAIN="$(usex qtkeychain on off)"
                -DVINYLCONTROL="on"
-               -DINSTALL_USER_UDEV_RULES=OFF
                -DWAVPACK="$(usex wavpack on off)"
-               -DQTKEYCHAIN="$(usex qtkeychain on off)"
-               -DKEYFINDER="$(usex keyfinder on off)"
        )
 
        if [[ "${PV}" == 9999 ]] ; then

Reply via email to