commit: 489ce9b104f23d1f14def66c2663c2a8381a598a Author: Johannes Huber <johu <AT> gentoo <DOT> org> AuthorDate: Sun Oct 8 19:22:02 2017 +0000 Commit: Johannes Huber <johu <AT> gentoo <DOT> org> CommitDate: Sun Oct 8 19:23:21 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=489ce9b1
media-sound/cantata: Version bump 2.2.0 Adds new use flag streaming which controls supports for playback of MPD HTTP streams using LibVLC (media-video/vlc). Reported-by: Hendrik v. Raven <hendrik <AT> consetetur.de> Closes: https://bugs.gentoo.org/633634 Package-Manager: Portage-2.3.11, Repoman-2.3.3 media-sound/cantata/Manifest | 1 + media-sound/cantata/cantata-2.2.0.ebuild | 116 +++++++++++++++++++++ .../cantata/files/cantata-2.2.0-headers.patch | 48 +++++++++ media-sound/cantata/metadata.xml | 1 + 4 files changed, 166 insertions(+) diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest index 220f9d133c3..12946bb8abe 100644 --- a/media-sound/cantata/Manifest +++ b/media-sound/cantata/Manifest @@ -1 +1,2 @@ DIST cantata-2.1.0.tar.bz2 2207271 SHA256 9317afcae75c709ec733da069d4245b47e6e2c297a259eaf87a181fa9d1cd4c4 SHA512 bf03933785110d0d0c1dfbfc27f4974869ae7c79afe3cf1da1f3024c95d86733d8bea77f2a882887de79a7897ffcdac4262e58747dd4e979824943991675c5d2 WHIRLPOOL 5d58b84290c387d535e556553e64bba36520a099565c44bed1c4e9cf800c2a432ac09296b989a557e72d81a951c926b4bb638f2d2ab7976735059ebb74b8c8e2 +DIST cantata-2.2.0.tar.bz2 2251649 SHA256 c84691eb17711118d3c512d70cb422267f7a137290082cdd1ff0a871b4a8e5c0 SHA512 519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd WHIRLPOOL 50a44192368ee90708ecf906401c28d6a06878d61cfefae04bcab3463343c11bcfe3054880364886e57f797cc303fe14a4f2010e87ad873ba4de3738c05399e7 diff --git a/media-sound/cantata/cantata-2.2.0.ebuild b/media-sound/cantata/cantata-2.2.0.ebuild new file mode 100644 index 00000000000..3a22fc20439 --- /dev/null +++ b/media-sound/cantata/cantata-2.2.0.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PLOCALES="cs de en_GB es fr hu it ja ko pl ru zh_CN" +inherit cmake-utils gnome2-utils l10n qmake-utils xdg + +DESCRIPTION="Featureful and configurable Qt client for the music player daemon (MPD)" +HOMEPAGE="https://github.com/CDrummond/cantata"; +SRC_URI="https://github.com/CDrummond/cantata/releases/download/v${PV}/${P}.tar.bz2"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks" +REQUIRED_USE=" + ?? ( cdda cdio ) + cdda? ( udisks || ( cddb musicbrainz ) ) + cddb? ( || ( cdio cdda ) taglib ) + cdio? ( udisks || ( cddb musicbrainz ) ) + mtp? ( taglib udisks ) + musicbrainz? ( || ( cdio cdda ) taglib ) + replaygain? ( taglib ) +" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) + sys-libs/zlib + virtual/libudev:= + cdda? ( media-sound/cdparanoia ) + cdio? ( dev-libs/libcdio-paranoia ) + cddb? ( media-libs/libcddb ) + mtp? ( media-libs/libmtp ) + musicbrainz? ( media-libs/musicbrainz:5= ) + replaygain? ( + media-libs/libebur128 + media-sound/mpg123 + virtual/ffmpeg + ) + streaming? ( media-video/vlc:0= ) + taglib? ( + media-libs/taglib[asf(+),mp4(+)] + media-libs/taglib-extras + udisks? ( sys-fs/udisks:2 ) + ) +" +DEPEND="${RDEPEND} + dev-qt/qtconcurrent:5 + dev-qt/linguist-tools:5 +" + +# cantata has no tests +RESTRICT="test" + +PATCHES=( "${FILESDIR}/${P}-headers.patch" ) + +src_prepare() { + remove_locale() { + rm "translations/${PN}_${1}".ts || die + } + + cmake-utils_src_prepare + + # Unbundle 3rd party libs + rm -r 3rdparty/{ebur128,qtsingleapplication} || die + + l10n_find_plocales_changes "translations" "${PN}_" ".ts" + l10n_for_each_disabled_locale_do remove_locale +} + +src_configure() { + local mycmakeargs=( + -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)" + -DENABLE_CDPARANOIA=$(usex cdda) + -DENABLE_CDIOPARANOIA=$(usex cdio) + -DENABLE_CDDB=$(usex cddb) + -DENABLE_HTTP_SERVER=$(usex http-server) + -DENABLE_MTP=$(usex mtp) + -DENABLE_MUSICBRAINZ=$(usex musicbrainz) + -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease" + -DENABLE_FFMPEG=$(usex replaygain) + -DENABLE_MPG123=$(usex replaygain) + -DENABLE_HTTP_STREAM_PLAYBACK=$(usex streaming) + -DENABLE_TAGLIB=$(usex taglib) + -DENABLE_TAGLIB_EXTRAS=$(usex taglib) + -DENABLE_DEVICES_SUPPORT=$(usex udisks) + -DENABLE_REMOTE_DEVICES=OFF + -DENABLE_UDISKS2=ON + ) + + cmake-utils_src_configure +} + +pkg_preinst() { + gnome2_icon_savelist + xdg_pkg_preinst +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_pkg_postinst +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_pkg_postrm +} diff --git a/media-sound/cantata/files/cantata-2.2.0-headers.patch b/media-sound/cantata/files/cantata-2.2.0-headers.patch new file mode 100644 index 00000000000..962c8413a9f --- /dev/null +++ b/media-sound/cantata/files/cantata-2.2.0-headers.patch @@ -0,0 +1,48 @@ +Description: Fix include location for ebur128 files + The Debian packages for ebur128 are shipping the headers in: + + libebur128-dev: /usr/include/ebur128.h + + while the upstream code expects ebur128/ebur128.h + +Author: Stuart Prescott <stu...@debian.org> +Forwarded: not sure -- check interaction with cmake rules +diff --git a/replaygain/ffmpeginput.cpp b/replaygain/ffmpeginput.cpp +index 24e47d34..382bac90 100644 +--- a/replaygain/ffmpeginput.cpp ++++ b/replaygain/ffmpeginput.cpp +@@ -31,7 +31,7 @@ extern "C" { + #include <QString> + #include <QList> + #include <QByteArray> +-#include "ebur128/ebur128.h" ++#include "ebur128.h" + #include "ffmpeginput.h" + + static QMutex mutex; +diff --git a/replaygain/mpg123input.cpp b/replaygain/mpg123input.cpp +index 43ae0371..6a7b266f 100644 +--- a/replaygain/mpg123input.cpp ++++ b/replaygain/mpg123input.cpp +@@ -18,7 +18,7 @@ extern "C" { + #include <QFile> + #include <QString> + #include <QByteArray> +-#include "ebur128/ebur128.h" ++#include "ebur128.h" + #include "mpg123input.h" + + struct Mpg123Input::Handle { +diff --git a/replaygain/trackscanner.h b/replaygain/trackscanner.h +index b8709115..631e551a 100644 +--- a/replaygain/trackscanner.h ++++ b/replaygain/trackscanner.h +@@ -25,7 +25,7 @@ + #define _SCANNER_H_ + + #include "jobcontroller.h" +-#include "ebur128/ebur128.h" ++#include "ebur128.h" + + class Input; + diff --git a/media-sound/cantata/metadata.xml b/media-sound/cantata/metadata.xml index 62779a1ff0c..1bc1b0bb262 100644 --- a/media-sound/cantata/metadata.xml +++ b/media-sound/cantata/metadata.xml @@ -9,6 +9,7 @@ <flag name="cdio">Use <pkg>dev-libs/libcdio-paranoia</pkg> for CD support (instead of cdparanoia)</flag> <flag name="http-server">Enable internal HTTP server to play non-MPD files</flag> <flag name="replaygain">Enable ReplayGain support, for relative volume adjustments</flag> + <flag name="streaming">Enable playback of MPD HTTP streams using LibVLC (<pkg>media-video/vlc</pkg>)</flag> </use> <upstream> <remote-id type="github">cdrummond/cantata</remote-id>
