From 99abbc5e5a6ecd3fc981b45646fd8cb5d320377b Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 24 Feb 2018 19:58:07 +0000 Subject: gentoo resync : 24.02.2018 --- media-sound/clementine/Manifest | 6 +- .../clementine/clementine-1.3.1_p20180203.ebuild | 183 -------------------- .../clementine/clementine-1.3.1_p20180219.ebuild | 191 +++++++++++++++++++++ media-sound/clementine/clementine-9999.ebuild | 14 +- 4 files changed, 205 insertions(+), 189 deletions(-) delete mode 100644 media-sound/clementine/clementine-1.3.1_p20180203.ebuild create mode 100644 media-sound/clementine/clementine-1.3.1_p20180219.ebuild (limited to 'media-sound/clementine') diff --git a/media-sound/clementine/Manifest b/media-sound/clementine/Manifest index d43d6951fb29..7d88f372ec69 100644 --- a/media-sound/clementine/Manifest +++ b/media-sound/clementine/Manifest @@ -1,8 +1,8 @@ AUX clementine-1.3-fix-tokenizer.patch 674 BLAKE2B 6f5b0c6bd71887cbe9ce0f85a85db134710f5aaf62c4e8105ab1b8ab0e69a0953b6177fb91dd89fcdcf5493dfc1e634f51658eea9f050689aa1e219dbd8db189 SHA512 4f520dcd4937634ebf5bb814ec64267d42473886fc5abd4924ac551bbae8ecc7643ddbacd9e2f9a5b0d8c7b0f67cf5aec420b5eb73162b248cbf6b3eafafbbd8 AUX clementine-fts3-tokenizer.patch 1395 BLAKE2B e3dee5d7e9856c6d3d5b69ad2d4a195a7016a7dcd0f01128dc24a22c10ea5cba0cc302852272ca4d45844c0003572809fa8d8c1a2e37524d2e8c75e64d96290f SHA512 c4623333086cebb9d56d11c4deb8837fc23aaff8ddda07bcb8bb1c0df90700d6923d51324823d23b317366180660de3993053d9de0ff5103d88f59143328627a DIST clementine-1.3.1_p20171113.tar.gz 8467904 BLAKE2B bf1f59b987c0e4ec5c2ced00fab07c1a7e1df0eb5a46e90358b37eaaeaa916fb3e6a08ad79fc5fb791342d857783f615eb3726974dcfef9388da2793b1b7fe6a SHA512 39c459be8e4c5dd53ab9de6cdfd57f947926ccc2cd39ce2f72460bb991f7b2a28e6bc074e7bc23b0eba81c3d630e91dc2373794832c1089a9b5de7b212b94674 -DIST clementine-1.3.1_p20180203.tar.gz 8483246 BLAKE2B d338a93d4111be2b4d118df40bfca5fb1107cff68e62a82c387dcf83da8f34b2eeb5649fa16cf2f94cdbfc455ab01982b81091344e82d1c4eef5d7bc23008cf6 SHA512 72589c525c5c2452f09fd023df03bc7cfe45278a13d42d76678108ea2c02bf078529cf0169882cd3774ecdf65bbd6443fc1c93336148570c9a1b2a7757af61f4 +DIST clementine-1.3.1_p20180219.tar.gz 8486446 BLAKE2B f0d34dae90acfd41a4dad6943ea088fb64d16308caf8dce569c0c5a900c149a0c40838b8f420a42e9e5cf6718965cec8fe7f9bb2ed7489719f3d8316308f2d49 SHA512 7464f03be6894202ecfeb9f2dd97821cd76cec1285be2dc82155b023406c57ec1a94e3659438726b6bf3c667579ab43f668f03e12c261aea05aa468e73a05146 EBUILD clementine-1.3.1_p20171113.ebuild 4949 BLAKE2B c191c95fe3eeed9a429120b212e449b6bec7de077f0da771612fb5a3d04c3b3d64f34c92ba48fb13037f930a243695fe0768ce0df03b877f7f4479dd8bcc6d48 SHA512 5a6038ab815b894e46c1f5d84c73754a3265e105b7aca76e4cb828749d3fad64fd2ea5ea153dd26ebb602bcdd6510a185c6547df5d5e4950372a1e8ce7cc6020 -EBUILD clementine-1.3.1_p20180203.ebuild 5181 BLAKE2B 9b72a071d0bf32b6c6fb84a270e8cb4185d8c90737c4edf98226ed3432b513001dc4d123d190a988e952e84d3420bc5d0c885b7e05a0ba03113886367705cc7a SHA512 ed300896e0020255bb1003d10cc9748c6fd724c083ced82ca389d32fafae470e6b0f30aad075c19cea83d01da30239b401c8ff2e1addd06884703b7b195fd722 -EBUILD clementine-9999.ebuild 5151 BLAKE2B 3fd15cc126cf7e9e4021195d3dce0d7e2b5bd80d9cc2914c9b65c1eee766dab52792dc10f38402ba36d6ad3283a315c89d786294068839fa08227a44c3284eb7 SHA512 a5283a018f0fa14f7df6cdffcd2c767d411b6f0292938e91ca6f7f84b22a80aefbe4dcdc8006ea4785fa1103b59f4b976136d48b2c97428a721cd815d7e3fc1e +EBUILD clementine-1.3.1_p20180219.ebuild 5580 BLAKE2B 6f6abf5ea7b7b86a5579854a42c194d4fb20e625cfb6e3fd6559bdd73869eae815a09948d4f3587788f88376a4d13bce73511e3b5c1963e81b850aa4ba8d8cdd SHA512 bdb8c69e0e949a0b14b5bfa27fd9764cdfb17357dc2d5c54dd4522743f4697906e91bc4e640a8d264eac9b33664d89b149999fd334482d05ac4416024c271fc2 +EBUILD clementine-9999.ebuild 5550 BLAKE2B 22ddba254824fe67400394ff564ca2f29e404ca74e130aea7b769e6df0a6d12952f515dfd4ffbda59727e2dedae5de46f8c82ea5ff200204f885b2154fbe8b6e SHA512 211b269365c423b0d1df92b6dfbfa5bfcc5a8c811fa7a13ab7de58112163ed34871a84977402f372af23cffbdd2e6bfd385e0c44331a8438812910da718fba65 MISC metadata.xml 1270 BLAKE2B 42b3ad43defebc30898db95bac41edde89d345e4776fa81f84581f8f35df8fa962024f0d08e84bfceba1080966988308434c7aac90d244ead02cc3a1fe01c58e SHA512 9d69291b66803e4dbe1ca50309891fcd9ee5ad5264bb7827a88a550367d770482744f3b5689f60a584b3fda7614cd27743085492dc72727275b470b225b96cf4 diff --git a/media-sound/clementine/clementine-1.3.1_p20180203.ebuild b/media-sound/clementine/clementine-1.3.1_p20180203.ebuild deleted file mode 100644 index 8a8acf0c01cb..000000000000 --- a/media-sound/clementine/clementine-1.3.1_p20180203.ebuild +++ /dev/null @@ -1,183 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="af ar be bg bn br bs ca cs cy da de el en 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 mk_MK 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" - -MY_P="${P/_}" -if [[ ${PV} == *9999* ]]; then - EGIT_BRANCH="qt5" - EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" - GIT_ECLASS="git-r3" -else - COMMIT=b04367937a3160e15543a07631e36213db7b6048 - SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi -inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} vcs-snapshot -unset GIT_ECLASS - -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" - -LICENSE="GPL-3" -SLOT="0" -IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" - -REQUIRED_USE=" - udisks? ( dbus ) - wiimote? ( dbus ) -" - -COMMON_DEPEND=" - app-crypt/qca:2[qt5(+)] - dev-db/sqlite:= - dev-libs/crypto++ - dev-libs/glib:2 - dev-libs/libxml2 - dev-libs/protobuf:= - dev-qt/qtconcurrent:5 - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5[ssl] - dev-qt/qtsql:5[sqlite] - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - media-libs/chromaprint:= - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - >=media-libs/libmygpo-qt-1.0.9[qt5] - media-libs/taglib[mp4(+)] - sys-libs/zlib - virtual/glu - virtual/opengl - x11-libs/libX11 - cdda? ( dev-libs/libcdio:= ) - dbus? ( dev-qt/qtdbus:5 ) - ipod? ( >=media-libs/libgpod-0.8.0 ) - lastfm? ( >=media-libs/liblastfm-1[qt5] ) - moodbar? ( sci-libs/fftw:3.0 ) - mtp? ( >=media-libs/libmtp-1.0.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 seems to work fine, so no reason to use bundled version; check 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} - media-plugins/gst-plugins-meta:1.0 - media-plugins/gst-plugins-soup:1.0 - media-plugins/gst-plugins-taglib:1.0 - mms? ( media-plugins/gst-plugins-libmms:1.0 ) - mtp? ( gnome-base/gvfs[mtp] ) - udisks? ( sys-fs/udisks:2 ) -" -DEPEND="${COMMON_DEPEND} - || ( - >=dev-cpp/gtest-1.8.0 - dev-cpp/gmock - ) - dev-libs/boost:= - dev-qt/linguist-tools:5 - sys-devel/gettext - virtual/pkgconfig - box? ( dev-cpp/sparsehash ) - dropbox? ( dev-cpp/sparsehash ) - googledrive? ( dev-cpp/sparsehash ) - pulseaudio? ( media-sound/pulseaudio ) - seafile? ( dev-cpp/sparsehash ) - skydrive? ( dev-cpp/sparsehash ) - test? ( - dev-qt/qttest:5 - gnome-base/gsettings-desktop-schemas - ) -" - -DOCS=( Changelog README.md ) - -PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch ) - -src_prepare() { - l10n_find_plocales_changes "src/translations" "" ".po" - - cmake-utils_src_prepare - # some tests fail or hang - sed -i \ - -e '/add_test_file(translations_test.cpp/d' \ - tests/CMakeLists.txt || die - - if ! use test; then - sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die - cmake_comment_add_subdirectory tests - fi -} - -src_configure() { - # spotify is not in portage - local mycmakeargs=( - -DBUILD_WERROR=OFF - # force to find crypto++ see bug #548544 - -DCRYPTOPP_LIBRARIES="crypto++" - -DCRYPTOPP_FOUND=ON - # avoid automagically enabling of ccache (bug #611010) - -DCCACHE_EXECUTABLE=OFF - -DENABLE_BREAKPAD=OFF #< disable crash reporting - -DENABLE_DEVICEKIT=OFF - -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)" - -DENABLE_BOX="$(usex box)" - -DENABLE_AUDIOCD="$(usex cdda)" - -DENABLE_DBUS="$(usex dbus)" - -DENABLE_DROPBOX="$(usex dropbox)" - -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" - -DENABLE_LIBGPOD="$(usex ipod)" - -DENABLE_LIBLASTFM="$(usex lastfm)" - -DENABLE_MOODBAR="$(usex moodbar)" - -DENABLE_LIBMTP="$(usex mtp)" - -DENABLE_VISUALISATIONS="$(usex projectm)" - -DENABLE_SEAFILE="$(usex seafile)" - -DENABLE_SKYDRIVE="$(usex skydrive)" - -DENABLE_LIBPULSE="$(usex pulseaudio)" - -DENABLE_UDISKS2="$(usex udisks)" - -DENABLE_WIIMOTEDEV="$(usex wiimote)" - ) - - 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 - - elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " - elog "USE flags. You may be intrested in setting aac, flac, mp3, ogg or wavpack USE flags " - elog "depending on your preferences" -} - -pkg_postrm() { - xdg_desktop_database_update - gnome2_icon_cache_update -} diff --git a/media-sound/clementine/clementine-1.3.1_p20180219.ebuild b/media-sound/clementine/clementine-1.3.1_p20180219.ebuild new file mode 100644 index 000000000000..7b677eabc6e3 --- /dev/null +++ b/media-sound/clementine/clementine-1.3.1_p20180219.ebuild @@ -0,0 +1,191 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PLOCALES="af ar be bg bn br bs ca cs cy da de el en 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 mk_MK 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" + +MY_P="${P/_}" +if [[ ${PV} == *9999* ]]; then + EGIT_BRANCH="qt5" + EGIT_REPO_URI="https://github.com/clementine-player/Clementine.git" + GIT_ECLASS="git-r3" +else + COMMIT=4273c0313298c2f7cb6f1b02cb5461fb66865c30 + SRC_URI="https://github.com/${PN}-player/${PN^}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi +inherit cmake-utils flag-o-matic gnome2-utils l10n virtualx xdg-utils ${GIT_ECLASS} vcs-snapshot +unset GIT_ECLASS + +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" + +LICENSE="GPL-3" +SLOT="0" +IUSE="box cdda +dbus debug dropbox googledrive ipod lastfm mms moodbar mtp projectm pulseaudio seafile skydrive test +udisks wiimote" + +REQUIRED_USE=" + udisks? ( dbus ) + wiimote? ( dbus ) +" + +COMMON_DEPEND=" + app-crypt/qca:2[qt5(+)] + dev-db/sqlite:= + dev-libs/crypto++ + dev-libs/glib:2 + dev-libs/libxml2 + dev-libs/protobuf:= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5[sqlite] + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + media-libs/chromaprint:= + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + >=media-libs/libmygpo-qt-1.0.9[qt5(+)] + media-libs/taglib + sys-libs/zlib + virtual/glu + virtual/opengl + x11-libs/libX11 + cdda? ( dev-libs/libcdio:= ) + dbus? ( dev-qt/qtdbus:5 ) + ipod? ( >=media-libs/libgpod-0.8.0 ) + lastfm? ( >=media-libs/liblastfm-1[qt5(+)] ) + moodbar? ( sci-libs/fftw:3.0 ) + mtp? ( >=media-libs/libmtp-1.0.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 seems to work fine, so no reason to use bundled version; check 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} + media-plugins/gst-plugins-meta:1.0 + media-plugins/gst-plugins-soup:1.0 + media-plugins/gst-plugins-taglib:1.0 + mms? ( media-plugins/gst-plugins-libmms:1.0 ) + mtp? ( gnome-base/gvfs[mtp] ) + udisks? ( sys-fs/udisks:2 ) +" +DEPEND="${COMMON_DEPEND} + || ( + >=dev-cpp/gtest-1.8.0 + dev-cpp/gmock + ) + dev-libs/boost:= + dev-qt/linguist-tools:5 + sys-devel/gettext + virtual/pkgconfig + box? ( dev-cpp/sparsehash ) + dropbox? ( dev-cpp/sparsehash ) + googledrive? ( dev-cpp/sparsehash ) + pulseaudio? ( media-sound/pulseaudio ) + seafile? ( dev-cpp/sparsehash ) + skydrive? ( dev-cpp/sparsehash ) + test? ( + dev-qt/qttest:5 + gnome-base/gsettings-desktop-schemas + ) +" + +DOCS=( Changelog README.md ) + +PATCHES=( "${FILESDIR}"/${PN}-fts3-tokenizer.patch ) + +src_prepare() { + l10n_find_plocales_changes "src/translations" "" ".po" + + cmake-utils_src_prepare + # some tests fail or hang + sed -i \ + -e '/add_test_file(translations_test.cpp/d' \ + tests/CMakeLists.txt || die + + if ! use test; then + sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die + cmake_comment_add_subdirectory tests + fi + + # Fix clementine relying on downstream renaming of lastfm header dir + sed -i -e "/^#include/s/lastfm5/lastfm/" \ + tests/albumcoverfetcher_test.cpp \ + src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \ + src/core/song.cpp || die "Failed to sed lastfm header suffix" + sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \ + -i CMakeLists.txt || die "Failed to sed lastfm header suffix" +} + +src_configure() { + # spotify is not in portage + local mycmakeargs=( + -DBUILD_WERROR=OFF + # force to find crypto++ see bug #548544 + -DCRYPTOPP_LIBRARIES="crypto++" + -DCRYPTOPP_FOUND=ON + # avoid automagically enabling of ccache (bug #611010) + -DCCACHE_EXECUTABLE=OFF + -DENABLE_BREAKPAD=OFF #< disable crash reporting + -DENABLE_DEVICEKIT=OFF + -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)" + -DENABLE_BOX="$(usex box)" + -DENABLE_AUDIOCD="$(usex cdda)" + -DENABLE_DBUS="$(usex dbus)" + -DENABLE_DROPBOX="$(usex dropbox)" + -DENABLE_GOOGLE_DRIVE="$(usex googledrive)" + -DENABLE_LIBGPOD="$(usex ipod)" + -DENABLE_LIBLASTFM="$(usex lastfm)" + -DENABLE_MOODBAR="$(usex moodbar)" + -DENABLE_LIBMTP="$(usex mtp)" + -DENABLE_VISUALISATIONS="$(usex projectm)" + -DENABLE_SEAFILE="$(usex seafile)" + -DENABLE_SKYDRIVE="$(usex skydrive)" + -DENABLE_LIBPULSE="$(usex pulseaudio)" + -DENABLE_UDISKS2="$(usex udisks)" + -DENABLE_WIIMOTEDEV="$(usex wiimote)" + ) + + 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 + + elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta " + elog "USE flags. You may be intrested in setting aac, flac, mp3, ogg or wavpack USE flags " + elog "depending on your preferences" +} + +pkg_postrm() { + xdg_desktop_database_update + gnome2_icon_cache_update +} diff --git a/media-sound/clementine/clementine-9999.ebuild b/media-sound/clementine/clementine-9999.ebuild index caae648812d0..e8465de79999 100644 --- a/media-sound/clementine/clementine-9999.ebuild +++ b/media-sound/clementine/clementine-9999.ebuild @@ -48,8 +48,8 @@ COMMON_DEPEND=" media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 - >=media-libs/libmygpo-qt-1.0.9[qt5] - media-libs/taglib[mp4(+)] + >=media-libs/libmygpo-qt-1.0.9[qt5(+)] + media-libs/taglib sys-libs/zlib virtual/glu virtual/opengl @@ -57,7 +57,7 @@ COMMON_DEPEND=" cdda? ( dev-libs/libcdio:= ) dbus? ( dev-qt/qtdbus:5 ) ipod? ( >=media-libs/libgpod-0.8.0 ) - lastfm? ( >=media-libs/liblastfm-1[qt5] ) + lastfm? ( >=media-libs/liblastfm-1[qt5(+)] ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( >=media-libs/libmtp-1.0.0 ) projectm? ( @@ -117,6 +117,14 @@ src_prepare() { sed -e "/find_package.*Qt5/s:\ Test::" -i CMakeLists.txt || die cmake_comment_add_subdirectory tests fi + + # Fix clementine relying on downstream renaming of lastfm header dir + sed -i -e "/^#include/s/lastfm5/lastfm/" \ + tests/albumcoverfetcher_test.cpp \ + src/internet/lastfm/lastfm{settingspage.cpp,service.cpp,compat.h} \ + src/core/song.cpp || die "Failed to sed lastfm header suffix" + sed -e "/^find_path.*LASTFM5/s/lastfm5/lastfm/" \ + -i CMakeLists.txt || die "Failed to sed lastfm header suffix" } src_configure() { -- cgit v1.2.3