From de49812990871e1705b64051c35161d5e6400269 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Dec 2018 14:11:38 +0000 Subject: gentoo resync : 24.12.2018 --- media-plugins/audacious-plugins/Manifest | 10 +- .../audacious-plugins-3.10-r1.ebuild | 170 +++++++++++++++++++ .../audacious-plugins-3.10.ebuild | 155 ------------------ .../audacious-plugins-3.9-r1.ebuild | 180 --------------------- .../audacious-plugins-3.9-r2.ebuild | 147 +++++++++++++++++ .../audacious-plugins-9999.ebuild | 164 +++++++++---------- .../files/audacious-plugins-3.9-qt-5.10.patch | 26 --- media-plugins/audacious-plugins/metadata.xml | 5 +- 8 files changed, 400 insertions(+), 457 deletions(-) create mode 100644 media-plugins/audacious-plugins/audacious-plugins-3.10-r1.ebuild delete mode 100644 media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild delete mode 100644 media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild create mode 100644 media-plugins/audacious-plugins/audacious-plugins-3.9-r2.ebuild delete mode 100644 media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch (limited to 'media-plugins/audacious-plugins') diff --git a/media-plugins/audacious-plugins/Manifest b/media-plugins/audacious-plugins/Manifest index d771ae1dbed8..65f10e553ca2 100644 --- a/media-plugins/audacious-plugins/Manifest +++ b/media-plugins/audacious-plugins/Manifest @@ -1,9 +1,7 @@ AUX audacious-plugins-3.10-fix-slow-search.patch 3373 BLAKE2B 1b66928f0f92395179931ffe681d60db466bd9fa70cc6d1cdf6e4ebd9803737d7dd2d967d006ec6a90eca557f63610059407987dbe54e2c41f69d2443b257836 SHA512 8287ad3a85c526cef99f155752b6de53ab4100eec08a3b746536123973c59c7e7a4b917d7e143bb59d99b9aa7812dfd11000add11c2c293f4f7d08259a02f4a3 -AUX audacious-plugins-3.9-qt-5.10.patch 1022 BLAKE2B 0bad9beb8ab5c53b696e324fd0d973a1355b6bd6f8a4052ee1619baa43d720066b0b424d066aa1d9427418d1dd5e4e0fb343b6f843c8fb7345c7abff0d21f0fc SHA512 33e854ba848ad8cbd7b53a81bf8c219069ae72aac6ba5a226ebb5152b46dbcb31e04e4fef7a1bbd912b1a6c2a9f1f8d904be750dc132e94cc53c138a354b52ed DIST audacious-plugins-3.10.tar.bz2 1701877 BLAKE2B 4db7351af494ff5b7d2a7968524e2480f321505759f4a6532dd86f8fd87f43ab0a66e9f1fc75cfcbc8c59d35c1071048b61a8452fa6e041cd1667872f5b5699e SHA512 88dd93b5a7f6582ec42cf539d1000de0900cce683f4de85d8a17f57c7ba34545c6277882cad1505cb6682ee7b885ffcd1fe5675f7e24dc3e2a650615789d9d52 DIST audacious-plugins-3.9-gtk3.tar.bz2 1842950 BLAKE2B 55f373be204a9b4c9cff41d41d43c4776f680ab203643e90e5d338bec2e7f8a4c60cda9caa08e461089a475f3ec1bc237538f781718eb0d26a4365743337e977 SHA512 e2529af761bc97e589cac08689b16db657096b1bbfcc802789726ae1b472746025bec1b492de52eef755d7b50574d09b9250761bf701b1ca37f8a0e8db0f207b -DIST audacious-plugins-3.9.tar.bz2 1843084 BLAKE2B fa3a8433a869a2df0589f59e12513adcc0da0545b53ee441db4b18be7e12334b4125bd60b48902c37041041555859ab19df814c483f7d971214077e9980148b6 SHA512 00c8c53d69995ca1fedb91c7df609cc6c65b13e1af23b98a2fbda143c02ac554cc2c42c01f1c593af252e36bfb85b6324f2daca8632d3b672c69fb4dead2e3fa -EBUILD audacious-plugins-3.10.ebuild 3914 BLAKE2B e9bb66444f4e31023360d5f5847e80639e0f0abb39c28a27066041dc580d587122fb7926ecbb51c844477e24c5f1cbb3da165f3ea24c85b85b74e78614d139dc SHA512 48e8b2643c9db930a9e3559ef2d70cdd95041deea5f3b79e9c712c44b78b1db7409e6871ac1acc900e08a6872b213505dfecb1167064d6042f2e7145495efeee -EBUILD audacious-plugins-3.9-r1.ebuild 4500 BLAKE2B 160c9c5c24829855b59c613d1f8cba6ab63375567e5b4056603f3053ec7bebdc8134db8daf3480b821d30547544e914e30ce3f7a4f64482de30b75d7c9a1ef1f SHA512 00a64329376e63822a4df0974332cce9e2feb80ba8bd5e17134310ae052f7561fdde11434aa72efcc1c470e66589e2bc1841bc84c3d1667b28ac965e1f0fc2f9 -EBUILD audacious-plugins-9999.ebuild 4428 BLAKE2B 62886db82bd137bcb38ef9d98fd34f4c59557ea3122870765b1d983a8d997beaa37f7d30e86ac04a9b3a737ad03f02aeac4d6bd08bfd9d2ef79b0a4176eaea51 SHA512 c9753c7ec6b04860e2c582375e7de64733e9c969410c8d4dbb7db60484687d52ae5bd2d208eb9b1adeee44b92af01e9f22b9265bf2082da734727a62b2cc8c02 -MISC metadata.xml 1428 BLAKE2B f6f35bd76daa789fe1700ef910aee207bf132d9dee3660796d2d6182e54f839370dcb6f7eedf73cd52d5e3713a8460fed1e9db625e5208c76f3a857cb09da24f SHA512 720a609a086b8477062fa836b1e7ac2dcca5e9a0aaac25848fd6a6c69d48fcc8161885ac9bc3c428d81c3e8e1b2256f0343c799cc07e8ceb7ec4fd2ce3d7680d +EBUILD audacious-plugins-3.10-r1.ebuild 4331 BLAKE2B bf4ca1c68855e38fdbb281d7ee95b7857a5e7ac8a40727a2dbaaf5eb05deb68c23dc0cd615a8c71e348df65f06647c887c3115dada0ea02eee54d57cb8d1bc06 SHA512 93cd48c84ff38ddb994d74b9162f0c0bfb746d7b9d550a4765c42f2e4a03ecc84fbe8bd47184511fe54f9c566768ae69908e34aa8c35c04a6cce24fc261231b9 +EBUILD audacious-plugins-3.9-r2.ebuild 3684 BLAKE2B 089fb220f9212d6bff4c10ea3b86719e918928d177a754d5d274f3e0d04257ce4cbbf4db0c3485cee2a8f31648ea96eaffafdb6908b5a71f51e2f0d7b46d8043 SHA512 2dc3cae3e3b663aa3dcaa2efc085d86ae292229e3984bc18a9b5876aef9d2923f04434774c5f39f47d33d178110b448a34d0a939c9a713495a180f0dfd8c6ee4 +EBUILD audacious-plugins-9999.ebuild 4277 BLAKE2B 1916a029169b9da4162cbf18ae3d52e64315943e91ee733eb6ebdbba017bf5f7b108e6fc7262f4575b88065a902cbdef2db794777cf22d2f0e164c1245b831d0 SHA512 0b9b68b4dd8db53198a8bf9787b91a09b359d5ec4279943f7db39e67c23fc8451e0b6ed9a0b9a98a3fa7e7308820f757f39f243723e80beabd67e32cbdf5ddb0 +MISC metadata.xml 1333 BLAKE2B f27c5c2d94c45688e56a6a48382c6b5fb3e05bfbbdff613af56ce386af8f607b6d24f5eedfebe221274fe5f56d0d13cc1cba21c11007ff9b5ceb5080f36dde64 SHA512 2c31199cc1f095d0108223e15584dd901fedc88aa02820bf4749cbb1014eeec5af04e1df9688efdd2c2b78a4f27658dec3a73a7c3e6e3968fc8ab659611e9c81 diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10-r1.ebuild new file mode 100644 index 000000000000..2866dd8fcd2a --- /dev/null +++ b/media-plugins/audacious-plugins/audacious-plugins-3.10-r1.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +MY_P="${P/_/-}" + +if [[ ${PV} == *9999 ]]; then + inherit autotools git-r3 + EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git" +else + SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2" + KEYWORDS="~amd64 ~x86" +fi +DESCRIPTION="Lightweight and versatile audio player" +HOMEPAGE="https://audacious-media-player.org/" + +LICENSE="GPL-2" +SLOT="0" +IUSE="aac adplug +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify libsamplerate + lirc mms modplug mp3 nls opengl pulseaudio qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" +REQUIRED_USE=" + || ( alsa jack pulseaudio qtmedia sdl ) + ampache? ( qt5 http ) qtmedia? ( qt5 )" + +# The following plugins REQUIRE a GUI build of audacious, because non-GUI +# builds do NOT install the libaudgui library & headers. +# Plugins without a configure option: +# alarm +# albumart +# delete-files +# ladspa +# playlist-manager +# search-tool +# skins +# vtx +# Plugins with a configure option: +# glspectrum +# gtkui +# hotkey +# notify +# statusicon +RDEPEND=" + app-arch/unzip + dev-libs/dbus-glib + dev-libs/glib + dev-libs/libxml2:2 + ~media-sound/audacious-${PV}[qt5=] + aac? ( >=media-libs/faad2-2.7 ) + adplug? ( media-libs/adplug ) + alsa? ( >=media-libs/alsa-lib-1.0.16 ) + ampache? ( =media-libs/ampache_browser-1* ) + bs2b? ( media-libs/libbs2b ) + cdda? ( + dev-libs/libcdio:= + dev-libs/libcdio-paranoia + >=media-libs/libcddb-1.2.1 + ) + cue? ( media-libs/libcue ) + ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) + flac? ( + >=media-libs/flac-1.2.1-r1 + >=media-libs/libvorbis-1.0 + ) + fluidsynth? ( media-sound/fluidsynth ) + http? ( >=net-libs/neon-0.26.4 ) + jack? ( + >=media-libs/bio2jack-0.4 + virtual/jack + ) + lame? ( media-sound/lame ) + libnotify? ( x11-libs/libnotify ) + libsamplerate? ( media-libs/libsamplerate:= ) + lirc? ( app-misc/lirc ) + mms? ( >=media-libs/libmms-0.3 ) + modplug? ( media-libs/libmodplug ) + mp3? ( >=media-sound/mpg123-1.12.1 ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) + !qt5? ( + x11-libs/gtk+:2 + x11-libs/libXcomposite + x11-libs/libXrender + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + opengl? ( dev-qt/qtopengl:5 ) + ) + qtmedia? ( dev-qt/qtmultimedia:5 ) + scrobbler? ( net-misc/curl ) + sdl? ( media-libs/libsdl2[sound] ) + sid? ( >=media-libs/libsidplayfp-1.0.0 ) + sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) + soxr? ( media-libs/soxr ) + speedpitch? ( media-libs/libsamplerate:= ) + vorbis? ( + >=media-libs/libogg-1.1.3 + >=media-libs/libvorbis-1.2.0 + ) + wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) +" +DEPEND="${RDEPEND} + dev-util/gdbus-codegen + virtual/pkgconfig + nls? ( dev-util/intltool ) +" + +PATCHES=( "${FILESDIR}/${P}-fix-slow-search.patch" ) + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + if ! use nls; then + sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698 + fi + [[ ${PV} == *9999 ]] && eautoreconf +} + +src_configure() { + use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag" + + local myeconfargs=( + --enable-mpris2 + --enable-songchange + --disable-oss4 + --disable-coreaudio + --disable-sndio + $(use_enable aac) + $(use_enable adplug) + $(use_enable alsa) + $(use_enable ampache) + $(use_enable bs2b) + $(use_enable cdda cdaudio) + $(use_enable cue) + $(use_enable flac) + $(use_enable flac filewriter) + $(use_enable fluidsynth amidiplug) + $(use_enable gme console) + $(use_enable http neon) + $(use_enable jack) + $(use_enable lame filewriter_mp3) + $(use_enable libnotify notify) + $(use_enable libsamplerate resample) + $(use_enable lirc) + $(use_enable mms) + $(use_enable modplug) + $(use_enable mp3 mpg123) + $(use_enable nls) + $(use_enable pulseaudio pulse) + $(use_enable !qt5 aosd) + $(use_enable !qt5 gtk) + $(use_enable !qt5 hotkey) + $(use_enable qt5 qt) + $(use_enable qtmedia qtaudio) + $(use_enable scrobbler scrobbler2) + $(use_enable sdl sdlout) + $(use_enable sid) + $(use_enable sndfile) + $(use_enable soxr) + $(use_enable speedpitch) + $(use_enable vorbis) + $(use_enable wavpack) + $(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg)) + ) + use qt5 && myeconfargs+=( $(usex opengl --enable-qtglspectrum --disable-qtglspectrum) ) + + econf "${myeconfargs[@]}" +} diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild deleted file mode 100644 index 968cfc473386..000000000000 --- a/media-plugins/audacious-plugins/audacious-plugins-3.10.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 1999-2018 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${P/_/-}" - -DESCRIPTION="Lightweight and versatile audio player" -HOMEPAGE="https://audacious-media-player.org/" - -if [[ ${PV} == *9999 ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git" -else - SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav - libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" -REQUIRED_USE=" - || ( alsa jack pulseaudio sdl ) - ampache? ( http )" - -# The following plugins REQUIRE a GUI build of audacious, because non-GUI -# builds do NOT install the libaudgui library & headers. -# Plugins without a configure option: -# alarm -# albumart -# delete-files -# ladspa -# playlist-manager -# search-tool -# skins -# vtx -# Plugins with a configure option: -# glspectrum -# gtkui -# hotkey -# notify -# statusicon -RDEPEND=" - app-arch/unzip - dev-libs/dbus-glib - dev-libs/glib - dev-libs/libxml2:2 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtwidgets:5 - media-libs/adplug - ~media-sound/audacious-${PV} - aac? ( >=media-libs/faad2-2.7 ) - alsa? ( >=media-libs/alsa-lib-1.0.16 ) - ampache? ( =media-libs/ampache_browser-1* ) - aosd? ( - x11-libs/libXrender - x11-libs/libXcomposite - ) - bs2b? ( media-libs/libbs2b ) - cdda? ( - >=media-libs/libcddb-1.2.1 - dev-libs/libcdio:= - dev-libs/libcdio-paranoia - ) - cue? ( media-libs/libcue ) - ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) - flac? ( - >=media-libs/libvorbis-1.0 - >=media-libs/flac-1.2.1-r1 - ) - fluidsynth? ( media-sound/fluidsynth ) - http? ( >=net-libs/neon-0.26.4 ) - jack? ( - >=media-libs/bio2jack-0.4 - virtual/jack - ) - lame? ( media-sound/lame ) - libsamplerate? ( media-libs/libsamplerate:= ) - lirc? ( app-misc/lirc ) - mms? ( >=media-libs/libmms-0.3 ) - modplug? ( media-libs/libmodplug ) - mp3? ( >=media-sound/mpg123-1.12.1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) - scrobbler? ( net-misc/curl ) - sdl? ( media-libs/libsdl2[sound] ) - sid? ( >=media-libs/libsidplayfp-1.0.0 ) - sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) - soxr? ( media-libs/soxr ) - speedpitch? ( media-libs/libsamplerate:= ) - vorbis? ( - >=media-libs/libvorbis-1.2.0 - >=media-libs/libogg-1.1.3 - ) - wavpack? ( >=media-sound/wavpack-4.50.1-r1 )" - -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - virtual/pkgconfig - nls? ( dev-util/intltool )" - -PATCHES=( "${FILESDIR}/${P}-fix-slow-search.patch" ) - -S="${WORKDIR}/${MY_P}" - -src_configure() { - if ! use mp3 ; then - ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag" - fi - - econf \ - --enable-mpris2 \ - --enable-qt \ - --enable-qtaudio \ - --enable-songchange \ - --disable-coreaudio \ - --disable-gtk \ - --disable-hotkey \ - --disable-notify \ - --disable-oss4 \ - --disable-qtglspectrum \ - --disable-sndio \ - $(use_enable aac) \ - $(use_enable alsa) \ - $(use_enable ampache) \ - $(use_enable aosd) \ - $(use_enable bs2b) \ - $(use_enable cdda cdaudio) \ - $(use_enable cue) \ - $(use_enable flac) \ - $(use_enable fluidsynth amidiplug) \ - $(use_enable flac filewriter) \ - $(use_enable gme console) \ - $(use_enable http neon) \ - $(use_enable jack) \ - $(use_enable lame filewriter_mp3) \ - $(use_enable libsamplerate resample) \ - $(use_enable lirc) \ - $(use_enable mms) \ - $(use_enable modplug) \ - $(use_enable mp3 mpg123) \ - $(use_enable nls) \ - $(use_enable pulseaudio pulse) \ - $(use_enable scrobbler scrobbler2) \ - $(use_enable sdl sdlout) \ - $(use_enable sid) \ - $(use_enable sndfile) \ - $(use_enable soxr) \ - $(use_enable speedpitch) \ - $(use_enable vorbis) \ - $(use_enable wavpack) \ - $(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg)) -} diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild deleted file mode 100644 index 21da7bb77a88..000000000000 --- a/media-plugins/audacious-plugins/audacious-plugins-3.9-r1.ebuild +++ /dev/null @@ -1,180 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -MY_P="${P/_/-}" - -DESCRIPTION="Audacious Player - Your music, your way, no exceptions" -HOMEPAGE="https://audacious-media-player.org/" - -if [[ ${PV} == *9999 ]]; then - inherit autotools git-r3 - EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git" -else - SRC_URI=" - !gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 ) - gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="0" -IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth gnome hotkeys http gme gtk gtk3 jack lame libav - libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" -REQUIRED_USE=" - ^^ ( gtk gtk3 qt5 ) - qt5? ( !libnotify ) - || ( alsa jack pulseaudio sdl ) - ampache? ( qt5 http )" - -# The following plugins REQUIRE a GUI build of audacious, because non-GUI -# builds do NOT install the libaudgui library & headers. -# Plugins without a configure option: -# alarm -# albumart -# delete-files -# ladspa -# playlist-manager -# search-tool -# skins -# vtx -# Plugins with a configure option: -# glspectrum -# gtkui -# hotkey -# notify -# statusicon -RDEPEND=" - app-arch/unzip - dev-libs/dbus-glib - dev-libs/glib - dev-libs/libxml2:2 - ~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?] - aac? ( >=media-libs/faad2-2.7 ) - alsa? ( >=media-libs/alsa-lib-1.0.16 ) - ampache? ( =media-libs/ampache_browser-1* ) - aosd? ( - x11-libs/libXrender - x11-libs/libXcomposite - ) - bs2b? ( media-libs/libbs2b ) - cdda? ( - >=media-libs/libcddb-1.2.1 - dev-libs/libcdio-paranoia - ) - cue? ( media-libs/libcue ) - ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) - flac? ( - >=media-libs/libvorbis-1.0 - >=media-libs/flac-1.2.1-r1 - ) - fluidsynth? ( media-sound/fluidsynth ) - http? ( >=net-libs/neon-0.26.4 ) - gtk? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtwidgets:5 - media-libs/adplug - ) - jack? ( - >=media-libs/bio2jack-0.4 - virtual/jack - ) - lame? ( media-sound/lame ) - libnotify? ( x11-libs/libnotify ) - libsamplerate? ( media-libs/libsamplerate:= ) - lirc? ( app-misc/lirc ) - mms? ( >=media-libs/libmms-0.3 ) - modplug? ( media-libs/libmodplug ) - mp3? ( >=media-sound/mpg123-1.12.1 ) - pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) - scrobbler? ( net-misc/curl ) - sdl? ( media-libs/libsdl2[sound] ) - sid? ( >=media-libs/libsidplayfp-1.0.0 ) - sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) - soxr? ( media-libs/soxr ) - speedpitch? ( media-libs/libsamplerate:= ) - vorbis? ( - >=media-libs/libvorbis-1.2.0 - >=media-libs/libogg-1.1.3 - ) - wavpack? ( >=media-sound/wavpack-4.50.1-r1 )" - -DEPEND="${RDEPEND} - dev-util/gdbus-codegen - virtual/pkgconfig - nls? ( dev-util/intltool )" - -S="${WORKDIR}/${MY_P}" - -PATCHES=( "${FILESDIR}/${P}-qt-5.10.patch" ) - -src_unpack() { - if [[ ${PV} == *9999 ]]; then - git-r3_src_unpack - else - default - if use gtk3; then - mv "${MY_P}"{-gtk3,} || die - fi - fi -} - -src_prepare() { - default - [[ ${PV} == *9999 ]] && eautoreconf -} - -src_configure() { - if ! use mp3 ; then - ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag" - fi - - econf \ - --enable-mpris2 \ - --enable-songchange \ - --disable-oss4 \ - --disable-qtaudio \ - --disable-qtglspectrum \ - --disable-coreaudio \ - --disable-sndio \ - $(use_enable aac) \ - $(use_enable alsa) \ - $(use_enable ampache) \ - $(use_enable aosd) \ - $(use_enable bs2b) \ - $(use_enable cdda cdaudio) \ - $(use_enable cue) \ - $(use_enable flac) \ - $(use_enable fluidsynth amidiplug) \ - $(use_enable flac filewriter) \ - $(use_enable gme console) \ - $(use_enable $(usex gtk gtk gtk3) gtk) \ - $(use_enable hotkeys hotkey) \ - $(use_enable http neon) \ - $(use_enable jack) \ - $(use_enable gnome gnomeshortcuts) \ - $(use_enable lame filewriter_mp3) \ - $(use_enable libnotify notify) \ - $(use_enable libsamplerate resample) \ - $(use_enable lirc) \ - $(use_enable mms) \ - $(use_enable modplug) \ - $(use_enable mp3 mpg123) \ - $(use_enable nls) \ - $(use_enable pulseaudio pulse) \ - $(use_enable qt5 qt) \ - $(use_enable scrobbler scrobbler2) \ - $(use_enable sdl sdlout) \ - $(use_enable sid) \ - $(use_enable sndfile) \ - $(use_enable soxr) \ - $(use_enable speedpitch) \ - $(use_enable vorbis) \ - $(use_enable wavpack) \ - $(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg)) -} diff --git a/media-plugins/audacious-plugins/audacious-plugins-3.9-r2.ebuild b/media-plugins/audacious-plugins/audacious-plugins-3.9-r2.ebuild new file mode 100644 index 000000000000..1c297c5c68ae --- /dev/null +++ b/media-plugins/audacious-plugins/audacious-plugins-3.9-r2.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2018 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="Lightweight and versatile audio player" +HOMEPAGE="https://audacious-media-player.org/" +SRC_URI="https://distfiles.audacious-media-player.org/${P}-gtk3.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="aac +alsa bs2b cdda cue ffmpeg flac fluidsynth gnome http gme jack lame libav libnotify libsamplerate + lirc mms modplug mp3 nls pulseaudio scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" +REQUIRED_USE="|| ( alsa jack pulseaudio sdl )" + +# The following plugins REQUIRE a GUI build of audacious, because non-GUI +# builds do NOT install the libaudgui library & headers. +# Plugins without a configure option: +# alarm +# albumart +# delete-files +# ladspa +# playlist-manager +# search-tool +# skins +# vtx +# Plugins with a configure option: +# glspectrum +# gtkui +# hotkey +# notify +# statusicon +RDEPEND=" + app-arch/unzip + dev-libs/dbus-glib + dev-libs/glib + dev-libs/libxml2:2 + media-libs/adplug + ~media-sound/audacious-${PV} + x11-libs/gtk+:3 + x11-libs/libXcomposite + x11-libs/libXrender + aac? ( >=media-libs/faad2-2.7 ) + alsa? ( >=media-libs/alsa-lib-1.0.16 ) + bs2b? ( media-libs/libbs2b ) + cdda? ( + dev-libs/libcdio:= + dev-libs/libcdio-paranoia + >=media-libs/libcddb-1.2.1 + ) + cue? ( media-libs/libcue ) + ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) + flac? ( + >=media-libs/flac-1.2.1-r1 + >=media-libs/libvorbis-1.0 + ) + fluidsynth? ( media-sound/fluidsynth ) + http? ( >=net-libs/neon-0.26.4 ) + jack? ( + >=media-libs/bio2jack-0.4 + virtual/jack + ) + lame? ( media-sound/lame ) + libnotify? ( x11-libs/libnotify ) + libsamplerate? ( media-libs/libsamplerate:= ) + lirc? ( app-misc/lirc ) + mms? ( >=media-libs/libmms-0.3 ) + modplug? ( media-libs/libmodplug ) + mp3? ( >=media-sound/mpg123-1.12.1 ) + pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) + scrobbler? ( net-misc/curl ) + sdl? ( media-libs/libsdl2[sound] ) + sid? ( >=media-libs/libsidplayfp-1.0.0 ) + sndfile? ( >=media-libs/libsndfile-1.0.17-r1 ) + soxr? ( media-libs/soxr ) + speedpitch? ( media-libs/libsamplerate:= ) + vorbis? ( + >=media-libs/libogg-1.1.3 + >=media-libs/libvorbis-1.2.0 + ) + wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) +" +DEPEND="${RDEPEND} + dev-util/gdbus-codegen + virtual/pkgconfig + nls? ( dev-util/intltool ) +" + +S="${WORKDIR}/${P}-gtk3" + +src_prepare() { + default + if ! use nls; then + sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698 + fi +} + +src_configure() { + use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag" + + local myeconfargs=( + --enable-aosd + --enable-gtk + --enable-hotkey + --enable-mpris2 + --enable-songchange + --disable-ampache + --disable-oss4 + --disable-qt + --disable-qtaudio + --disable-qtglspectrum + --disable-coreaudio + --disable-sndio + $(use_enable aac) + $(use_enable alsa) + $(use_enable bs2b) + $(use_enable cdda cdaudio) + $(use_enable cue) + $(use_enable flac) + $(use_enable flac filewriter) + $(use_enable fluidsynth amidiplug) + $(use_enable gme console) + $(use_enable http neon) + $(use_enable jack) + $(use_enable gnome gnomeshortcuts) + $(use_enable lame filewriter_mp3) + $(use_enable libnotify notify) + $(use_enable libsamplerate resample) + $(use_enable lirc) + $(use_enable mms) + $(use_enable modplug) + $(use_enable mp3 mpg123) + $(use_enable nls) + $(use_enable pulseaudio pulse) + $(use_enable scrobbler scrobbler2) + $(use_enable sdl sdlout) + $(use_enable sid) + $(use_enable sndfile) + $(use_enable soxr) + $(use_enable speedpitch) + $(use_enable vorbis) + $(use_enable wavpack) + $(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg)) + ) + econf "${myeconfargs[@]}" +} diff --git a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild index 2481a86bccb4..d3d11e6d7792 100644 --- a/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild +++ b/media-plugins/audacious-plugins/audacious-plugins-9999.ebuild @@ -5,28 +5,23 @@ EAPI=6 MY_P="${P/_/-}" -DESCRIPTION="Lightweight and versatile audio player" -HOMEPAGE="https://audacious-media-player.org/" - if [[ ${PV} == *9999 ]]; then inherit autotools git-r3 EGIT_REPO_URI="https://github.com/audacious-media-player/audacious-plugins.git" else - SRC_URI=" - !gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2 ) - gtk3? ( https://distfiles.audacious-media-player.org/${MY_P}-gtk3.tar.bz2 )" + SRC_URI="https://distfiles.audacious-media-player.org/${MY_P}.tar.bz2" KEYWORDS="~amd64 ~x86" fi +DESCRIPTION="Lightweight and versatile audio player" +HOMEPAGE="https://audacious-media-player.org/" LICENSE="GPL-2" SLOT="0" -IUSE="aac +adplug alsa ampache aosd bs2b cdda cue ffmpeg flac fluidsynth hotkeys http gme gtk gtk3 jack lame libav - libnotify libsamplerate lirc mms modplug mp3 nls pulseaudio qt5 scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" +IUSE="aac adplug +alsa ampache bs2b cdda cue ffmpeg flac fluidsynth http gme jack lame libav libnotify libsamplerate + lirc mms modplug mp3 nls opengl pulseaudio qt5 qtmedia scrobbler sdl sid sndfile soxr speedpitch vorbis wavpack" REQUIRED_USE=" - ^^ ( gtk gtk3 qt5 ) - qt5? ( !hotkeys !libnotify ) - || ( alsa jack pulseaudio sdl ) - ampache? ( qt5 http )" + || ( alsa jack pulseaudio qtmedia sdl ) + ampache? ( qt5 http ) qtmedia? ( qt5 )" # The following plugins REQUIRE a GUI build of audacious, because non-GUI # builds do NOT install the libaudgui library & headers. @@ -50,37 +45,25 @@ RDEPEND=" dev-libs/dbus-glib dev-libs/glib dev-libs/libxml2:2 - ~media-sound/audacious-${PV}[gtk?,gtk3?,qt5?] + ~media-sound/audacious-${PV}[qt5=] aac? ( >=media-libs/faad2-2.7 ) + adplug? ( media-libs/adplug ) alsa? ( >=media-libs/alsa-lib-1.0.16 ) ampache? ( =media-libs/ampache_browser-1* ) - aosd? ( - x11-libs/libXrender - x11-libs/libXcomposite - ) bs2b? ( media-libs/libbs2b ) cdda? ( - >=media-libs/libcddb-1.2.1 dev-libs/libcdio:= dev-libs/libcdio-paranoia + >=media-libs/libcddb-1.2.1 ) cue? ( media-libs/libcue ) ffmpeg? ( >=virtual/ffmpeg-0.7.3 ) flac? ( - >=media-libs/libvorbis-1.0 >=media-libs/flac-1.2.1-r1 + >=media-libs/libvorbis-1.0 ) fluidsynth? ( media-sound/fluidsynth ) http? ( >=net-libs/neon-0.26.4 ) - gtk? ( x11-libs/gtk+:2 ) - gtk3? ( x11-libs/gtk+:3 ) - qt5? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtmultimedia:5 - dev-qt/qtwidgets:5 - media-libs/adplug - ) jack? ( >=media-libs/bio2jack-0.4 virtual/jack @@ -93,6 +76,18 @@ RDEPEND=" modplug? ( media-libs/libmodplug ) mp3? ( >=media-sound/mpg123-1.12.1 ) pulseaudio? ( >=media-sound/pulseaudio-0.9.3 ) + !qt5? ( + x11-libs/gtk+:2 + x11-libs/libXcomposite + x11-libs/libXrender + ) + qt5? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + opengl? ( dev-qt/qtopengl:5 ) + ) + qtmedia? ( dev-qt/qtmultimedia:5 ) scrobbler? ( net-misc/curl ) sdl? ( media-libs/libsdl2[sound] ) sid? ( >=media-libs/libsidplayfp-1.0.0 ) @@ -100,79 +95,74 @@ RDEPEND=" soxr? ( media-libs/soxr ) speedpitch? ( media-libs/libsamplerate:= ) vorbis? ( - >=media-libs/libvorbis-1.2.0 >=media-libs/libogg-1.1.3 + >=media-libs/libvorbis-1.2.0 ) - wavpack? ( >=media-sound/wavpack-4.50.1-r1 )" - + wavpack? ( >=media-sound/wavpack-4.50.1-r1 ) +" DEPEND="${RDEPEND} dev-util/gdbus-codegen virtual/pkgconfig - nls? ( dev-util/intltool )" + nls? ( dev-util/intltool ) +" S="${WORKDIR}/${MY_P}" -src_unpack() { - if [[ ${PV} == *9999 ]]; then - git-r3_src_unpack - else - default - if use gtk3; then - mv "${MY_P}"{-gtk3,} || die - fi - fi -} - src_prepare() { default + if ! use nls; then + sed -e "/SUBDIRS/s/ po//" -i Makefile || die # bug #512698 + fi [[ ${PV} == *9999 ]] && eautoreconf } src_configure() { - if ! use mp3 ; then - ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag" - fi + use mp3 || ewarn "MP3 support is optional, you may want to enable the mp3 USE-flag" - econf \ - --enable-mpris2 \ - --enable-songchange \ - --disable-oss4 \ - --disable-qtglspectrum \ - --disable-coreaudio \ - --disable-sndio \ - $(use_enable aac) \ - $(use_enable alsa) \ - $(use_enable ampache) \ - $(use_enable aosd) \ - $(use_enable bs2b) \ - $(use_enable cdda cdaudio) \ - $(use_enable cue) \ - $(use_enable flac) \ - $(use_enable fluidsynth amidiplug) \ - $(use_enable flac filewriter) \ - $(use_enable gme console) \ - $(use_enable $(usex gtk gtk gtk3) gtk) \ - $(use_enable hotkeys hotkey) \ - $(use_enable http neon) \ - $(use_enable jack) \ - $(use_enable lame filewriter_mp3) \ - $(use_enable libnotify notify) \ - $(use_enable libsamplerate resample) \ - $(use_enable lirc) \ - $(use_enable mms) \ - $(use_enable modplug) \ - $(use_enable mp3 mpg123) \ - $(use_enable nls) \ - $(use_enable pulseaudio pulse) \ - $(use_enable qt5 qt) \ - $(use_enable qt5 qtaudio) \ - $(use_enable scrobbler scrobbler2) \ - $(use_enable sdl sdlout) \ - $(use_enable sid) \ - $(use_enable sndfile) \ - $(use_enable soxr) \ - $(use_enable speedpitch) \ - $(use_enable vorbis) \ - $(use_enable wavpack) \ + local myeconfargs=( + --enable-mpris2 + --enable-songchange + --disable-oss4 + --disable-coreaudio + --disable-sndio + $(use_enable aac) + $(use_enable adplug) + $(use_enable alsa) + $(use_enable ampache) + $(use_enable bs2b) + $(use_enable cdda cdaudio) + $(use_enable cue) + $(use_enable flac) + $(use_enable flac filewriter) + $(use_enable fluidsynth amidiplug) + $(use_enable gme console) + $(use_enable http neon) + $(use_enable jack) + $(use_enable lame filewriter_mp3) + $(use_enable libnotify notify) + $(use_enable libsamplerate resample) + $(use_enable lirc) + $(use_enable mms) + $(use_enable modplug) + $(use_enable mp3 mpg123) + $(use_enable nls) + $(use_enable pulseaudio pulse) + $(use_enable !qt5 aosd) + $(use_enable !qt5 gtk) + $(use_enable !qt5 hotkey) + $(use_enable qt5 qt) + $(use_enable qtmedia qtaudio) + $(use_enable scrobbler scrobbler2) + $(use_enable sdl sdlout) + $(use_enable sid) + $(use_enable sndfile) + $(use_enable soxr) + $(use_enable speedpitch) + $(use_enable vorbis) + $(use_enable wavpack) $(use_with ffmpeg ffmpeg $(usex libav libav ffmpeg)) + ) + use qt5 && myeconfargs+=( $(usex opengl --enable-qtglspectrum --disable-qtglspectrum) ) + + econf "${myeconfargs[@]}" } diff --git a/media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch b/media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch deleted file mode 100644 index 64122bf91980..000000000000 --- a/media-plugins/audacious-plugins/files/audacious-plugins-3.9-qt-5.10.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 971f7ff7c3d8a0b9b420bf4fd19ab97755607637 Mon Sep 17 00:00:00 2001 -From: ilovezfs -Date: Mon, 11 Dec 2017 00:17:26 -0800 -Subject: [PATCH] qtui: fix build with Qt 5.10 - -Fixes "info_bar.cc:258:21: error: no viable overloaded '='" ---- - src/qtui/info_bar.cc | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/qtui/info_bar.cc b/src/qtui/info_bar.cc -index 2789f93c5..eb29ef78e 100644 ---- a/src/qtui/info_bar.cc -+++ b/src/qtui/info_bar.cc -@@ -257,8 +257,8 @@ void InfoBar::paintEvent (QPaintEvent *) - if (d.title.text ().isNull () && ! d.orig_title.isNull ()) - { - QFontMetrics metrics = p.fontMetrics (); -- d.title = metrics.elidedText (d.orig_title, Qt::ElideRight, -- width () - ps.VisWidth - ps.Height - ps.Spacing); -+ d.title = QStaticText(metrics.elidedText (d.orig_title, Qt::ElideRight, -+ width () - ps.VisWidth - ps.Height - ps.Spacing)); - } - - p.setPen (QColor (255, 255, 255)); - diff --git a/media-plugins/audacious-plugins/metadata.xml b/media-plugins/audacious-plugins/metadata.xml index 4fc91fc80a76..cdc6bec65c66 100644 --- a/media-plugins/audacious-plugins/metadata.xml +++ b/media-plugins/audacious-plugins/metadata.xml @@ -12,14 +12,13 @@ Build with AdPlug (Adlib sound card emulation) support Support controlling audacious via www-apps/ampache - Enable support for Audacious OSD Enable Bauer Bauer stereophonic-to-binaural headphone filter Support CUE sheets using the libcue library Support FluidSynth as MIDI synth backend Support various gaming console music formats - Link against version 3 of the GIMP Toolkit instead of version 2 (x11-libs/gtk+) - Enable support for controlling via hotkeys Support HTTP streams through neon + Build with Qt5 interface instead Gtk+ + Enable playback via dev-qt/qtmultimedia Build with scrobbler/LastFM submission support Build with SID (Commodore 64 Audio) support Build with SoX Resampler support -- cgit v1.2.3