diff options
| -rw-r--r-- | media-sound/cantata/Manifest | 2 | ||||
| -rw-r--r-- | media-sound/cantata/cantata-2.3.3-r1337.ebuild (renamed from media-sound/cantata/cantata-2.3.2-r1.ebuild) | 16 | ||||
| -rw-r--r-- | media-sound/cantata/files/cantata-2.3.2-opusfile.patch | 22 |
3 files changed, 8 insertions, 32 deletions
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest index 594c43dd..a36a1c3c 100644 --- a/media-sound/cantata/Manifest +++ b/media-sound/cantata/Manifest @@ -1 +1 @@ -DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589 SHA512 d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4 +DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84 SHA512 8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6 diff --git a/media-sound/cantata/cantata-2.3.2-r1.ebuild b/media-sound/cantata/cantata-2.3.3-r1337.ebuild index d8af6410..6d68923d 100644 --- a/media-sound/cantata/cantata-2.3.2-r1.ebuild +++ b/media-sound/cantata/cantata-2.3.3-r1337.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -8,12 +8,12 @@ inherit cmake-utils gnome2-utils l10n qmake-utils xdg-utils 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" +SRC_URI="https://github.com/CDrummond/${PN}/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 zeroconf" +IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf" REQUIRED_USE=" ?? ( cdda cdio ) cdda? ( udisks || ( cddb musicbrainz ) ) @@ -35,7 +35,6 @@ COMMON_DEPEND=" dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-sound/mpd - || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) sys-libs/zlib virtual/libudev:= cdda? ( media-sound/cdparanoia ) @@ -46,7 +45,8 @@ COMMON_DEPEND=" replaygain? ( media-libs/libebur128 media-sound/mpg123 - virtual/ffmpeg + libav? ( media-video/libav:= ) + !libav? ( media-video/ffmpeg:0= ) ) streaming? ( dev-qt/qtmultimedia:5 ) taglib? ( @@ -57,6 +57,7 @@ COMMON_DEPEND=" " RDEPEND="${COMMON_DEPEND} dev-lang/perl[ithreads] + || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) " DEPEND="${COMMON_DEPEND} dev-qt/qtconcurrent:5 @@ -66,10 +67,7 @@ DEPEND="${COMMON_DEPEND} # cantata has no tests RESTRICT="test" -PATCHES=( - "${FILESDIR}/${PN}-2.2.0-headers.patch" - "${FILESDIR}/${P}-opusfile.patch" -) +PATCHES=( "${FILESDIR}/${PN}-2.2.0-headers.patch" ) src_prepare() { remove_locale() { diff --git a/media-sound/cantata/files/cantata-2.3.2-opusfile.patch b/media-sound/cantata/files/cantata-2.3.2-opusfile.patch deleted file mode 100644 index 956edf1d..00000000 --- a/media-sound/cantata/files/cantata-2.3.2-opusfile.patch +++ /dev/null @@ -1,22 +0,0 @@ -From cdf4363df91475b091ad20000078ca8ef21ce91f Mon Sep 17 00:00:00 2001 -From: Craig Drummond <craig.p.drummond@gmail.com> -Date: Sat, 11 Aug 2018 08:31:40 +0100 -Subject: [PATCH] Add '.opus' to list of recognised extensions for local files. - ---- - models/playqueuemodel.cpp | 2 +- - 1 file changed, 1 insertions(+), 1 deletion(-) - -diff --git a/models/playqueuemodel.cpp b/models/playqueuemodel.cpp -index deaaa78f3..c6c4c4130 100644 ---- a/models/playqueuemodel.cpp -+++ b/models/playqueuemodel.cpp -@@ -89,7 +89,7 @@ QSet<QString> PlayQueueModel::constFileExtensions = QSet<QString>() - << QLatin1String("m4b") << QLatin1String("mp4") << QLatin1String("m4p") << QLatin1String("wav") << QLatin1String("wv") - << QLatin1String("wvp") << QLatin1String("aiff") << QLatin1String("aif") << QLatin1String("aifc") << QLatin1String("ape") - << QLatin1String("spx") << QLatin1String("tta") << QLatin1String("mpc") << QLatin1String("mpp") << QLatin1String("mp+") -- << QLatin1String("dff") << QLatin1String("dsf") -+ << QLatin1String("dff") << QLatin1String("dsf") << QLatin1String("opus") - // And playlists... - << QLatin1String("m3u") << QLatin1String("m3u8") << constPlsPlaylist << constXspfPlaylist; - |