From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id E0D4513835A for ; Tue, 2 Jun 2020 11:27:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1B5EDE0893; Tue, 2 Jun 2020 11:27:04 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E340AE0893 for ; Tue, 2 Jun 2020 11:27:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 50D773432C1 for ; Tue, 2 Jun 2020 11:27:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EBD3326A for ; Tue, 2 Jun 2020 11:27:00 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1591097201.39c73ecc957243dfb048fd310225011956c7476e.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-plugins/audacious-plugins/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-plugins/audacious-plugins/audacious-plugins-9999.ebuild media-plugins/audacious-plugins/metadata.xml X-VCS-Directories: media-plugins/audacious-plugins/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 39c73ecc957243dfb048fd310225011956c7476e X-VCS-Branch: master Date: Tue, 2 Jun 2020 11:27:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: bd99fd7e-9626-4733-a0f6-4992d0aa8e2f X-Archives-Hash: 16c4ad9a00a4be011d616aa3ccce1be2 commit: 39c73ecc957243dfb048fd310225011956c7476e Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 2 09:53:49 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 2 11:26:41 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39c73ecc media-plugins/audacious-plugins: Cleanup and sync live with 4.0.x Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner gentoo.org> .../audacious-plugins-9999.ebuild | 39 ++++++++-------------- media-plugins/audacious-plugins/metadata.xml | 1 - 2 files changed, 13 insertions(+), 27 deletions(-) diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild index f9b1ea0ec28..32544b9a66f 100644 --- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild +++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild @@ -17,14 +17,12 @@ HOMEPAGE="https://audacious-media-player.org/" LICENSE="GPL-2" SLOT="0" -IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme gtk http - jack lame libav libnotify libsamplerate lirc mms modplug mp3 nls opengl - pulseaudio qtmedia scrobbler sdl sid sndfile soxr speedpitch streamtuner - vorbis wavpack" +IUSE="aac +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth gme http jack lame + libnotify libsamplerate lirc mms modplug mp3 nls opengl pulseaudio qtmedia + scrobbler sdl sid sndfile soxr speedpitch streamtuner vorbis wavpack" REQUIRED_USE=" || ( alsa jack pulseaudio qtmedia sdl ) - ampache? ( http ) streamtuner? ( http ) - gtk? ( !ampache !qtmedia !streamtuner )" + ampache? ( http ) streamtuner? ( http )" # The following plugins REQUIRE a GUI build of audacious, because non-GUI # builds do NOT install the libaudgui library & headers. @@ -53,7 +51,10 @@ DEPEND=" dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2:2 - ~media-sound/audacious-${PV}[gtk=] + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + ~media-sound/audacious-${PV} aac? ( >=media-libs/faad2-2.7 ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1* ) @@ -70,17 +71,6 @@ DEPEND=" >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth:= ) - gtk? ( - x11-libs/gtk+:2 - x11-libs/libXcomposite - x11-libs/libXrender - ) - !gtk? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - opengl? ( dev-qt/qtopengl:5 ) - ) http? ( >=net-libs/neon-0.26.4 ) jack? ( >=media-libs/bio2jack-0.4 @@ -93,6 +83,7 @@ DEPEND=" mms? ( >=media-libs/libmms-0.3 ) modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) + opengl? ( dev-qt/qtopengl:5 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) @@ -127,8 +118,10 @@ src_prepare() { src_configure() { local myeconfargs=( --enable-mpris2 + --enable-qt --enable-songchange --disable-adplug # not packaged + --disable-gtk --disable-openmpt # not packaged --disable-oss4 --disable-coreaudio @@ -143,10 +136,6 @@ src_configure() { $(use_enable flac filewriter) $(use_enable fluidsynth amidiplug) $(use_enable gme console) - $(use_enable gtk aosd) - $(use_enable gtk gtk) - $(use_enable gtk hotkey) - $(use_enable !gtk qt) $(use_enable http neon) $(use_enable jack) $(use_enable lame filewriter_mp3) @@ -157,6 +146,7 @@ src_configure() { $(use_enable modplug) $(use_enable mp3 mpg123) $(use_enable nls) + $(use_enable opengl qtglspectrum) $(use_enable pulseaudio pulse) $(use_enable qtmedia qtaudio) $(use_enable scrobbler scrobbler2) @@ -168,10 +158,7 @@ src_configure() { $(use_enable streamtuner) $(use_enable vorbis) $(use_enable wavpack) - $(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg)) - ) - use !gtk && myeconfargs+=( - $(usex opengl --enable-qtglspectrum --disable-qtglspectrum) + $(use_with ffmpeg ffmpeg ffmpeg) ) econf "${myeconfargs[@]}" diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml index 02bd0208b84..30eb5c5c92d 100644 --- a/media-plugins/audacious-plugins/metadata.xml +++ b/media-plugins/audacious-plugins/metadata.xml @@ -15,7 +15,6 @@ Support CUE sheets using the libcue library Support FluidSynth as MIDI synth backend Support various gaming console music formats - Build with GTK interface instead of Qt5 Support HTTP streams through neon Enable playback via dev-qt/qtmultimedia Build with scrobbler/LastFM submission support