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:47:40
Message-Id: 1642506429.7e10611526e55bc4bd005fc9166f3b4f1514b5ed.polynomial-c@gentoo
1 commit: 7e10611526e55bc4bd005fc9166f3b4f1514b5ed
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 18 11:47:09 2022 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Jan 18 11:47:09 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e106115
7
8 media-sound/mixxx: Synced live ebuild
9
10 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
11
12 media-sound/mixxx/mixxx-2.3.9999.ebuild | 45 ++++++++++++++++++---------------
13 1 file changed, 24 insertions(+), 21 deletions(-)
14
15 diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild
16 index 8b5963df7ac6..3c49c3f0fa15 100644
17 --- a/media-sound/mixxx/mixxx-2.3.9999.ebuild
18 +++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild
19 @@ -1,4 +1,4 @@
20 -# Copyright 1999-2021 Gentoo Authors
21 +# Copyright 1999-2022 Gentoo Authors
22 # Distributed under the terms of the GNU General Public License v2
23
24 EAPI=7
25 @@ -7,28 +7,25 @@ inherit cmake xdg udev
26
27 DESCRIPTION="Advanced Digital DJ tool based on Qt"
28 HOMEPAGE="https://www.mixxx.org/"
29 -if [[ "${PV}" == 9999 || ?.?.9999 ]] ; then
30 +if [[ "${PV}" == *9999 ]] ; then
31 inherit git-r3
32 + if [[ "${PV}" == ?.?.9999 ]] ; then
33 + EGIT_BRANCH=${PV%.9999}
34 + fi
35 EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
36 else
37 - SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
38 - S="${WORKDIR}/${PN}-release-${PV}"
39 + SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
40 + #S="${WORKDIR}/${PN}-release-${PV}"
41 KEYWORDS="~amd64 ~x86"
42 fi
43 -
44 -if [[ "${PV}" == ?.?.9999 ]] ; then
45 - EGIT_BRANCH=${PV%.9999}
46 -fi
47 -
48 LICENSE="GPL-2"
49 SLOT="0"
50 -IUSE="aac doc ffmpeg hid keyfinder lv2 mp3 mp4 opus qtkeychain shout wavpack"
51 +IUSE="aac doc ffmpeg hid keyfinder lv2 modplug mp3 mp4 opus qtkeychain shout wavpack"
52
53 RDEPEND="
54 dev-db/sqlite
55 dev-libs/glib:2
56 dev-libs/protobuf:0=
57 - dev-qt/qtconcurrent:5
58 dev-qt/qtcore:5
59 dev-qt/qtdbus:5
60 dev-qt/qtgui:5
61 @@ -53,6 +50,7 @@ RDEPEND="
62 media-libs/rubberband
63 media-libs/taglib
64 media-libs/vamp-plugin-sdk
65 + media-sound/lame
66 sci-libs/fftw:3.0=
67 sys-power/upower
68 virtual/glu
69 @@ -68,6 +66,7 @@ RDEPEND="
70 hid? ( dev-libs/hidapi )
71 keyfinder? ( media-libs/libkeyfinder )
72 lv2? ( media-libs/lilv )
73 + modplug? ( media-libs/libmodplug )
74 mp3? ( media-libs/libmad )
75 mp4? ( media-libs/libmp4v2:= )
76 opus? ( media-libs/opusfile )
77 @@ -76,7 +75,9 @@ RDEPEND="
78 wavpack? ( media-sound/wavpack )
79 "
80
81 -DEPEND="${RDEPEND}"
82 +DEPEND="${RDEPEND}
83 + dev-qt/qtconcurrent:5
84 +"
85 BDEPEND="virtual/pkgconfig
86 dev-qt/qttest:5
87 dev-qt/qtxmlpatterns:5"
88 @@ -90,29 +91,31 @@ src_prepare() {
89 }
90
91 src_configure() {
92 -
93 local mycmakeargs=(
94 + # Not available on Linux yet and requires additional deps
95 + -DBATTERY="off"
96 + -DBROADCAST="$(usex shout on off)"
97 + -DCCACHE_SUPPORT="off"
98 -DFAAD="$(usex aac on off)"
99 -DFFMPEG="$(usex ffmpeg on off)"
100 -DHID="$(usex hid on off)"
101 + -DINSTALL_USER_UDEV_RULES=OFF
102 + -DKEYFINDER="$(usex keyfinder on off)"
103 -DLILV="$(usex lv2 on off)"
104 -DMAD="$(usex mp3 on off)"
105 + -DMODPLUG="$(usex modplug on off)"
106 -DOPTIMIZE="off"
107 - -DCCACHE_SUPPORT="off"
108 -DOPUS="$(usex opus on off)"
109 - -DBROADCAST="$(usex shout on off)"
110 + -DQTKEYCHAIN="$(usex qtkeychain on off)"
111 -DVINYLCONTROL="on"
112 - -DINSTALL_USER_UDEV_RULES=OFF
113 -DWAVPACK="$(usex wavpack on off)"
114 - -DQTKEYCHAIN="$(usex qtkeychain on off)"
115 - -DKEYFINDER="$(usex keyfinder on off)"
116 )
117
118 if [[ "${PV}" == 9999 ]] ; then
119 - local mycmakeargs+=(
120 - -DENGINEPRIME="OFF"
121 + mycmakeargs+=(
122 + -DENGINEPRIME="OFF"
123
124 - )
125 + )
126 fi
127 cmake_src_configure
128 }