diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2017-12-20 11:17:21 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2017-12-20 11:17:21 +0000 |
commit | 48bdeb0db9c7ffed22c6eb859ee40b55ba598b86 (patch) | |
tree | f88035a58c20099cf45a576fb53b0330a4754f14 /media-sound | |
parent | 0fb71e0215ed52863e462cccef73c01aff44d43d (diff) |
gentoo resync : 20.12.2017
Diffstat (limited to 'media-sound')
-rw-r--r-- | media-sound/Manifest.gz | bin | 63388 -> 63387 bytes | |||
-rw-r--r-- | media-sound/clementine/Manifest | 9 | ||||
-rw-r--r-- | media-sound/clementine/clementine-1.3.1-r5.ebuild | 174 | ||||
-rw-r--r-- | media-sound/clementine/clementine-1.3.1_p20171113.ebuild | 18 | ||||
-rw-r--r-- | media-sound/clementine/files/clementine-1.3.1-chromaprint14.patch | 41 | ||||
-rw-r--r-- | media-sound/clementine/files/clementine-1.3.1-fix-desktop-file.patch | 52 | ||||
-rw-r--r-- | media-sound/clementine/files/clementine-1.3.1-libechonest_removal.patch | 701 | ||||
-rw-r--r-- | media-sound/clementine/metadata.xml | 2 | ||||
-rw-r--r-- | media-sound/mumble/Manifest | 2 | ||||
-rw-r--r-- | media-sound/mumble/mumble-1.2.19.ebuild | 2 | ||||
-rw-r--r-- | media-sound/pulseaudio/Manifest | 2 | ||||
-rw-r--r-- | media-sound/pulseaudio/pulseaudio-11.1.ebuild | 2 |
12 files changed, 18 insertions, 987 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz Binary files differindex 757abff58b6f..d2772621fd56 100644 --- a/media-sound/Manifest.gz +++ b/media-sound/Manifest.gz diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest index 76110c48fcc8..fb1b27326136 100644 --- a/media-sound/clementine/Manifest +++ b/media-sound/clementine/Manifest @@ -1,11 +1,6 @@ AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db134710f5aaf62c4e8105ab1b8ab0e69a0953b6177fb91dd89fcdcf5493dfc1e634f51658eea9f050689aa1e219dbd8db189 SHA512 4f520dcd4937634ebf5bb814ec64267d42473886fc5abd4924ac551bbae8ecc7643ddbacd9e2f9a5b0d8c7b0f67cf5aec420b5eb73162b248cbf6b3eafafbbd8 -AUX clementine-1.3.1-chromaprint14.patch 1535 BLAKE2B 8253b27b759f8675d2d2368cc9ac4b220ae93770f7c09c5b290a3d29c1c58cba0ea8f32db061afbc902d5276238b141ef13c16b8fb8e379bca53a02bd115cb6c SHA512 21ceda98534e4fe7f860d869cf83387e6c2a5c4c1a0db75c29dc8c9de18a3a117cebcfb98ea816723370009dc08e1804ec2b46c118e657eb293fb45d1fba2601 -AUX clementine-1.3.1-fix-desktop-file.patch 1488 BLAKE2B 45bd063f49868988bf5b37fbd3dd12f10f265e5f2309f68fa8a3ae8d3d903dddcbbf13755160c1da36db0cde105bb6ea3c441da89b67b79cc510449a8bdea9fa SHA512 55a787a63da9b1b4970e794d95233b22d704ff591e32cfc6c9b73023289e58a4cce2f2a43ec8186beb2feffe44b3cffa6b50f015a41cab5bba559087a868e826 -AUX clementine-1.3.1-libechonest_removal.patch 23130 BLAKE2B 245fc8d2747bd3e3d65a8141e298e1e518b3857581297dcc35ef64bd38c43b11743be6f7fadbe1a01cab90d077f97dd9b16f50acab195ee06de65548083bcf05 SHA512 44f28096567d48446fdd5769d91e32d3987f121e04f8f8fec956892c3a42693863cd5c9ab878e88c0477353fd369a005047c04e5da4661c701ab85103893947a AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a -DIST clementine-1.3.1.tar.gz 8501827 BLAKE2B ebb003f28f9a4dd8fff4e5a92aeb1b6c948be794731c202241b8cb91f4678d6b2d035d6c9cd0d6e7b4b7d9a494d3c1c5bb5e88243e7a34e565c07c34d048ebdd SHA512 1942a046be24a583b5e2095dd39dc736c1b14a47dc4aad61d6252c1fccf745c26d7b35da907a220d5dc8c0736f5b589d050ed9582de343aa3cb5abc607001790 DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674 -EBUILD clementine-1.3.1-r5.ebuild 4962 BLAKE2B 061ffdab9f81560d33ba90271056824999d17b3219f3cd4fbea6e4cfa08435045172f3bd4f10bce3a98d4b89c647ee66fb63209fed2826d914494d45231603a6 SHA512 f1815b573a1e921d257a7f64579bb42f7cdf1e6d67075d4b490c71c4fe508c579ba3aedbd7a4e54df96dcdcdcf5e2e4de87067cf56433574ae7ba19e21d0785c -EBUILD clementine-1.3.1_p20171113.ebuild 4798 BLAKE2B dc4b86304c368b73f845645e050a944ba2d71915939784a41b36ae0ff0bd762a60ba71383d202fd46c62316f311a5c479b5c1f232ba9d8666b9d4311ce59abeb SHA512 4157bdd624dcf2e610af240051865aa88f4128730eeb62e5e725ce10022bc9c1f85978fe631ccffc2a4ae9706b23646f8b4de93d73c22ebc3e2f299f3d0a839f +EBUILD clementine-1.3.1_p20171113.ebuild 4947 BLAKE2B 14dbc1ddea527ce441fb7bf1c4c17d32f4977495cc879606a29aa2e2843be4e1e686efb5ffe39a0a165562897da1ef45500edf3d07b8c8e70e99a5bc776ac6b6 SHA512 9e5ebe21635216eabe086dc5872902bbbbba6360b69fb7d1e967f2883a6bedf9d7989d576af94eee65a11ed1a0fd8df2a9891138d42e92899be409f514ee3b2d EBUILD clementine-9999.ebuild 5193 BLAKE2B aad0efc0d126ff29ccf3211db65be57bcba02fa24d8b4c682ad95e6001d9aea33ca12e47e52d66a7cdb627930545cb72f35416b50c7110aeb66c8843da721119 SHA512 6ec8c6e0a28f53326752500fbd4a1e247127d0ac720df94e93c15868ee5a7ce25e51651a58126b8acb57bb0b6c3150c0d38be202644648dae9d054c49bfe881b -MISC metadata.xml 1537 BLAKE2B e63db763bbd9c013dd426a710bfb042335faf01f5cc8b3321a4e698e41313ba6994c059502e3f2113eaa3216d519c9f1a0b5a7467cecb27da94cd59d21bbe453 SHA512 cf5beb80417c4099a43e7f19bb06112159af557f17ce9c0da1226f5ee41cebc8e94c2c2aa6349d140ee291608d39511477a0aa54e586d11a52bc3f697283da3f +MISC metadata.xml 1415 BLAKE2B 9bdad36fc6b032413a003f93cb53ccc439d6dc437d8ab6b7da03ea148a550eafe5ec6910c984e90abf39bd4a427567a7e5de98fea8a36ed54452fc822ef28dda SHA512 02122e10260ba62b72ea2a5de32eb45fb1578cfb20f67294467ff2fcc1ac78f917dc415cf0c5dd587c509c5e05420a07c7c75379eb88fd97f03b962c77fd2213 diff --git a/media-sound/clementine/clementine-1.3.1-r5.ebuild b/media-sound/clementine/clementine-1.3.1-r5.ebuild deleted file mode 100644 index 88c6a2096dc2..000000000000 --- a/media-sound/clementine/clementine-1.3.1-r5.ebuild +++ /dev/null @@ -1,174 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" - -LANGS=" af ar be bg bn br bs ca cs cy da de el en_CA en_GB eo es et eu fa fi fr ga gl he he_IL hi hr hu hy ia id is it ja ka kk ko lt lv mr ms my nb nl oc pa pl pt pt_BR ro ru si_LK sk sl sr sr@latin sv te tr tr_TR uk uz vi zh_CN zh_TW" - -inherit cmake-utils flag-o-matic xdg-utils gnome2-utils virtualx -[[ ${PV} == *9999* ]] && inherit git-r3 - -DESCRIPTION="Modern music player and library organizer based on Amarok 1.4 and Qt" -HOMEPAGE="https://www.clementine-player.org https://github.com/clementine-player/Clementine" -[[ ${PV} == *9999* ]] || \ -SRC_URI="https://github.com/clementine-player/Clementine/archive/${PV/_}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -[[ ${PV} == *9999* ]] || \ -KEYWORDS="amd64 x86" -IUSE="amazoncloud box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio skydrive test +udisks vkontakte wiimote" -IUSE+="${LANGS// / linguas_}" - -REQUIRED_USE=" - udisks? ( dbus ) - wiimote? ( dbus ) -" - -COMMON_DEPEND=" - dev-db/sqlite:= - >=dev-libs/glib-2.24.1-r1 - dev-libs/libxml2 - dev-libs/protobuf:= - dev-libs/qjson - >=dev-qt/qtcore-4.5:4[ssl] - >=dev-qt/qtgui-4.5:4 - >=dev-qt/qtopengl-4.5:4 - >=dev-qt/qtsql-4.5:4 - >=media-libs/chromaprint-0.6 - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - >=media-libs/libmygpo-qt-1.0.9[qt4(+)] - >=media-libs/taglib-1.8[mp4(+)] - sys-libs/zlib - dev-libs/crypto++ - virtual/glu - virtual/opengl - x11-libs/libX11 - cdda? ( dev-libs/libcdio ) - dbus? ( >=dev-qt/qtdbus-4.5:4 ) - ipod? ( >=media-libs/libgpod-0.8.0 ) - lastfm? ( >=media-libs/liblastfm-1[qt4(+)] ) - mtp? ( >=media-libs/libmtp-1.0.0 ) - moodbar? ( sci-libs/fftw:3.0 ) - projectm? ( media-libs/glew:= - >=media-libs/libprojectm-1.2.0 ) -" -# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway; -# Libprojectm-1.2 seams to work fine, so no reasons to use bundled version; check the clementine's patches: -# https://github.com/clementine-player/Clementine/tree/master/3rdparty/libprojectm/patches -# Still possibly essential but not applied yet patches are: -# 06-fix-numeric-locale.patch -# 08-stdlib.h-for-rand.patch -RDEPEND="${COMMON_DEPEND} - dbus? ( udisks? ( sys-fs/udisks:0 ) ) - mms? ( media-plugins/gst-plugins-libmms:1.0 ) - mtp? ( gnome-base/gvfs[mtp] ) - media-plugins/gst-plugins-meta:1.0 - media-plugins/gst-plugins-soup:1.0 - media-plugins/gst-plugins-taglib:1.0 -" -DEPEND="${COMMON_DEPEND} - >=dev-libs/boost-1.39:= - virtual/pkgconfig - sys-devel/gettext - dev-qt/qttest:4 - || ( - >=dev-cpp/gtest-1.8.0 - dev-cpp/gmock - ) - amazoncloud? ( dev-cpp/sparsehash ) - box? ( dev-cpp/sparsehash ) - dropbox? ( dev-cpp/sparsehash ) - googledrive? ( dev-cpp/sparsehash ) - pulseaudio? ( media-sound/pulseaudio ) - skydrive? ( dev-cpp/sparsehash ) - test? ( gnome-base/gsettings-desktop-schemas ) -" -DOCS=( Changelog README.md ) - -MY_P="${P/_}" -[[ ${PV} == *9999* ]] || \ -S="${WORKDIR}/${MY_P^}" - -PATCHES=( - "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch - "${FILESDIR}"/${P}-fix-desktop-file.patch - "${FILESDIR}"/${P}-chromaprint14.patch #603662 - "${FILESDIR}"/${P}-libechonest_removal.patch -) - -src_prepare() { - cmake-utils_src_prepare - - # some tests fail or hang - sed -i \ - -e '/add_test_file(translations_test.cpp/d' \ - tests/CMakeLists.txt || die -} - -src_configure() { - local langs x - for x in ${LANGS}; do - use linguas_${x} && langs+=" ${x}" - done - - # spotify is not in portage - local mycmakeargs=( - -DBUILD_WERROR=OFF - -DLINGUAS="${langs}" - -DENABLE_AMAZON_CLOUD_DRIVE="$(usex amazoncloud)" - -DENABLE_AUDIOCD="$(usex cdda)" - -DENABLE_DBUS="$(usex dbus)" - -DENABLE_DEVICEKIT="$(usex udisks)" - -DENABLE_LIBGPOD="$(usex ipod)" - -DENABLE_LIBLASTFM="$(usex lastfm)" - -DENABLE_LIBMTP="$(usex mtp)" - -DENABLE_MOODBAR="$(usex moodbar)" - -DENABLE_GIO=ON - -DENABLE_WIIMOTEDEV="$(usex wiimote)" - -DENABLE_VISUALISATIONS="$(usex projectm)" - -DENABLE_BOX="$(usex box)" - -DENABLE_DROPBOX="$(usex dropbox)" - -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" - -DENABLE_LIBPULSE="$(usex pulseaudio)" - -DENABLE_SKYDRIVE="$(usex skydrive)" - -DENABLE_VK="$(usex vkontakte)" - -DENABLE_SPOTIFY_BLOB=OFF - -DENABLE_BREAKPAD=OFF #< disable crash reporting - -DUSE_BUILTIN_TAGLIB=OFF - -DUSE_SYSTEM_GMOCK=ON - -DUSE_SYSTEM_PROJECTM=ON - -DBUNDLE_PROJECTM_PRESETS=OFF - # force to find crypto++ see bug #548544 - -DCRYPTOPP_LIBRARIES="crypto++" - -DCRYPTOPP_FOUND=ON - # avoid automagically enabling of ccache (bug #611010) - -DCCACHE_EXECUTABLE=OFF - ) - - use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT - - cmake-utils_src_configure -} - -src_test() { - cd "${CMAKE_BUILD_DIR}" || die - virtx emake test -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - xdg_desktop_database_update - gnome2_icon_cache_update -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild index 8522d19cb629..21eb4cf1fb61 100644 --- a/media-sound/clementine/clementine-1.3.1_p20171113.ebuild +++ b/media-sound/clementine/clementine-1.3.1_p20171113.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P} LICENSE="GPL-3" SLOT="0" -KEYWORDS="~amd64 x86" +KEYWORDS="amd64 x86" IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" REQUIRED_USE=" @@ -74,8 +74,7 @@ DEPEND="${COMMON_DEPEND} >=dev-cpp/gtest-1.8.0 dev-cpp/gmock ) - dev-libs/boost:= - dev-qt/qttest:4 + dev-libs/boost sys-devel/gettext virtual/pkgconfig box? ( dev-cpp/sparsehash ) @@ -84,8 +83,12 @@ DEPEND="${COMMON_DEPEND} pulseaudio? ( media-sound/pulseaudio ) seafile? ( dev-cpp/sparsehash ) skydrive? ( dev-cpp/sparsehash ) - test? ( gnome-base/gsettings-desktop-schemas ) + test? ( + dev-qt/qttest:4 + gnome-base/gsettings-desktop-schemas + ) " + DOCS=( Changelog README.md ) PATCHES=( "${FILESDIR}"/${PN}-1.3-fix-tokenizer.patch ) @@ -98,6 +101,9 @@ src_prepare() { sed -i \ -e '/add_test_file(translations_test.cpp/d' \ tests/CMakeLists.txt || die + + use test || cmake_comment_add_subdirectory tests + rm -r 3rdparty/{gmock,google-breakpad,libprojectm,taglib} || die } src_configure() { @@ -114,10 +120,9 @@ src_configure() { -DENABLE_GIO=ON -DENABLE_SPOTIFY_BLOB=OFF -DUSE_BUILTIN_TAGLIB=OFF - -DUSE_SYSTEM_GMOCK=ON -DUSE_SYSTEM_PROJECTM=ON -DBUNDLE_PROJECTM_PRESETS=OFF - -DLINGUAS=$(l10n_get_locales) + -DLINGUAS="$(l10n_get_locales)" -DENABLE_BOX="$(usex box)" -DENABLE_AUDIOCD="$(usex cdda)" -DENABLE_DBUS="$(usex dbus)" @@ -136,6 +141,7 @@ src_configure() { ) use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT + use test && mycmakeargs+=( -DUSE_SYSTEM_GMOCK=ON ) cmake-utils_src_configure } diff --git a/media-sound/clementine/files/clementine-1.3.1-chromaprint14.patch b/media-sound/clementine/files/clementine-1.3.1-chromaprint14.patch deleted file mode 100644 index bfdc49265aa3..000000000000 --- a/media-sound/clementine/files/clementine-1.3.1-chromaprint14.patch +++ /dev/null @@ -1,41 +0,0 @@ -From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001 -From: Chocobozzz <florian.bigard@gmail.com> -Date: Thu, 8 Dec 2016 23:12:17 +0100 -Subject: [PATCH] Add compatibility with chromaprint >= 1.4 - ---- - src/musicbrainz/chromaprinter.cpp | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp -index 9579b62..c7ad99e 100644 ---- a/src/musicbrainz/chromaprinter.cpp -+++ b/src/musicbrainz/chromaprinter.cpp -@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() { - ChromaprintContext* chromaprint = - chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT); - chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels); -- chromaprint_feed(chromaprint, reinterpret_cast<void*>(data.data()), -+ chromaprint_feed(chromaprint, reinterpret_cast<int16_t *>(data.data()), - data.size() / 2); - chromaprint_finish(chromaprint); - -- void* fprint = nullptr; - int size = 0; -+ -+#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4 -+ u_int32_t *fprint = nullptr; -+ char *encoded = nullptr; -+#else -+ void *fprint = nullptr; -+ void *encoded = nullptr; -+#endif -+ - int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size); -+ - QByteArray fingerprint; - if (ret == 1) { -- void* encoded = nullptr; - int encoded_size = 0; - chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT, - &encoded, &encoded_size, 1); diff --git a/media-sound/clementine/files/clementine-1.3.1-fix-desktop-file.patch b/media-sound/clementine/files/clementine-1.3.1-fix-desktop-file.patch deleted file mode 100644 index bb561318c59d..000000000000 --- a/media-sound/clementine/files/clementine-1.3.1-fix-desktop-file.patch +++ /dev/null @@ -1,52 +0,0 @@ -This patch fixes gentoo QA notices against the desktop file (see gentoo bug 460412#3) -Based upon patch extracted from upstream git; original patch info: -commit 04f73d125365d97fa6f72677ec5d220292690e56 -Author: Golubev Alexander <fatzer2@gmail.com> -Date: Mon Jul 18 13:45:03 2016 +0400 - - Remove OnlyShowIn=Unity from clementine.desktop's action sections (#5444) - -diff --git a/dist/clementine.desktop b/dist/clementine.desktop -index 2fb9559..9ee881e 100644 ---- a/dist/clementine.desktop -+++ b/dist/clementine.desktop -@@ -38,7 +38,6 @@ Actions=Play;Pause;Stop;Previous;Next; - [Desktop Action Play] - Name=Play - Exec=clementine --play --OnlyShowIn=Unity; - Name[af]=Speel - Name[be]=Прайграць - Name[bg]=Възпроизвеждане -@@ -89,7 +88,6 @@ Name[zh_TW]=播放 - [Desktop Action Pause] - Name=Pause - Exec=clementine --pause --OnlyShowIn=Unity; - Name[be]=Прыпыніць - Name[bg]=Пауза - Name[br]=Ehan -@@ -135,7 +133,6 @@ Name[zh_TW]=暫停 - [Desktop Action Stop] - Name=Stop - Exec=clementine --stop --OnlyShowIn=Unity; - Name[be]=Спыніць - Name[bg]=Спиране - Name[br]=Paouez -@@ -184,7 +181,6 @@ Name[zh_TW]=停止 - [Desktop Action Previous] - Name=Previous - Exec=clementine --previous --OnlyShowIn=Unity; - Name[af]=Vorige - Name[be]=Папярэдні - Name[bg]=Предишна -@@ -232,7 +228,6 @@ Name[zh_TW]=往前 - [Desktop Action Next] - Name=Next - Exec=clementine --next --OnlyShowIn=Unity; - Name[af]=Volgende - Name[be]=Далей - Name[bg]=Следваща diff --git a/media-sound/clementine/files/clementine-1.3.1-libechonest_removal.patch b/media-sound/clementine/files/clementine-1.3.1-libechonest_removal.patch deleted file mode 100644 index 63eb096d84d0..000000000000 --- a/media-sound/clementine/files/clementine-1.3.1-libechonest_removal.patch +++ /dev/null @@ -1,701 +0,0 @@ -Remove depend upon media-libs/libechonest and its support from clementine due to echonest service -was shutdown and this functionality is useless now and results in nothing but a slight security -and privacy risk. -See Gentoo bug #573712. -Based upon patch extracted from upstream git; original patch info: -commit a8a0f2e4fdd3d4b2fd23b8628a3abc27c290d01d -Author: John Maguire <john.maguire@gmail.com> -Date: Mon Jun 27 14:45:40 2016 +0100 - - Remove echonest and update songkick concert fetcher. ---- Clementine-1.3.1/CMakeLists.txt -+++ Clementine-1.3.1/CMakeLists.txt -@@ -365,9 +365,6 @@ - endif (NOT APPLE) - endif (USE_SYSTEM_QXT) - --find_path(ECHONEST_INCLUDE_DIRS echonest/echonest_export.h) --find_library(ECHONEST_LIBRARIES echonest) -- - # Use system gmock if it's available - # We need to look for both gmock and gtest - find_path(GMOCK_INCLUDE_DIRS gmock/gmock.h) ---- Clementine-1.3.1/src/CMakeLists.txt -+++ Clementine-1.3.1/src/CMakeLists.txt -@@ -35,7 +35,6 @@ - include_directories(${QTSINGLEAPPLICATION_INCLUDE_DIRS}) - include_directories(${QTIOCOMPRESSOR_INCLUDE_DIRS}) - include_directories(${QXT_INCLUDE_DIRS}) --include_directories(${ECHONEST_INCLUDE_DIRS}) - include_directories(${SHA2_INCLUDE_DIRS}) - include_directories(${CHROMAPRINT_INCLUDE_DIRS}) - include_directories(${MYGPOQT_INCLUDE_DIRS}) -@@ -297,8 +296,6 @@ - songinfo/artistinfoview.cpp - songinfo/collapsibleinfoheader.cpp - songinfo/collapsibleinfopane.cpp -- songinfo/echonestbiographies.cpp -- songinfo/echonestimages.cpp - songinfo/songinfobase.cpp - songinfo/songinfofetcher.cpp - songinfo/songinfoprovider.cpp -@@ -586,8 +583,6 @@ - songinfo/artistinfoview.h - songinfo/collapsibleinfoheader.h - songinfo/collapsibleinfopane.h -- songinfo/echonestbiographies.h -- songinfo/echonestimages.h - songinfo/songinfobase.h - songinfo/songinfofetcher.h - songinfo/songinfoprovider.h -@@ -822,16 +817,12 @@ - internet/lastfm/lastfmcompat.cpp - internet/lastfm/lastfmservice.cpp - internet/lastfm/lastfmsettingspage.cpp -- songinfo/echonestsimilarartists.cpp -- songinfo/echonesttags.cpp - songinfo/lastfmtrackinfoprovider.cpp - songinfo/tagwidget.cpp - HEADERS - covers/lastfmcoverprovider.h - internet/lastfm/lastfmservice.h - internet/lastfm/lastfmsettingspage.h -- songinfo/echonestsimilarartists.h -- songinfo/echonesttags.h - songinfo/lastfmtrackinfoprovider.h - songinfo/tagwidget.h - UI -@@ -1241,7 +1232,6 @@ - ${TAGLIB_LIBRARIES} - ${MYGPOQT_LIBRARIES} - ${CHROMAPRINT_LIBRARIES} -- ${ECHONEST_LIBRARIES} - ${GOBJECT_LIBRARIES} - ${GLIB_LIBRARIES} - ${GIO_LIBRARIES} ---- Clementine-1.3.1/src/main.cpp -+++ Clementine-1.3.1/src/main.cpp -@@ -76,8 +76,6 @@ - #include <glib.h> - #include <gst/gst.h> - --#include <echonest/Config.h> -- - #ifdef Q_OS_DARWIN - #include <sys/resource.h> - #include <sys/sysctl.h> -@@ -401,8 +399,8 @@ - // Add root CA cert for SoundCloud, whose certificate is missing on OS X. - QSslSocket::addDefaultCaCertificates( - QSslCertificate::fromPath(":/soundcloud-ca.pem", QSsl::Pem)); -- QSslSocket::addDefaultCaCertificates( -- QSslCertificate::fromPath(":/Equifax_Secure_Certificate_Authority.pem", QSsl::Pem)); -+ QSslSocket::addDefaultCaCertificates(QSslCertificate::fromPath( -+ ":/Equifax_Secure_Certificate_Authority.pem", QSsl::Pem)); - - // Has the user forced a different language? - QString override_language = options.language(); -@@ -440,10 +438,6 @@ - Application app; - app.set_language_name(language); - -- Echonest::Config::instance()->setAPIKey("DFLFLJBUF4EGTXHIG"); -- Echonest::Config::instance()->setNetworkAccessManager( -- new NetworkAccessManager); -- - // Network proxy - QNetworkProxyFactory::setApplicationProxyFactory( - NetworkProxyFactory::Instance()); ---- Clementine-1.3.1/src/songinfo/artistinfoview.cpp -+++ Clementine-1.3.1/src/songinfo/artistinfoview.cpp -@@ -16,25 +16,12 @@ - */ - - #include "artistinfoview.h" --#include "echonestbiographies.h" --#include "echonestimages.h" - #include "songinfofetcher.h" - #include "songkickconcerts.h" - #include "widgets/prettyimageview.h" - --#ifdef HAVE_LIBLASTFM --#include "echonestsimilarartists.h" --#include "echonesttags.h" --#endif -- - ArtistInfoView::ArtistInfoView(QWidget* parent) : SongInfoBase(parent) { -- fetcher_->AddProvider(new EchoNestBiographies); -- fetcher_->AddProvider(new EchoNestImages); - fetcher_->AddProvider(new SongkickConcerts); --#ifdef HAVE_LIBLASTFM -- fetcher_->AddProvider(new EchoNestSimilarArtists); -- fetcher_->AddProvider(new EchoNestTags); --#endif - } - - ArtistInfoView::~ArtistInfoView() {} ---- Clementine-1.3.1/src/songinfo/echonestbiographies.cpp -+++ Clementine-1.3.1/src/songinfo/echonestbiographies.cpp -@@ -1,123 +0,0 @@ --/* This file is part of Clementine. -- Copyright 2010, David Sansome <me@davidsansome.com> -- -- Clementine is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation, either version 3 of the License, or -- (at your option) any later version. -- -- Clementine is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with Clementine. If not, see <http://www.gnu.org/licenses/>. --*/ -- --#include "echonestbiographies.h" -- --#include <memory> -- --#include <echonest/Artist.h> -- --#include "songinfotextview.h" --#include "core/logging.h" --#include "ui/iconloader.h" -- --struct EchoNestBiographies::Request { -- Request(int id) : id_(id), artist_(new Echonest::Artist) {} -- -- int id_; -- std::unique_ptr<Echonest::Artist> artist_; --}; -- --EchoNestBiographies::EchoNestBiographies() { -- site_relevance_["wikipedia"] = 100; -- site_relevance_["lastfm"] = 60; -- site_relevance_["amazon"] = 30; -- -- site_icons_["amazon"] = IconLoader::Load("amazon", IconLoader::Provider); -- site_icons_["aol"] = IconLoader::Load("aol", IconLoader::Provider); -- site_icons_["cdbaby"] = IconLoader::Load("cdbaby", IconLoader::Provider); -- site_icons_["lastfm"] = IconLoader::Load("as", IconLoader::Lastfm); -- site_icons_["mog"] = IconLoader::Load("mog", IconLoader::Provider); -- site_icons_["mtvmusic"] = IconLoader::Load("mtvmusic", IconLoader::Provider); -- site_icons_["myspace"] = IconLoader::Load("myspace", IconLoader::Provider); -- site_icons_["wikipedia"] = IconLoader::Load("wikipedia", IconLoader::Provider); --} -- --void EchoNestBiographies::FetchInfo(int id, const Song& metadata) { -- std::shared_ptr<Request> request(new Request(id)); -- request->artist_->setName(metadata.artist()); -- -- QNetworkReply* reply = request->artist_->fetchBiographies(); -- connect(reply, SIGNAL(finished()), SLOT(RequestFinished())); -- requests_[reply] = request; --} -- --void EchoNestBiographies::RequestFinished() { -- QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender()); -- if (!reply || !requests_.contains(reply)) return; -- reply->deleteLater(); -- -- RequestPtr request = requests_.take(reply); -- -- try { -- request->artist_->parseProfile(reply); -- } -- catch (Echonest::ParseError e) { -- qLog(Warning) << "Error parsing echonest reply:" << e.errorType() -- << e.what(); -- } -- -- QSet<QString> already_seen; -- -- for (const Echonest::Biography& bio : request->artist_->biographies()) { -- QString canonical_site = bio.site().toLower(); -- canonical_site.replace(QRegExp("[^a-z]"), ""); -- -- if (already_seen.contains(canonical_site)) continue; -- already_seen.insert(canonical_site); -- -- CollapsibleInfoPane::Data data; -- data.id_ = "echonest/bio/" + bio.site(); -- data.title_ = tr("Biography from %1").arg(bio.site()); -- data.type_ = CollapsibleInfoPane::Data::Type_Biography; -- -- if (site_relevance_.contains(canonical_site)) -- data.relevance_ = site_relevance_[canonical_site]; -- if (site_icons_.contains(canonical_site)) -- data.icon_ = site_icons_[canonical_site]; -- -- SongInfoTextView* editor = new SongInfoTextView; -- QString text; -- // Add a link to the bio webpage at the top if we have one -- if (!bio.url().isEmpty()) { -- QString bio_url = bio.url().toEncoded(); -- if (bio.site() == "facebook") { -- bio_url.replace("graph.facebook.com", "www.facebook.com"); -- } -- text += "<p><a href=\"" + bio_url + "\">" + -- tr("Open in your browser") + "</a></p>"; -- } -- -- text += bio.text(); -- if (bio.site() == "last.fm") { -- // Echonest lost formatting and it seems there is currently no plans on -- // Echonest side for changing this. -- // But with last.fm, we can guess newlines: " " corresponds to a newline -- // (this seems to be because on last.fm' website, extra blank is inserted -- // before <br /> tag, and this blank is kept). -- // This is tricky, but this make the display nicer for last.fm -- // biographies. -- text.replace(" ", "<p>"); -- } -- editor->SetHtml(text); -- data.contents_ = editor; -- -- emit InfoReady(request->id_, data); -- } -- -- emit Finished(request->id_); --} ---- Clementine-1.3.1/src/songinfo/echonestbiographies.h -+++ Clementine-1.3.1/src/songinfo/echonestbiographies.h -@@ -1,48 +0,0 @@ --/* This file is part of Clementine. -- Copyright 2010, David Sansome <me@davidsansome.com> -- -- Clementine is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation, either version 3 of the License, or -- (at your option) any later version. -- -- Clementine is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with Clementine. If not, see <http://www.gnu.org/licenses/>. --*/ -- --#ifndef ECHONESTBIOGRAPHIES_H --#define ECHONESTBIOGRAPHIES_H -- --#include <memory> -- --#include "songinfoprovider.h" -- --class QNetworkReply; -- --class EchoNestBiographies : public SongInfoProvider { -- Q_OBJECT -- -- public: -- EchoNestBiographies(); -- -- void FetchInfo(int id, const Song& metadata); -- -- private slots: -- void RequestFinished(); -- -- private: -- QMap<QString, int> site_relevance_; -- QMap<QString, QIcon> site_icons_; -- -- struct Request; -- typedef std::shared_ptr<Request> RequestPtr; -- -- QMap<QNetworkReply*, RequestPtr> requests_; --}; -- --#endif // ECHONESTBIOGRAPHIES_H ---- Clementine-1.3.1/src/songinfo/echonestsimilarartists.cpp -+++ Clementine-1.3.1/src/songinfo/echonestsimilarartists.cpp -@@ -1,76 +0,0 @@ --/* This file is part of Clementine. -- Copyright 2010, David Sansome <me@davidsansome.com> -- -- Clementine is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation, either version 3 of the License, or -- (at your option) any later version. -- -- Clementine is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with Clementine. If not, see <http://www.gnu.org/licenses/>. --*/ -- --#include "echonestsimilarartists.h" --#include "tagwidget.h" --#include "core/logging.h" --#include "ui/iconloader.h" -- --#include <echonest/Artist.h> -- --Q_DECLARE_METATYPE(QVector<QString>); -- --void EchoNestSimilarArtists::FetchInfo(int id, const Song& metadata) { -- using Echonest::Artist; -- -- Artist::SearchParams params; -- params << Artist::SearchParamEntry(Artist::Name, metadata.artist()); -- params << Artist::SearchParamEntry(Artist::MinHotttnesss, 0.5); -- -- QNetworkReply* reply = Echonest::Artist::fetchSimilar(params); -- connect(reply, SIGNAL(finished()), SLOT(RequestFinished())); -- requests_[reply] = id; --} -- --void EchoNestSimilarArtists::RequestFinished() { -- QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender()); -- if (!reply || !requests_.contains(reply)) return; -- reply->deleteLater(); -- -- int id = requests_.take(reply); -- -- Echonest::Artists artists; -- try { -- artists = Echonest::Artist::parseSimilar(reply); -- } -- catch (Echonest::ParseError e) { -- qLog(Warning) << "Error parsing echonest reply:" << e.errorType() -- << e.what(); -- } -- -- if (!artists.isEmpty()) { -- CollapsibleInfoPane::Data data; -- data.id_ = "echonest/similarartists"; -- data.title_ = tr("Similar artists"); -- data.type_ = CollapsibleInfoPane::Data::Type_Similar; -- data.icon_ = IconLoader::Load("echonest", IconLoader::Provider); -- -- TagWidget* widget = new TagWidget(TagWidget::Type_Artists); -- data.contents_ = widget; -- -- widget->SetIcon(IconLoader::Load("x-clementine-artist", IconLoader::Base)); -- -- for (const Echonest::Artist& artist : artists) { -- widget->AddTag(artist.name()); -- if (widget->count() >= 10) break; -- } -- -- emit InfoReady(id, data); -- } -- -- emit Finished(id); --} ---- Clementine-1.3.1/src/songinfo/echonestsimilarartists.h -+++ Clementine-1.3.1/src/songinfo/echonestsimilarartists.h -@@ -1,38 +0,0 @@ --/* This file is part of Clementine. -- Copyright 2010, David Sansome <me@davidsansome.com> -- -- Clementine is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation, either version 3 of the License, or -- (at your option) any later version. -- -- Clementine is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with Clementine. If not, see <http://www.gnu.org/licenses/>. --*/ -- --#ifndef ECHONESTSIMILARARTISTS_H --#define ECHONESTSIMILARARTISTS_H -- --#include "songinfoprovider.h" -- --class QNetworkReply; -- --class EchoNestSimilarArtists : public SongInfoProvider { -- Q_OBJECT -- -- public: -- void FetchInfo(int id, const Song& metadata); -- -- private slots: -- void RequestFinished(); -- -- private: -- QMap<QNetworkReply*, int> requests_; --}; -- --#endif // ECHONESTSIMILARARTISTS_H ---- Clementine-1.3.1/src/songinfo/echonesttags.cpp -+++ Clementine-1.3.1/src/songinfo/echonesttags.cpp -@@ -1,80 +0,0 @@ --/* This file is part of Clementine. -- Copyright 2010, David Sansome <me@davidsansome.com> -- -- Clementine is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation, either version 3 of the License, or -- (at your option) any later version. -- -- Clementine is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with Clementine. If not, see <http://www.gnu.org/licenses/>. --*/ -- --#include "echonesttags.h" -- --#include <memory> -- --#include <echonest/Artist.h> -- --#include "tagwidget.h" --#include "core/logging.h" --#include "ui/iconloader.h" -- --struct EchoNestTags::Request { -- Request(int id) : id_(id), artist_(new Echonest::Artist) {} -- -- int id_; -- std::unique_ptr<Echonest::Artist> artist_; --}; -- --void EchoNestTags::FetchInfo(int id, const Song& metadata) { -- std::shared_ptr<Request> request(new Request(id)); -- request->artist_->setName(metadata.artist()); -- -- QNetworkReply* reply = request->artist_->fetchTerms(); -- connect(reply, SIGNAL(finished()), SLOT(RequestFinished())); -- requests_[reply] = request; --} -- --void EchoNestTags::RequestFinished() { -- QNetworkReply* reply = qobject_cast<QNetworkReply*>(sender()); -- if (!reply || !requests_.contains(reply)) return; -- reply->deleteLater(); -- -- RequestPtr request = requests_.take(reply); -- -- try { -- request->artist_->parseProfile(reply); -- } -- catch (Echonest::ParseError e) { -- qLog(Warning) << "Error parsing echonest reply:" << e.errorType() -- << e.what(); -- } -- -- if (!request->artist_->terms().isEmpty()) { -- CollapsibleInfoPane::Data data; -- data.id_ = "echonest/artisttags"; -- data.title_ = tr("Artist tags"); -- data.type_ = CollapsibleInfoPane::Data::Type_Tags; -- data.icon_ = IconLoader::Load("icon_tag", IconLoader::Lastfm); -- -- TagWidget* widget = new TagWidget(TagWidget::Type_Tags); -- data.contents_ = widget; -- -- widget->SetIcon(data.icon_); -- -- for (const Echonest::Term& term : request->artist_->terms()) { -- widget->AddTag(term.name()); -- if (widget->count() >= 10) break; -- } -- -- emit InfoReady(request->id_, data); -- } -- -- emit Finished(request->id_); --} ---- Clementine-1.3.1/src/songinfo/echonesttags.h -+++ Clementine-1.3.1/src/songinfo/echonesttags.h -@@ -1,43 +0,0 @@ --/* This file is part of Clementine. -- Copyright 2010, David Sansome <me@davidsansome.com> -- -- Clementine is free software: you can redistribute it and/or modify -- it under the terms of the GNU General Public License as published by -- the Free Software Foundation, either version 3 of the License, or -- (at your option) any later version. -- -- Clementine is distributed in the hope that it will be useful, -- but WITHOUT ANY WARRANTY; without even the implied warranty of -- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -- GNU General Public License for more details. -- -- You should have received a copy of the GNU General Public License -- along with Clementine. If not, see <http://www.gnu.org/licenses/>. --*/ -- --#ifndef ECHONESTTAGS_H --#define ECHONESTTAGS_H -- --#include <memory> -- --#include "songinfoprovider.h" -- --class QNetworkReply; -- --class EchoNestTags : public SongInfoProvider { -- Q_OBJECT -- -- public: -- void FetchInfo(int id, const Song& metadata); -- -- private slots: -- void RequestFinished(); -- -- private: -- struct Request; -- typedef std::shared_ptr<Request> RequestPtr; -- -- QMap<QNetworkReply*, RequestPtr> requests_; --}; -- --#endif // ECHONESTTAGS_H ---- Clementine-1.3.1/src/songinfo/songkickconcerts.cpp -+++ Clementine-1.3.1/src/songinfo/songkickconcerts.cpp -@@ -21,9 +21,6 @@ - #include <QVBoxLayout> - #include <QXmlStreamWriter> - --#include <echonest/Artist.h> --#include <echonest/TypeInformation.h> -- - #include <qjson/parser.h> - - #include "core/closure.h" -@@ -31,77 +28,64 @@ - #include "songkickconcertwidget.h" - #include "ui/iconloader.h" - --const char* SongkickConcerts::kSongkickArtistBucket = "songkick"; --const char* SongkickConcerts::kSongkickArtistCalendarUrl = -- "https://api.songkick.com/api/3.0/artists/%1/calendar.json?" -- "per_page=5&" -- "apikey=8rgKfy1WU6IlJFfN"; -+namespace { -+const char* kSongkickArtistCalendarUrl = -+ "https://api.songkick.com/api/3.0/artists/%1/calendar.json"; -+const char* kSongkickArtistSearchUrl = -+ "https://api.songkick.com/api/3.0/search/artists.json"; -+const char* kSongkickApiKey = "8rgKfy1WU6IlJFfN"; -+} // namespace - - SongkickConcerts::SongkickConcerts() { - Geolocator* geolocator = new Geolocator; - geolocator->Geolocate(); - connect(geolocator, SIGNAL(Finished(Geolocator::LatLng)), - SLOT(GeolocateFinished(Geolocator::LatLng))); -- NewClosure(geolocator, SIGNAL(Finished(Geolocator::LatLng)), geolocator, -- SLOT(deleteLater())); -+ connect(geolocator, SIGNAL(Finished(Geolocator::LatLng)), geolocator, -+ SLOT(deleteLater())); - } - - void SongkickConcerts::FetchInfo(int id, const Song& metadata) { -- Echonest::Artist::SearchParams params; -- params.push_back( -- qMakePair(Echonest::Artist::Name, QVariant(metadata.artist()))); -- qLog(Debug) << "Params:" << params; -- QNetworkReply* reply = Echonest::Artist::search( -- params, -- Echonest::ArtistInformation(Echonest::ArtistInformation::NoInformation, -- QStringList() << kSongkickArtistBucket)); -- qLog(Debug) << reply->request().url(); -+ if (metadata.artist().isEmpty()) { -+ emit Finished(id); -+ return; -+ } -+ -+ QUrl url(kSongkickArtistSearchUrl); -+ url.addQueryItem("apikey", kSongkickApiKey); -+ url.addQueryItem("query", metadata.artist()); -+ -+ QNetworkRequest request(url); -+ QNetworkReply* reply = network_.get(request); - NewClosure(reply, SIGNAL(finished()), this, - SLOT(ArtistSearchFinished(QNetworkReply*, int)), reply, id); - } - - void SongkickConcerts::ArtistSearchFinished(QNetworkReply* reply, int id) { - reply->deleteLater(); -- try { -- Echonest::Artists artists = Echonest::Artist::parseSearch(reply); -- if (artists.isEmpty()) { -- qLog(Debug) << "Failed to find artist in echonest"; -- emit Finished(id); -- return; -- } -- -- const Echonest::Artist& artist = artists[0]; -- const Echonest::ForeignIds& foreign_ids = artist.foreignIds(); -- QString songkick_id; -- for (const Echonest::ForeignId& id : foreign_ids) { -- if (id.catalog == "songkick") { -- songkick_id = id.foreign_id; -- break; -- } -- } -- -- if (songkick_id.isEmpty()) { -- qLog(Debug) << "Failed to fetch songkick foreign id for artist"; -- emit Finished(id); -- return; -- } -- -- QStringList split = songkick_id.split(':'); -- if (split.count() != 3) { -- qLog(Error) << "Weird songkick id"; -- emit Finished(id); -- return; -- } -- -- FetchSongkickCalendar(split[2], id); -- } catch (Echonest::ParseError& e) { -- qLog(Error) << "Error parsing echonest reply:" << e.errorType() << e.what(); -+ -+ QJson::Parser parser; -+ QVariantMap json = parser.parse(reply).toMap(); -+ -+ QVariantMap results_page = json["resultsPage"].toMap(); -+ QVariantMap results = results_page["results"].toMap(); -+ QVariantList artists = results["artist"].toList(); -+ -+ if (artists.isEmpty()) { - emit Finished(id); -+ return; - } -+ -+ QVariantMap artist = artists.first().toMap(); -+ QString artist_id = artist["id"].toString(); -+ -+ FetchSongkickCalendar(artist_id, id); - } - - void SongkickConcerts::FetchSongkickCalendar(const QString& artist_id, int id) { - QUrl url(QString(kSongkickArtistCalendarUrl).arg(artist_id)); -+ url.addQueryItem("per_page", "5"); -+ url.addQueryItem("apikey", kSongkickApiKey); - qLog(Debug) << url; - QNetworkReply* reply = network_.get(QNetworkRequest(url)); - NewClosure(reply, SIGNAL(finished()), this, ---- Clementine-1.3.1/src/songinfo/songkickconcerts.h -+++ Clementine-1.3.1/src/songinfo/songkickconcerts.h -@@ -44,9 +44,6 @@ - - NetworkAccessManager network_; - Geolocator::LatLng latlng_; -- -- static const char* kSongkickArtistBucket; -- static const char* kSongkickArtistCalendarUrl; - }; - - #endif diff --git a/media-sound/clementine/metadata.xml b/media-sound/clementine/metadata.xml index 40e967ff3e4e..21fd21a75522 100644 --- a/media-sound/clementine/metadata.xml +++ b/media-sound/clementine/metadata.xml @@ -20,7 +20,6 @@ <name>Gentoo Sound project</name> </maintainer> <use> - <flag name="amazoncloud">Enable Amazon cloud drive support</flag> <flag name="box">Enable filesharing via Box.com</flag> <flag name="dropbox">Enable Dropbox support</flag> <flag name="googledrive">Enable Google Drive support</flag> @@ -29,7 +28,6 @@ <flag name="projectm">Build with ProjectM visualization</flag> <flag name="seafile">Enable support for seafile: a file sync service</flag> <flag name="skydrive">Enable Skydrive support</flag> - <flag name="vkontakte">Enable vk.com support</flag> <flag name="wiimote">Enable support for Wii remote</flag> </use> <upstream> diff --git a/media-sound/mumble/Manifest b/media-sound/mumble/Manifest index 9ad6b759f4c1..464940b93d98 100644 --- a/media-sound/mumble/Manifest +++ b/media-sound/mumble/Manifest @@ -4,5 +4,5 @@ DIST mumble-1.2.18.tar.gz 3210749 BLAKE2B 3614d9714fc6825ed86a308d8dc7be0f30463a DIST mumble-1.2.19.tar.gz 3210865 BLAKE2B 7ce466ab9d5ca761308d08633abf8efb6105b3097b7fde0a886f957dff4a16442d1f12c93123bd0291b37d14b412e0087b89f781d0f63a5182bd6ca2d3f2d3fe SHA512 f91111194a899149b500a94afcf7cc5b9691c7ce8669f07fca2c66adbb3916ddb863bf703d04fb8387133fb75f3c8edb52974d1acf3febfafa1f73da19946de4 EBUILD mumble-1.2.17.ebuild 3022 BLAKE2B 33beccec519300b806e1fe463c35630f123a1aa3d09b007649eca040ad5b6c68d4af8612504bc650d03fa46ca79640219178dda96d48fb0a50c7440262893675 SHA512 a5358d0a9399921d3e4f98ab7e71434930eafae9206c313126b4ee4d9940c484b16758a1b5af8136216e1b37cf80ccdb3831dda537c13ceb940293c1dde50a43 EBUILD mumble-1.2.18.ebuild 3090 BLAKE2B 5ff6e5852d20ccb8f79c0999b43271f4f043b2e432399e26478fe4aa090121135df31b1eda8276001408492f54e369997e923e217618d08c6000df2724412d1e SHA512 9af5be4611e433d3ce47a27193a07fd505115a10f6e0d18fa6af70aa628ec6413c7f6177d3de15bec34f5581b84c8d3a19c335ab307409f43c90d2fa4d67609c -EBUILD mumble-1.2.19.ebuild 3097 BLAKE2B b00d51bc6f8da184b27729fb1b6fa0a93d38d23c7934e51b96242a9a952fa10575044741559358dc3948efa7805a6512ad8e0595ab0f22ac5b6e2001228365f2 SHA512 91578730ee10a51dfee3033c57289ed396ea94d5d0dce2e6cd03143b3552c45ac2787b3f850f76fdf08156d82cda498becbde9fd9afc4db4c171df4c707ced6d +EBUILD mumble-1.2.19.ebuild 3096 BLAKE2B a7e990cd66d50e42e98a1f12d0f9c11a555c0689592e316ac60349f01a6208a4bfb93accbb60c5757f053bbec87ac6342223ac1db796677114684b5820641fdf SHA512 baa3d92e4ec9ebbe2101e9f3b1d95f7a8ab2ed1aeeba8bb4f6213a8527176d125cef8d858cdde71ca18f735972f7aae03fb056eff12c93a06bdbf262c765d674 MISC metadata.xml 666 BLAKE2B 6a2e64cb002d8ebe5457265b4b602e1fdbb136ac8846d6528dbfb18e6dae78b16b5cfac3a0fe60f3b8dcc61f718a8579c3b9f87c288150194e2f72258e0685a1 SHA512 c9cd557297af63d195a20c1b913758ea6c4433373f55561b1dc06fc3053a949495e2a19542b43affb0c799e4ff9747410cd0a260568e9365a529aa6943910fb9 diff --git a/media-sound/mumble/mumble-1.2.19.ebuild b/media-sound/mumble/mumble-1.2.19.ebuild index 52c0b1ed4388..44a8476f6ba1 100644 --- a/media-sound/mumble/mumble-1.2.19.ebuild +++ b/media-sound/mumble/mumble-1.2.19.ebuild @@ -13,7 +13,7 @@ SRC_URI="https://mumble.info/snapshot/${MY_P}.tar.gz" LICENSE="BSD MIT" SLOT="0" -KEYWORDS="~amd64 ~arm64 ~x86" +KEYWORDS="~amd64 ~arm64 x86" IUSE="+alsa +dbus debug g15 libressl oss pch portaudio pulseaudio speech zeroconf" RDEPEND=">=dev-libs/boost-1.41.0 diff --git a/media-sound/pulseaudio/Manifest b/media-sound/pulseaudio/Manifest index 52b965eaffb4..3da3f5cf24c2 100644 --- a/media-sound/pulseaudio/Manifest +++ b/media-sound/pulseaudio/Manifest @@ -9,5 +9,5 @@ DIST pulseaudio-11.1.tar.xz 1648924 BLAKE2B eea767efb6529436a6c2aa7d5ccaccdbda23 EBUILD pulseaudio-10.0.ebuild 10963 BLAKE2B 90aa6d753f7e66b34318a0493a81a448168d9513142f4108ab8aea1a71b59ba564122ffa02d76237af87671ec24fadeb8b7d580e9107fc663285d8f033f9b20b SHA512 0f4eeac1aa1d2446db522259bd669c67ad06f717964b6272f3ad733a01feecdc00bfd4fd886636a284522a7e766a090fcaba60251a8e65486ec518677425825f EBUILD pulseaudio-10.99.1.ebuild 10972 BLAKE2B b2d8a567ebf1f1e5a39f63ecd0fa402374d2d8bd5ae1cbddc070170e567a16af956351815c3fc708e27d47bece7d7c701df4882b4510d3a58982b8de155903b0 SHA512 9140a7bacc08ed57975a5016d7ccca54c585a3c58cc0605f29ace3b2a9c4f7e5af817cd9be75034fa6b8769ae9b314cb2b56d53675308d8fef95edda5079e764 EBUILD pulseaudio-11.0.ebuild 10960 BLAKE2B b8497dc4d9c738d8668c6956ea5632a82b8f90efb1c5e11be7a115f1aba09b3bcead69fc7f878700ecfcafc9e2fb148aeb2a211c5ca086e7c6255eae8c50da89 SHA512 5857ec66ea36197411d0e42b2234683686f3a6982a5b5168b23f69dec72e4827155d664b6e4164f578758290362d885d7370f068a32c0c37d77d7806895cdb67 -EBUILD pulseaudio-11.1.ebuild 10953 BLAKE2B e923dbfaa38b1bed2ec97fde4d17430939b742d619b36e18fdee3cd072ed9c97f4a78908171b9a991c485092f422ab499127cc0e95db18a32915318e5b1c23d6 SHA512 7d5836cbc7b2e0e7625308d53ad9026647409dfd59e26879400abc03996d5f8d34ceda023566480e551a01bfc0dfaf0391f71da420eddbca1d8fccd56c32ae2f +EBUILD pulseaudio-11.1.ebuild 10952 BLAKE2B 1881d0c7604a47841b393125a4282a504c6bdfb86e6d733825da99d01c72967226f102c59beb67e436683bf06f6ffb0b84d6bffa165d72cbfd05d77face5fc69 SHA512 63d8f4616b27990f0aa4d3e93f2963e15c4760d3c7f16b24ae33de6f399613ffc985de3652f0fb4c7ab1bbac7585d58d392d249ee51abedd86194cee952ca25f MISC metadata.xml 3415 BLAKE2B cb46d59d9af2a364730ebe48d9ee009659ba8c9b51c8da97c341151784dcb595cc7d6469dae20f5a5da2382d762a984e038077ce95840fcb8e4205b1f0fab06f SHA512 1c7e7a12eeafc6abd5d9bd315e4b512a7b479ae933ee3865b9fc37d994f123beea8208dfe742334d12dd4b20c7eb8077bb37fcd1a862dcf1f5874a0fa8777896 diff --git a/media-sound/pulseaudio/pulseaudio-11.1.ebuild b/media-sound/pulseaudio/pulseaudio-11.1.ebuild index b3a28bee851d..be19ff21b839 100644 --- a/media-sound/pulseaudio/pulseaudio-11.1.ebuild +++ b/media-sound/pulseaudio/pulseaudio-11.1.ebuild @@ -16,7 +16,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${P}.tar.xz" LICENSE="!gdbm? ( LGPL-2.1 ) gdbm? ( GPL-2 ) equalizer? ( AGPL-3+ )" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" +KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux" # +alsa-plugin as discussed in bug #519530 IUSE="+alsa +alsa-plugin +asyncns bluetooth +caps dbus doc equalizer +gdbm +glib |