From aebba9e51d7d69908a70a11a9ca1241bfb076484 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sun, 13 Jan 2019 19:28:51 +0000 Subject: media-sound/cantata : version bump --- media-sound/cantata/Manifest | 2 +- media-sound/cantata/cantata-2.3.2-r1.ebuild | 127 --------------------- media-sound/cantata/cantata-2.3.3-r1337.ebuild | 125 ++++++++++++++++++++ .../cantata/files/cantata-2.3.2-opusfile.patch | 22 ---- 4 files changed, 126 insertions(+), 150 deletions(-) delete mode 100644 media-sound/cantata/cantata-2.3.2-r1.ebuild create mode 100644 media-sound/cantata/cantata-2.3.3-r1337.ebuild delete mode 100644 media-sound/cantata/files/cantata-2.3.2-opusfile.patch 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.2-r1.ebuild deleted file mode 100644 index d8af6410..00000000 --- a/media-sound/cantata/cantata-2.3.2-r1.ebuild +++ /dev/null @@ -1,127 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN" -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" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="cdda cddb cdio http-server mtp musicbrainz replaygain streaming taglib udisks zeroconf" -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 ) -" - -COMMON_DEPEND=" - app-misc/media-player-info - 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 - media-sound/mpd - || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) - sys-libs/zlib - virtual/libudev:= - cdda? ( media-sound/cdparanoia ) - cddb? ( media-libs/libcddb ) - cdio? ( dev-libs/libcdio-paranoia ) - mtp? ( media-libs/libmtp ) - musicbrainz? ( media-libs/musicbrainz:5= ) - replaygain? ( - media-libs/libebur128 - media-sound/mpg123 - virtual/ffmpeg - ) - streaming? ( dev-qt/qtmultimedia:5 ) - taglib? ( - media-libs/taglib[asf(+),mp4(+)] - udisks? ( sys-fs/udisks:2 ) - ) - zeroconf? ( net-dns/avahi ) -" -RDEPEND="${COMMON_DEPEND} - dev-lang/perl[ithreads] -" -DEPEND="${COMMON_DEPEND} - dev-qt/qtconcurrent:5 - dev-qt/linguist-tools:5 -" - -# cantata has no tests -RESTRICT="test" - -PATCHES=( - "${FILESDIR}/${PN}-2.2.0-headers.patch" - "${FILESDIR}/${P}-opusfile.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_CDDB=$(usex cddb) - -DENABLE_CDIOPARANOIA=$(usex cdio) - -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_DEVICES_SUPPORT=$(usex udisks) - -DENABLE_AVAHI=$(usex zeroconf) - -DENABLE_REMOTE_DEVICES=OFF - -DENABLE_UDISKS2=ON - ) - - cmake-utils_src_configure -} - -pkg_postinst() { - gnome2_icon_cache_update - xdg_desktop_database_update - - has_version media-sound/mpd || \ - elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata." - - if ! has_version app-misc/media-player-info; then - elog "Install app-misc/media-player-info to enable identification" - elog "and querying of portable media players" - fi -} - -pkg_postrm() { - gnome2_icon_cache_update - xdg_desktop_database_update -} diff --git a/media-sound/cantata/cantata-2.3.3-r1337.ebuild b/media-sound/cantata/cantata-2.3.3-r1337.ebuild new file mode 100644 index 00000000..6d68923d --- /dev/null +++ b/media-sound/cantata/cantata-2.3.3-r1337.ebuild @@ -0,0 +1,125 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN" +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/${PN}/releases/download/v${PV}/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cdda cddb cdio http-server libav mtp musicbrainz replaygain streaming taglib udisks zeroconf" +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 ) +" + +COMMON_DEPEND=" + app-misc/media-player-info + 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 + media-sound/mpd + sys-libs/zlib + virtual/libudev:= + cdda? ( media-sound/cdparanoia ) + cddb? ( media-libs/libcddb ) + cdio? ( dev-libs/libcdio-paranoia ) + mtp? ( media-libs/libmtp ) + musicbrainz? ( media-libs/musicbrainz:5= ) + replaygain? ( + media-libs/libebur128 + media-sound/mpg123 + libav? ( media-video/libav:= ) + !libav? ( media-video/ffmpeg:0= ) + ) + streaming? ( dev-qt/qtmultimedia:5 ) + taglib? ( + media-libs/taglib[asf(+),mp4(+)] + udisks? ( sys-fs/udisks:2 ) + ) + zeroconf? ( net-dns/avahi ) +" +RDEPEND="${COMMON_DEPEND} + dev-lang/perl[ithreads] + || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* ) +" +DEPEND="${COMMON_DEPEND} + dev-qt/qtconcurrent:5 + dev-qt/linguist-tools:5 +" + +# cantata has no tests +RESTRICT="test" + +PATCHES=( "${FILESDIR}/${PN}-2.2.0-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_CDDB=$(usex cddb) + -DENABLE_CDIOPARANOIA=$(usex cdio) + -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_DEVICES_SUPPORT=$(usex udisks) + -DENABLE_AVAHI=$(usex zeroconf) + -DENABLE_REMOTE_DEVICES=OFF + -DENABLE_UDISKS2=ON + ) + + cmake-utils_src_configure +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + + has_version media-sound/mpd || \ + elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata." + + if ! has_version app-misc/media-player-info; then + elog "Install app-misc/media-player-info to enable identification" + elog "and querying of portable media players" + fi +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} 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 -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 PlayQueueModel::constFileExtensions = QSet() - << 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; - -- cgit v1.2.3