[gentoo-commits] repo/gentoo:master commit in: media-sound/mixxx/

["Lars Wendler" <polynomial-c@gentoo.org>]

commit:     7e10611526e55bc4bd005fc9166f3b4f1514b5ed
Author:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 18 11:47:09 2022 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Jan 18 11:47:09 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7e106115

media-sound/mixxx: Synced live ebuild

Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>

 media-sound/mixxx/mixxx-2.3.9999.ebuild | 45 ++++++++++++++++++---------------
 1 file changed, 24 insertions(+), 21 deletions(-)

diff --git a/media-sound/mixxx/mixxx-2.3.9999.ebuild b/media-sound/mixxx/mixxx-2.3.9999.ebuild
index 8b5963df7ac6..3c49c3f0fa15 100644
--- a/media-sound/mixxx/mixxx-2.3.9999.ebuild
+++ b/media-sound/mixxx/mixxx-2.3.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,28 +7,25 @@ inherit cmake xdg udev
 
 DESCRIPTION="Advanced Digital DJ tool based on Qt"
 HOMEPAGE="https://www.mixxx.org/"
-if [[ "${PV}" == 9999 || ?.?.9999 ]] ; then
+if [[ "${PV}" == *9999 ]] ; then
 	inherit git-r3
+	if [[ "${PV}" == ?.?.9999 ]] ; then
+		EGIT_BRANCH=${PV%.9999}
+	fi
 	EGIT_REPO_URI="https://github.com/mixxxdj/${PN}.git"
 else
-	SRC_URI="https://github.com/mixxxdj/${PN}/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-release-${PV}"
+	SRC_URI="https://github.com/mixxxdj/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
+	#S="${WORKDIR}/${PN}-release-${PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
-
-if [[ "${PV}" == ?.?.9999 ]] ; then
-	EGIT_BRANCH=${PV%.9999}
-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
@@ -53,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
@@ -68,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 )
@@ -76,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"
@@ -90,29 +91,31 @@ 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
-	local mycmakeargs+=(
-		-DENGINEPRIME="OFF"
+		mycmakeargs+=(
+			-DENGINEPRIME="OFF"
 
-	)
+		)
 	fi
 	cmake_src_configure
 }