Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/
Date: Tue, 18 Jan 2022 11:44:02
Message-Id: 1642506229.30545fc0b6b7c3ed713e188ed42a3891a96d0b84.polynomial-c@gentoo
1 commit: 30545fc0b6b7c3ed713e188ed42a3891a96d0b84
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 18 11:42:14 2022 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 18 11:43:49 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=30545fc0
7
8 media-sound/mixxx: Revbump to fix dependencies
9
10 Closes: https://bugs.gentoo.org/831399
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 media-sound/mixxx/metadata.xml | 1 +
14 .../{mixxx-2.3.1.ebuild => mixxx-2.3.1-r1.ebuild} | 22 ++++++++++++++--------
15 2 files changed, 15 insertions(+), 8 deletions(-)
16
17 diff --git a/media-sound/mixxx/metadata.xml b/media-sound/mixxx/metadata.xml
18 index 6cfda3f97a3e..38deddc8020f 100644
19 --- a/media-sound/mixxx/metadata.xml
20 +++ b/media-sound/mixxx/metadata.xml
21 @@ -8,6 +8,7 @@
22 <use>
23 <flag name="hid">Enable HID controller support</flag>
24 <flag name="keyfinder">Enable musical key detection support via <pkg>media-libs/libkeyfinder</pkg></flag>
25 + <flag name="modplug">Add libmodplug support</flag>
26 <flag name="lv2">Add support for Ladspa V2 via <pkg>media-libs/lilv</pkg></flag>
27 <flag name="qtkeychain">Enable Secure credential storage support via <pkg>dev-libs/qtkeychain</pkg></flag>
28 <flag name="shout">Enable broadcasting support via <pkg>media-libs/libshout</pkg></flag>
29
30 diff --git a/media-sound/mixxx/mixxx-2.3.1.ebuild b/media-sound/mixxx/mixxx-2.3.1-r1.ebuild
31 similarity index 90%
32 rename from media-sound/mixxx/mixxx-2.3.1.ebuild
33 rename to media-sound/mixxx/mixxx-2.3.1-r1.ebuild
34 index c949498e285a..e29605db4680 100644
35 --- a/media-sound/mixxx/mixxx-2.3.1.ebuild
36 +++ b/media-sound/mixxx/mixxx-2.3.1-r1.ebuild
37 @@ -20,13 +20,12 @@ else
38 fi
39 LICENSE="GPL-2"
40 SLOT="0"
41 -IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
42 +IUSE="aac doc ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack"
43
44 RDEPEND="
45 dev-db/sqlite
46 dev-libs/glib:2
47 dev-libs/protobuf:0=
48 - dev-qt/qtconcurrent:5
49 dev-qt/qtcore:5
50 dev-qt/qtdbus:5
51 dev-qt/qtgui:5
52 @@ -51,6 +50,7 @@ RDEPEND="
53 media-libs/rubberband
54 media-libs/taglib
55 media-libs/vamp-plugin-sdk
56 + media-sound/lame
57 sci-libs/fftw:3.0=
58 sys-power/upower
59 virtual/glu
60 @@ -66,6 +66,7 @@ RDEPEND="
61 hid? ( dev-libs/hidapi )
62 keyfinder? ( media-libs/libkeyfinder )
63 lv2? ( media-libs/lilv )
64 + modplug? ( media-libs/libmodplug )
65 mp3? ( media-libs/libmad )
66 mp4? ( media-libs/libmp4v2:= )
67 opus? ( media-libs/opusfile )
68 @@ -74,7 +75,9 @@ RDEPEND="
69 wavpack? ( media-sound/wavpack )
70 "
71
72 -DEPEND="${RDEPEND}"
73 +DEPEND="${RDEPEND}
74 + dev-qt/qtconcurrent:5
75 +"
76 BDEPEND="virtual/pkgconfig
77 dev-qt/qttest:5
78 dev-qt/qtxmlpatterns:5"
79 @@ -91,20 +94,23 @@ src_prepare() {
80
81 src_configure() {
82 local mycmakeargs=(
83 + # Not available on Linux yet and requires additional deps
84 + -DBATTERY="off"
85 + -DBROADCAST="$(usex shout on off)"
86 + -DCCACHE_SUPPORT="off"
87 -DFAAD="$(usex aac on off)"
88 -DFFMPEG="$(usex ffmpeg on off)"
89 -DHID="$(usex hid on off)"
90 + -DINSTALL_USER_UDEV_RULES=OFF
91 + -DKEYFINDER="$(usex keyfinder on off)"
92 -DLILV="$(usex lv2 on off)"
93 -DMAD="$(usex mp3 on off)"
94 + -DMODPLUG="$(usex modplug on off)"
95 -DOPTIMIZE="off"
96 - -DCCACHE_SUPPORT="off"
97 -DOPUS="$(usex opus on off)"
98 - -DBROADCAST="$(usex shout on off)"
99 + -DQTKEYCHAIN="$(usex qtkeychain on off)"
100 -DVINYLCONTROL="on"
101 - -DINSTALL_USER_UDEV_RULES=OFF
102 -DWAVPACK="$(usex wavpack on off)"
103 - -DQTKEYCHAIN="$(usex qtkeychain on off)"
104 - -DKEYFINDER="$(usex keyfinder on off)"
105 )
106
107 if [[ "${PV}" == 9999 ]] ; then