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

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/qmmp/
Date: Sat, 26 Apr 2025 02:42:01 +0000 (UTC)	[thread overview]
Message-ID: <1745635226.d60462371d6a8e3f3f7534cfda231d28febf4c08.sam@gentoo> (raw)

commit:     d60462371d6a8e3f3f7534cfda231d28febf4c08
Author:     Filip Kobierski <fkobi <AT> pm <DOT> me>
AuthorDate: Thu Mar  6 14:12:40 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 26 02:40:26 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6046237

media-sound/qmmp: sync live ebuild

Signed-off-by: Filip Kobierski <fkobi <AT> pm.me>
Part-of: https://github.com/gentoo/gentoo/pull/39955
Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-sound/qmmp/qmmp-9999.ebuild | 110 +++++++++++++++++++++-----------------
 1 file changed, 62 insertions(+), 48 deletions(-)

diff --git a/media-sound/qmmp/qmmp-9999.ebuild b/media-sound/qmmp/qmmp-9999.ebuild
index 8355e3dc5d39..8b9ced6a87a3 100644
--- a/media-sound/qmmp/qmmp-9999.ebuild
+++ b/media-sound/qmmp/qmmp-9999.ebuild
@@ -8,8 +8,10 @@ inherit cmake xdg
 DESCRIPTION="Qt-based audio player with winamp/xmms skins support"
 HOMEPAGE="https://qmmp.ylsoftware.com"
 if [[ ${PV} != *9999* ]]; then
-	SRC_URI="https://qmmp.ylsoftware.com/files/${PN}/$(ver_cut 1-2)/${P}.tar.bz2
-		https://downloads.sourceforge.net/${PN}-dev/files/${P}.tar.bz2"
+	SRC_URI="
+		https://qmmp.ylsoftware.com/files/qmmp/$(ver_cut 1-2)/${P}.tar.bz2
+		https://downloads.sourceforge.net/project/qmmp-dev/qmmp/$(ver_cut 1-2)/${P}.tar.bz2
+	"
 	KEYWORDS="~amd64 ~x86"
 else
 	inherit subversion
@@ -17,63 +19,63 @@ else
 	ESVN_REPO_URI="svn://svn.code.sf.net/p/${PN}-dev/code/branches/${PN}-${QMMP_DEV_BRANCH}"
 fi
 
-LICENSE="GPL-2"
+LICENSE="CC-BY-SA-4.0 GPL-2+" # default skin & source code
 SLOT="0"
 # KEYWORDS further up
-IUSE="aac +alsa analyzer archive bs2b cdda cover crossfade cue curl +dbus enca
-ffmpeg flac game gnome jack ladspa libxmp lyrics +mad midi mms mplayer musepack
-notifier opus oss pipewire projectm pulseaudio qsui qtmedia scrobbler shout sid
-sndfile soxr stereo tray udisks +vorbis wavpack"
-
+IUSE="X aac +alsa archive bs2b cdda cddb curl +dbus doc enca
+ffmpeg flac game gnome jack ladspa libxmp +mad midi mms mpg123
+mplayer musepack opus pipewire projectm pulseaudio qtmedia
+shout sid sndfile soxr udisks +vorbis wavpack
+"
 REQUIRED_USE="
+	cddb? ( cdda )
 	gnome? ( dbus )
+	jack? ( soxr )
 	shout? ( soxr vorbis )
 	udisks? ( dbus )
 "
-
+# qtbase[sql] to help autounmask of sqlite
 RDEPEND="
-	dev-qt/qtbase:6[X,dbus,gui,network,sqlite,widgets]
+	dev-qt/qtbase:6[X?,dbus?,gui,network,sql,sqlite,widgets]
 	media-libs/taglib:=
-	x11-libs/libX11
+	X? (
+		x11-libs/libX11
+		x11-libs/libxcb:=
+	)
 	aac? ( media-libs/faad2 )
 	alsa? ( media-libs/alsa-lib )
 	archive? ( app-arch/libarchive )
 	bs2b? ( media-libs/libbs2b )
 	cdda? (
 		dev-libs/libcdio:=
-		dev-libs/libcdio-paranoia
+		dev-libs/libcdio-paranoia:=
 	)
+	cddb? ( media-libs/libcddb )
 	curl? ( net-misc/curl )
-	dbus? ( dev-qt/qtbase:6[dbus] )
 	enca? ( app-i18n/enca )
 	ffmpeg? ( media-video/ffmpeg:= )
 	flac? ( media-libs/flac:= )
 	game? ( media-libs/game-music-emu )
-	jack? (
-		media-libs/libsamplerate
-		virtual/jack
-	)
+	jack? (	virtual/jack )
 	ladspa? ( media-plugins/cmt-plugins )
 	libxmp? ( media-libs/libxmp )
-	mad? (
-		media-libs/libmad:=
-		media-sound/mpg123:=
-	)
+	mad? ( media-libs/libmad )
 	midi? ( media-sound/wildmidi )
 	mms? ( media-libs/libmms )
+	mpg123? ( media-sound/mpg123 )
 	mplayer? ( media-video/mplayer )
 	musepack? ( >=media-sound/musepack-tools-444 )
 	opus? ( media-libs/opusfile )
-	pipewire? ( media-video/pipewire )
+	pipewire? ( media-video/pipewire:= )
 	projectm? (
 		dev-qt/qtbase:6[-gles2-only,opengl]
+		media-libs/libglvnd
 		media-libs/libprojectm:=
 	)
 	pulseaudio? ( media-libs/libpulse )
 	qtmedia? ( dev-qt/qtmultimedia:6 )
-	scrobbler? ( net-misc/curl )
 	shout? ( media-libs/libshout )
-	sid? ( >=media-libs/libsidplayfp-1.1.0 )
+	sid? ( >=media-libs/libsidplayfp-1.1.0:= )
 	sndfile? ( media-libs/libsndfile )
 	soxr? ( media-libs/soxr )
 	udisks? ( sys-fs/udisks:2 )
@@ -83,32 +85,40 @@ RDEPEND="
 	)
 	wavpack? ( media-sound/wavpack )
 "
-DEPEND="${RDEPEND}"
-BDEPEND="dev-qt/qttools:6[linguist]"
+DEPEND="
+	${RDEPEND}
+	X? ( x11-base/xorg-proto )
+"
+BDEPEND="
+	dev-qt/qttools:6[linguist]
+	doc? ( app-text/doxygen )
+"
 
 DOCS=( AUTHORS ChangeLog README )
 
-src_prepare() {
-	if has_version dev-libs/libcdio-paranoia ; then
-		sed -i \
-			-e 's:cdio/cdda.h:cdio/paranoia/cdda.h:' \
-			src/plugins/Input/cdaudio/decoder_cdaudio.cpp || die
-	fi
-
-	cmake_src_prepare
-}
-
 src_configure() {
 	local mycmakeargs=(
+		# our defaults
+		-DUSE_CONVERTER=ON # because taglib
+		-DUSE_RGSCAN=ON # because taglib
+		-DUSE_LIBRARY=ON # because qtbase[sqlite]
+
+		# depless non-default options
+		-DUSE_OSS=ON
+
+		# turn off windows specific stuff
+		-DUSE_DSOUND=OFF
+		-DUSE_TASKBAR=OFF
+		-DUSE_RDETECT=OFF
+		-DUSE_WASAPI=OFF
+		-DUSE_WAVEOUT=OFF
+		# set USE flags
 		-DUSE_AAC="$(usex aac)"
 		-DUSE_ALSA="$(usex alsa)"
-		-DUSE_ANALYZER="$(usex analyzer)"
 		-DUSE_ARCHIVE="$(usex archive)"
 		-DUSE_BS2B="$(usex bs2b)"
 		-DUSE_CDA="$(usex cdda)"
-		-DUSE_COVER="$(usex cover)"
-		-DUSE_CROSSFADE="$(usex crossfade)"
-		-DUSE_CUE="$(usex cue)"
+		-DUSE_LIBCDDB="$(usex cddb)"
 		-DUSE_CURL="$(usex curl)"
 		-DUSE_KDENOTIFY="$(usex dbus)"
 		-DUSE_MPRIS="$(usex dbus)"
@@ -118,34 +128,38 @@ src_configure() {
 		-DUSE_FLAC="$(usex flac)"
 		-DUSE_GME="$(usex game)"
 		-DUSE_GNOMEHOTKEY="$(usex gnome)"
+		-DUSE_HOTKEY="$(usex X)"
 		-DUSE_JACK="$(usex jack)"
 		-DUSE_LADSPA="$(usex ladspa)"
-		-DUSE_LYRICS="$(usex lyrics)"
 		-DUSE_MAD="$(usex mad)"
 		-DUSE_MIDI="$(usex midi)"
 		-DUSE_MMS="$(usex mms)"
+		-DUSE_MPG123="$(usex mpg123)"
 		-DUSE_MPLAYER="$(usex mplayer)"
 		-DUSE_MPC="$(usex musepack)"
-		-DUSE_NOTIFIER="$(usex notifier)"
+		-DUSE_NOTIFIER="$(usex X)"
 		-DUSE_OPUS="$(usex opus)"
-		-DUSE_OSS="$(usex oss)"
 		-DUSE_PIPEWIRE="$(usex pipewire)"
 		-DUSE_PROJECTM="$(usex projectm)"
 		-DUSE_PULSE="$(usex pulseaudio)"
-		-DUSE_QSUI="$(usex qsui)"
 		-DUSE_QTMULTIMEDIA="$(usex qtmedia)"
-		-DUSE_SCROBBLER="$(usex scrobbler)"
 		-DUSE_SHOUT="$(usex shout)"
 		-DUSE_SID="$(usex sid)"
+		-DUSE_SKINNED="$(usex X)"
 		-DUSE_SNDFILE="$(usex sndfile)"
 		-DUSE_SOXR="$(usex soxr)"
-		-DUSE_STEREO="$(usex stereo)"
-		-DUSE_STATICON="$(usex tray)"
 		-DUSE_UDISKS="$(usex udisks)"
 		-DUSE_VORBIS="$(usex vorbis)"
 		-DUSE_WAVPACK="$(usex wavpack)"
 		-DUSE_XMP="$(usex libxmp)"
 	)
-
 	cmake_src_configure
 }
+
+src_compile() {
+	cmake_src_compile
+	use doc && {
+		cmake_build docs
+		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	}
+}

next             reply	other threads:[~2025-04-26  2:42 UTC|newest]

Thread overview: 169+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-26  2:42 Sam James [this message]
  -- strict thread matches above, loose matches on Subject: below --
2025-08-26  0:51 [gentoo-commits] repo/gentoo:master commit in: media-sound/qmmp/ Sam James
2025-08-25  9:50 Sam James
2025-06-18 19:31 Miroslav Šulc
2025-06-18 19:02 Miroslav Šulc
2025-06-14 22:42 Sam James
2025-05-21 21:25 Sam James
2025-05-21 21:25 Sam James
2025-04-26  2:42 Sam James
2025-02-06 22:41 Andreas Sturmlechner
2025-01-13 18:20 Andreas Sturmlechner
2025-01-06 22:58 Andreas Sturmlechner
2025-01-06 22:58 Andreas Sturmlechner
2025-01-06 22:58 Andreas Sturmlechner
2024-12-28  0:05 Andreas Sturmlechner
2024-12-28  0:05 Andreas Sturmlechner
2023-06-17 13:18 Andreas Sturmlechner
2023-06-17  7:43 Arthur Zamarin
2023-06-17  7:43 Arthur Zamarin
2023-05-29 13:11 Andreas Sturmlechner
2023-05-29 13:11 Andreas Sturmlechner
2022-09-10  8:41 Sam James
2022-07-27  8:43 Andreas Sturmlechner
2022-07-27  5:01 Miroslav Šulc
2022-07-25  7:13 Agostino Sarubbo
2022-06-22 11:36 Jakov Smolić
2022-06-22  9:01 Lars Wendler
2022-06-22  9:01 Lars Wendler
2022-06-22  7:33 Lars Wendler
2022-05-22  7:59 Lars Wendler
2022-05-22  7:59 Lars Wendler
2022-05-05 10:07 Miroslav Šulc
2022-05-05  9:54 Jakov Smolić
2022-05-05  9:54 Jakov Smolić
2022-04-04  9:47 Lars Wendler
2022-02-17 10:14 Miroslav Šulc
2022-02-17 10:06 Jakov Smolić
2022-02-17 10:06 Jakov Smolić
2022-01-18  8:28 Lars Wendler
2022-01-18  8:28 Lars Wendler
2021-08-19  5:49 Miroslav Šulc
2021-08-19  1:29 Agostino Sarubbo
2021-08-14  7:02 Agostino Sarubbo
2021-07-13  6:52 Miroslav Šulc
2021-07-13  6:34 Agostino Sarubbo
2021-07-13  5:35 Miroslav Šulc
2021-07-11  8:58 Agostino Sarubbo
2021-06-13  6:43 Miroslav Šulc
2021-06-13  6:32 Agostino Sarubbo
2021-06-13  6:04 Sam James
2021-06-09 13:28 Lars Wendler
2021-06-09 13:28 Lars Wendler
2021-06-09 13:28 Lars Wendler
2021-06-09 13:28 Lars Wendler
2020-11-04  8:25 Miroslav Šulc
2020-11-04  0:52 Sam James
2020-10-28 14:33 Thomas Deutschmann
2020-09-29 18:27 Miroslav Šulc
2020-09-29 18:05 Miroslav Šulc
2020-09-29 17:49 Miroslav Šulc
2020-09-20 20:21 Agostino Sarubbo
2020-09-08 17:47 Miroslav Šulc
2020-08-08 10:26 Miroslav Šulc
2020-08-08 10:02 Miroslav Šulc
2020-05-07 12:42 Lars Wendler
2020-05-07 12:42 Lars Wendler
2020-04-28  9:24 Lars Wendler
2020-04-28  9:24 Lars Wendler
2020-04-25 18:20 Mikle Kolyada
2020-04-03 20:07 Andreas Sturmlechner
2020-01-17 16:08 Lars Wendler
2020-01-17 16:08 Lars Wendler
2019-12-29 20:32 Lars Wendler
2019-11-15  9:01 Lars Wendler
2019-11-15  9:01 Lars Wendler
2019-10-08 14:24 Lars Wendler
2019-08-30  8:24 Lars Wendler
2019-07-17 13:43 Ulrich Müller
2019-07-15 12:58 Ulrich Müller
2019-06-21 11:22 Lars Wendler
2019-06-21 11:22 Lars Wendler
2019-06-04 14:45 Thomas Deutschmann
2019-05-26 11:47 Mikle Kolyada
2019-05-08 17:05 Andreas Sturmlechner
2019-02-28 10:58 Lars Wendler
2019-02-28 10:58 Lars Wendler
2019-02-15 18:10 Mikle Kolyada
2019-02-15 15:46 Thomas Deutschmann
2019-02-14  2:58 Lars Wendler
2019-01-23 14:52 Lars Wendler
2019-01-23 14:52 Lars Wendler
2018-12-23 11:25 Lars Wendler
2018-12-23 11:25 Lars Wendler
2018-11-14 17:20 Lars Wendler
2018-09-24 16:18 Lars Wendler
2018-09-07 20:34 Andreas Sturmlechner
2018-08-24  2:34 Mikle Kolyada
2018-08-23  1:41 Thomas Deutschmann
2018-07-23  9:11 Lars Wendler
2018-07-23  9:11 Lars Wendler
2018-06-04  8:39 Lars Wendler
2018-06-04  8:39 Lars Wendler
2018-04-23  0:53 Lars Wendler
2017-11-29 18:45 Lars Wendler
2017-11-29 18:45 Lars Wendler
2017-11-29 18:45 Lars Wendler
2017-11-23 23:49 Lars Wendler
2017-10-23 15:31 Lars Wendler
2017-10-23 15:31 Lars Wendler
2017-10-14 15:13 Andreas Sturmlechner
2017-08-07  7:53 Lars Wendler
2017-08-07  7:53 Lars Wendler
2017-06-09  1:19 Lars Wendler
2017-06-03 21:26 Andreas Sturmlechner
2017-06-03 21:26 Andreas Sturmlechner
2017-06-03 21:26 Andreas Sturmlechner
2017-03-27  9:01 Lars Wendler
2017-03-27  9:01 Lars Wendler
2017-03-27  9:01 Lars Wendler
2017-03-20 12:28 Agostino Sarubbo
2017-02-25 22:46 Andreas Sturmlechner
2017-02-25 22:46 Andreas Sturmlechner
2017-02-25 22:46 Andreas Sturmlechner
2017-02-08 15:04 Lars Wendler
2017-02-08 15:04 Lars Wendler
2017-01-16  2:40 Lars Wendler
2017-01-16  2:40 Lars Wendler
2017-01-04 15:29 Agostino Sarubbo
2016-12-19 15:40 Tobias Klausmann
2016-12-19 15:08 Tobias Klausmann
2016-12-04 19:53 Markos Chandras
2016-12-04 19:53 Markos Chandras
2016-12-03 13:49 Markos Chandras
2016-11-17 17:08 Lars Wendler
2016-11-17 17:08 Lars Wendler
2016-10-17  9:05 Lars Wendler
2016-10-17  9:05 Lars Wendler
2016-09-03  0:08 Lars Wendler
2016-09-03  0:08 Lars Wendler
2016-07-25 20:02 Lars Wendler
2016-07-13 10:16 Lars Wendler
2016-07-13 10:16 Lars Wendler
2016-06-14 11:45 Lars Wendler
2016-06-11 17:00 Agostino Sarubbo
2016-05-04  9:30 Lars Wendler
2016-05-04  9:30 Lars Wendler
2016-04-23 15:41 Davide Pesavento
2016-04-07 14:22 Lars Wendler
2016-04-07 14:22 Lars Wendler
2016-04-07 14:22 Lars Wendler
2016-03-06 12:10 Markos Chandras
2016-02-10  7:36 Lars Wendler
2016-02-10  7:36 Lars Wendler
2016-01-17 19:52 Lars Wendler
2016-01-17 19:52 Lars Wendler
2015-12-24 15:55 Lars Wendler
2015-12-24 15:55 Lars Wendler
2015-11-15 17:48 Markos Chandras
2015-11-03 16:28 Agostino Sarubbo
2015-11-03 16:28 Agostino Sarubbo
2015-11-03 15:28 Lars Wendler
2015-10-18 11:05 Markos Chandras
2015-10-18 11:05 Markos Chandras
2015-10-11 17:34 Lars Wendler
2015-10-10 10:52 Markos Chandras
2015-09-11 21:21 Markos Chandras
2015-08-27 17:26 Markos Chandras
2015-08-27 17:25 Markos Chandras
2015-08-27 17:25 Markos Chandras

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:8355e3dc5d3 dfblob:8b9ced6a87a )
 OR (
bs:"[gentoo-commits] repo/gentoo:master commit in: media-sound/qmmp/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1745635226.d60462371d6a8e3f3f7534cfda231d28febf4c08.sam@gentoo \
    --to=sam@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox