* [gentoo-commits] repo/gentoo:master commit in: media-sound/cantata/, media-sound/cantata/files/
@ 2016-06-06 7:07 Johannes Huber
0 siblings, 0 replies; 7+ messages in thread
From: Johannes Huber @ 2016-06-06 7:07 UTC (permalink / raw
To: gentoo-commits
commit: 1742f8a68cf972a7de7e9e321c279ec008f33396
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 6 07:07:17 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jun 6 07:07:25 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1742f8a6
media-sound/cantata: Remove 2.0.0
Package-Manager: portage-2.3.0_rc1
media-sound/cantata/Manifest | 1 -
media-sound/cantata/cantata-2.0.0.ebuild | 145 ---------------------
.../cantata/files/cantata-2.0.0-ffmpeg-3.0.patch | 12 --
media-sound/cantata/files/cantata-2.0.0-gcc5.patch | 15 ---
4 files changed, 173 deletions(-)
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 574a44a..c7c120f 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1 @@
-DIST cantata-2.0.0.tar.bz2 2147821 SHA256 6817611652e3e37a221e7b68fb41223b421ccc09688bfd718b1f5a2e34e81fa8 SHA512 53cb56411bc6c79692e97d39d8d8cbf5cbbe683fe0c32a8f1222e477deba0ff0e71f5daf0a49cc9c72cefb113278692193964a99ad008a6f9fc0f59304482ed0 WHIRLPOOL bffdc313a97e979f28be4ec28c2a06bf0406e6f23ccf7be2403d9167638d806f5f3e1d5f2e1ca1b376285b6d1586b955be5ba60dd546299d8ef5309ef0878c92
DIST cantata-2.0.1.tar.bz2 2151126 SHA256 122bda13c0b4078b84640dabef444b37d705d71c6f95209a2d949acd28a0bbca SHA512 69ae0c67970ec43f407c5ad11c0ddf254060a16de5023b2fdaf14ad9637ad8be06101ebe6c5cb07283e058400b24d80177b89f10a7be486cdb994aed1ff5ba02 WHIRLPOOL 138fab5ebbe9418b2c2d37b5c479fa7118a4c567f9ecd2a1fe2f4f1ff53e78803ca1f0192c126940ab2409b13448631a6e96e4e1542255378ff2f237df46ea3c
diff --git a/media-sound/cantata/cantata-2.0.0.ebuild b/media-sound/cantata/cantata-2.0.0.ebuild
deleted file mode 100644
index 09091f2..0000000
--- a/media-sound/cantata/cantata-2.0.0.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PLOCALES="cs de en_GB es hu 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="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="cdda cddb http-server kde mtp musicbrainz qt5 replaygain taglib udisks"
-REQUIRED_USE="
- cdda? ( udisks || ( cddb musicbrainz ) )
- cddb? ( cdda taglib )
- mtp? ( taglib udisks )
- musicbrainz? ( cdda taglib )
- qt5? ( !kde )
- replaygain? ( taglib )
-"
-
-RDEPEND="
- dev-db/sqlite:3
- sys-libs/zlib
- x11-libs/libX11
- || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
- cdda? ( media-sound/cdparanoia )
- cddb? ( media-libs/libcddb )
- kde? ( kde-base/kdelibs:4 )
- mtp? ( media-libs/libmtp )
- musicbrainz? ( media-libs/musicbrainz:5 )
- qt5? (
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- )
- !qt5? (
- dev-libs/qjson
- dev-qt/qtcore:4
- dev-qt/qtdbus:4
- dev-qt/qtgui:4
- dev-qt/qtsql:4
- dev-qt/qtsvg:4
- )
- replaygain? (
- media-libs/libebur128
- media-sound/mpg123
- virtual/ffmpeg
- )
- taglib? (
- media-libs/taglib[asf,mp4]
- media-libs/taglib-extras
- !kde? ( udisks? ( sys-fs/udisks:2 ) )
- )
-"
-DEPEND="${RDEPEND}
- kde? ( sys-devel/gettext )
- !kde? ( qt5? ( dev-qt/linguist-tools:5 ) )
-"
-
-# cantata has no tests
-RESTRICT="test"
-PATCHES=(
- "${FILESDIR}/${P}-gcc5.patch"
- "${FILESDIR}/${P}-ffmpeg-3.0.patch"
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # Unbundle 3rd party libs
- rm -rf 3rdparty/qtsingleapplication/ || die
- rm -rf 3rdparty/libebur128/ || die
- # qjson ebuild does not support Qt5 yet
- use qt5 || { rm -rf 3rdparty/qjson/ || die ;}
- use kde && { rm -rf 3rdparty/solid-lite/ || die ;}
-
- l10n_find_plocales_changes 'po' '' '.po'
-}
-
-src_configure() {
- local langs="$(l10n_get_locales)"
-
- local mycmakeargs=(
- -DCANTATA_TRANSLATIONS="${langs// /;}"
- -DENABLE_CDPARANOIA=$(usex cdda)
- -DENABLE_CDDB=$(usex cddb)
- -DENABLE_HTTP_SERVER=$(usex http-server)
- -DENABLE_KDE=$(usex kde)
- -DENABLE_MTP=$(usex mtp)
- -DENABLE_MUSICBRAINZ=$(usex musicbrainz)
- -DENABLE_QT5=$(usex qt5)
- -DENABLE_FFMPEG=$(usex replaygain)
- -DENABLE_MPG123=$(usex replaygain)
- -DENABLE_TAGLIB=$(usex taglib)
- -DENABLE_TAGLIB_EXTRAS=$(usex taglib)
- -DENABLE_DEVICES_SUPPORT=$(usex udisks)
- -DENABLE_HTTP_STREAM_PLAYBACK=OFF
- -DENABLE_REMOTE_DEVICES=OFF
- -DENABLE_UDISKS2=ON
- -DUSE_SYSTEM_MENU_ICON=OFF
- )
-
- if ! use kde; then
- if use qt5; then
- mycmakeargs+=(
- -DLCONVERT_EXECUTABLE="$(qt5_get_bindir)/lconvert"
- -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
- )
- else
- mycmakeargs+=(
- -DLCONVERT_EXECUTABLE="$(qt4_get_bindir)/lconvert"
- -DLRELEASE_EXECUTABLE="$(qt4_get_bindir)/lrelease"
- )
- fi
- fi
-
- 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.0.0-ffmpeg-3.0.patch b/media-sound/cantata/files/cantata-2.0.0-ffmpeg-3.0.patch
deleted file mode 100644
index c0f3455..0000000
--- a/media-sound/cantata/files/cantata-2.0.0-ffmpeg-3.0.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/replaygain/ffmpeginput.cpp b/replaygain/ffmpeginput.cpp
-index 375448d..ab07d5b 100644
---- a/replaygain/ffmpeginput.cpp
-+++ b/replaygain/ffmpeginput.cpp
-@@ -21,7 +21,6 @@ extern "C" {
- #include <libavcodec/avcodec.h>
- #include <libavformat/avformat.h>
- #if LIBAVFORMAT_VERSION_MAJOR >= 54
--#include <libavutil/audioconvert.h>
- #include <libavutil/channel_layout.h>
- #endif
- #ifdef __cplusplus
diff --git a/media-sound/cantata/files/cantata-2.0.0-gcc5.patch b/media-sound/cantata/files/cantata-2.0.0-gcc5.patch
deleted file mode 100644
index bebe3fe..0000000
--- a/media-sound/cantata/files/cantata-2.0.0-gcc5.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 48dd61c..1fe516a 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -279,7 +279,9 @@ if (ENABLE_QT5)
- set(QTINCLUDES ${Qt5Widgets_INCLUDE_DIRS} ${Qt5Network_INCLUDE_DIRS} ${Qt5Xml_INCLUDE_DIRS} ${Qt5Core_INCLUDE_DIRS} ${Qt5Concurrent_INCLUDE_DIRS}
- ${Qt5Svg_INCLUDE_DIRS} ${Qt5Sql_INCLUDE_DIRS})
- add_definitions(${Qt5Widgets_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5Xml_DEFINITIONS} ${Qt5Concurrent_DEFINITIONS} ${Qt5Svg_DEFINITIONS} ${Qt5Sql_DEFINITIONS})
-- set(CMAKE_CXX_FLAGS "${Qt5Widgets_EXECUTABLE_COMPILE_FLAGS}")
-+ if (Qt5_POSITION_INDEPENDENT_CODE)
-+ set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-+ endif (Qt5_POSITION_INDEPENDENT_CODE)
- if (NOT ENABLE_UBUNTU AND NOT APPLE AND NOT WIN32)
- # Does Ubuntu/Touch version need DBus?
- find_package(Qt5DBus)
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/cantata/, media-sound/cantata/files/
@ 2016-11-05 15:43 Michael Palimaka
0 siblings, 0 replies; 7+ messages in thread
From: Michael Palimaka @ 2016-11-05 15:43 UTC (permalink / raw
To: gentoo-commits
commit: 54401847549e3a5ad53811646e63b69327a57376
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Sat Oct 22 21:09:00 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Sat Nov 5 15:42:50 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54401847
media-sound/cantata: Drop USE=kde,qt5 and simplify ebuild
Add fixes for MPRIS and >=Plasma-5.7
X not used with Qt5 - upstream commit c934ae9ed5b8aeb3d8ff6a6b108b3cfe4fb30dea
Package-Manager: portage-2.3.0
media-sound/cantata/cantata-2.0.1-r1.ebuild | 120 +++++++++++++++++++++
.../files/cantata-2.0.1-mpris-plasma57.patch | 46 ++++++++
.../cantata/files/cantata-2.0.1-mpris-true.patch | 100 +++++++++++++++++
.../cantata/files/cantata-2.0.1-qt5-no-X11.patch | 14 +++
4 files changed, 280 insertions(+)
diff --git a/media-sound/cantata/cantata-2.0.1-r1.ebuild b/media-sound/cantata/cantata-2.0.1-r1.ebuild
new file mode 100644
index 00000000..b04563d
--- /dev/null
+++ b/media-sound/cantata/cantata-2.0.1-r1.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PLOCALES="cs de en_GB es fr hu 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="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="cdda cddb http-server mtp musicbrainz replaygain taglib udisks"
+REQUIRED_USE="
+ cdda? ( udisks || ( cddb musicbrainz ) )
+ cddb? ( cdda taglib )
+ mtp? ( taglib udisks )
+ musicbrainz? ( cdda taglib )
+ replaygain? ( taglib )
+"
+
+RDEPEND="
+ dev-db/sqlite:3
+ dev-qt/qtconcurrent:5
+ dev-qt/qtcore:5
+ dev-qt/qtdbus:5
+ dev-qt/qtgui:5
+ dev-qt/qtnetwork:5
+ dev-qt/qtsql:5
+ dev-qt/qtsvg:5
+ dev-qt/qtwidgets:5
+ dev-qt/qtxml:5
+ sys-libs/zlib
+ || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
+ cdda? ( media-sound/cdparanoia )
+ cddb? ( media-libs/libcddb )
+ mtp? ( media-libs/libmtp )
+ musicbrainz? ( media-libs/musicbrainz:5 )
+ replaygain? (
+ media-libs/libebur128
+ media-sound/mpg123
+ virtual/ffmpeg
+ )
+ taglib? (
+ media-libs/taglib[asf(+),mp4(+)]
+ media-libs/taglib-extras
+ udisks? ( sys-fs/udisks:2 )
+ )
+"
+DEPEND="${RDEPEND}
+ dev-qt/linguist-tools:5
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/${P}-mpris-true.patch"
+ "${FILESDIR}/${P}-mpris-plasma57.patch"
+ "${FILESDIR}/${P}-qt5-no-X11.patch"
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # Unbundle 3rd party libs
+ rm -rf 3rdparty/qtsingleapplication/ || die
+ rm -rf 3rdparty/libebur128/ || die
+ # qjson ebuild does not support Qt5 yet
+ rm -rf 3rdparty/qjson/ || die
+
+ l10n_find_plocales_changes 'po' '' '.po'
+}
+
+src_configure() {
+ local langs="$(l10n_get_locales)"
+
+ local mycmakeargs=(
+ -DCANTATA_TRANSLATIONS="${langs// /;}"
+ -DENABLE_CDPARANOIA=$(usex cdda)
+ -DENABLE_CDDB=$(usex cddb)
+ -DENABLE_HTTP_SERVER=$(usex http-server)
+ -DENABLE_MTP=$(usex mtp)
+ -DENABLE_MUSICBRAINZ=$(usex musicbrainz)
+ -DENABLE_QT5=ON
+ -DLCONVERT_EXECUTABLE="$(qt5_get_bindir)/lconvert"
+ -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
+ -DENABLE_FFMPEG=$(usex replaygain)
+ -DENABLE_MPG123=$(usex replaygain)
+ -DENABLE_TAGLIB=$(usex taglib)
+ -DENABLE_TAGLIB_EXTRAS=$(usex taglib)
+ -DENABLE_DEVICES_SUPPORT=$(usex udisks)
+ -DENABLE_HTTP_STREAM_PLAYBACK=OFF
+ -DENABLE_REMOTE_DEVICES=OFF
+ -DENABLE_UDISKS2=ON
+ -DUSE_SYSTEM_MENU_ICON=OFF
+ )
+# -DENABLE_KDE=$(usex kde) # not yet ported to KF5
+
+ 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.0.1-mpris-plasma57.patch b/media-sound/cantata/files/cantata-2.0.1-mpris-plasma57.patch
new file mode 100644
index 00000000..3965b42
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.0.1-mpris-plasma57.patch
@@ -0,0 +1,46 @@
+Work-around KDE 5.7 MPRIS issues.
+
+diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
+index cc2b532..37eec9e 100644
+--- a/gui/mainwindow.cpp
++++ b/gui/mainwindow.cpp
+@@ -1410,8 +1410,8 @@ void MainWindow::setRating()
+ }
+ }
+
+-void MainWindow::readSettings()
+-{
++void MainWindow::initMpris()
++{
+ #ifdef QT_QTDBUS_FOUND
+ if (Settings::self()->mpris()) {
+ if (!mpris) {
+@@ -1424,6 +1424,16 @@ void MainWindow::readSettings()
+ mpris=0;
+ }
+ CurrentCover::self()->setEnabled(mpris || Settings::self()->showPopups() || 0!=Settings::self()->playQueueBackground() || Settings::self()->showCoverWidget());
++ #endif
++}
++
++void MainWindow::readSettings()
++{
++ #ifdef QT_QTDBUS_FOUND
++ // It appears as if the KDE MPRIS code does not like the MPRIS interface to be setup before the window is visible.
++ // to work-around this, initMpris in the next event loop iteration.
++ // See #863
++ QTimer::singleShot(0, this, SLOT(initMpris()));
+ #else
+ CurrentCover::self()->setEnabled(Settings::self()->showPopups() || 0!=Settings::self()->playQueueBackground() || Settings::self()->showCoverWidget());
+ #endif
+diff --git a/gui/mainwindow.h b/gui/mainwindow.h
+index 6d6e960..aa3a80a 100644
+--- a/gui/mainwindow.h
++++ b/gui/mainwindow.h
+@@ -268,6 +268,7 @@ public Q_SLOTS:
+ private Q_SLOTS:
+ void toggleContext();
+ void toggleMenubar();
++ void initMpris();
+
+ private:
+ int prevPage;
diff --git a/media-sound/cantata/files/cantata-2.0.1-mpris-true.patch b/media-sound/cantata/files/cantata-2.0.1-mpris-true.patch
new file mode 100644
index 00000000..c32f745
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.0.1-mpris-true.patch
@@ -0,0 +1,100 @@
+Always return true for MPRIS CanPlay, CanPause, etc.
+
+diff --git a/dbus/mpris.cpp b/dbus/mpris.cpp
+index 4736d19..45a539a 100644
+--- a/dbus/mpris.cpp
++++ b/dbus/mpris.cpp
+@@ -65,6 +65,31 @@ Mpris::~Mpris()
+ QDBusConnection::sessionBus().unregisterService("org.mpris.MediaPlayer2.cantata");
+ }
+
++void Mpris::Pause()
++{
++ if (MPDState_Playing==MPDStatus::self()->state()) {
++ StdActions::self()->playPauseTrackAction->trigger();
++ }
++}
++
++void Mpris::Play()
++{
++ MPDStatus * const status = MPDStatus::self();
++ if (status->playlistLength() && MPDState_Playing!=status->state()) {
++ StdActions::self()->playPauseTrackAction->trigger();
++ }
++}
++
++QString Mpris::PlaybackStatus() const
++{
++ switch(MPDStatus::self()->state()) {
++ case MPDState_Playing: return QLatin1String("Playing");
++ case MPDState_Paused: return QLatin1String("Paused");
++ default:
++ case MPDState_Stopped: return QLatin1String("Stopped");
++ }
++}
++
+ qlonglong Mpris::Position() const
+ {
+ // Cant use MPDStatus, as we dont poll for track position, but use a timer instead!
+diff --git a/dbus/mpris.h b/dbus/mpris.h
+index 64a4fbe..a1578b9 100644
+--- a/dbus/mpris.h
++++ b/dbus/mpris.h
+@@ -71,37 +71,15 @@ class Mpris : public QObject
+ // org.mpris.MediaPlayer2.Player
+ void Next() { StdActions::self()->nextTrackAction->trigger(); }
+ void Previous() { StdActions::self()->prevTrackAction->trigger(); }
+- void Pause() {
+- if (MPDState_Playing==MPDStatus::self()->state()) {
+- StdActions::self()->playPauseTrackAction->trigger();
+- }
+- }
+-
++ void Pause();
+ void PlayPause() { StdActions::self()->playPauseTrackAction->trigger(); }
+ void Stop() { StdActions::self()->stopPlaybackAction->trigger(); }
+ void StopAfterCurrent() { StdActions::self()->stopAfterCurrentTrackAction->trigger(); }
+-
+- void Play() {
+- MPDStatus * const status = MPDStatus::self();
+-
+- if (status->playlistLength() && MPDState_Playing!=status->state()) {
+- StdActions::self()->playPauseTrackAction->trigger();
+- }
+- }
+-
++ void Play();
+ void Seek(qlonglong pos) { emit setSeekId(-1, pos/1000000); }
+ void SetPosition(const QDBusObjectPath &, qlonglong pos) {emit setSeekId(-1, pos/1000000); }
+ void OpenUri(const QString &) { }
+-
+- QString PlaybackStatus() {
+- switch(MPDStatus::self()->state()) {
+- case MPDState_Playing: return QLatin1String("Playing");
+- case MPDState_Paused: return QLatin1String("Paused");
+- default:
+- case MPDState_Stopped: return QLatin1String("Stopped");
+- }
+- }
+-
++ QString PlaybackStatus() const;
+ QString LoopStatus() { return MPDStatus::self()->repeat() ? QLatin1String("Playlist") : QLatin1String("None"); }
+ void SetLoopStatus(const QString &s) { emit setRepeat(QLatin1String("None")!=s); }
+ QVariantMap Metadata() const;
+@@ -115,11 +93,11 @@ class Mpris : public QObject
+ double MinimumRate() const { return 1.0; }
+ double MaximumRate() const { return 1.0; }
+ bool CanControl() const { return true; }
+- bool CanPlay() const { return MPDState_Playing!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>0; }
+- bool CanPause() const { return MPDState_Playing==MPDStatus::self()->state(); }
+- bool CanSeek() const { return -1!=MPDStatus::self()->songId(); }
+- bool CanGoNext() const { return MPDState_Stopped!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>1; }
+- bool CanGoPrevious() const { return MPDState_Stopped!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>1; }
++ bool CanPlay() const { return true; }
++ bool CanPause() const { return true; }
++ bool CanSeek() const { return true; }
++ bool CanGoNext() const { return true; }
++ bool CanGoPrevious() const { return true; }
+
+ // org.mpris.MediaPlayer2
+ bool CanQuit() const { return true; }
diff --git a/media-sound/cantata/files/cantata-2.0.1-qt5-no-X11.patch b/media-sound/cantata/files/cantata-2.0.1-qt5-no-X11.patch
new file mode 100644
index 00000000..de90cd6
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.0.1-qt5-no-X11.patch
@@ -0,0 +1,14 @@
+diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt
+index fcdaf5c..f6160f0 100644
+--- a/support/CMakeLists.txt
++++ b/support/CMakeLists.txt
+@@ -89,7 +89,7 @@ if (NOT ENABLE_UBUNTU AND NOT ENABLE_WEB)
+
+ add_library(support STATIC ${SUPPORT_MOC_SRCS} ${SUPPORT_SRCS} ${SUPPORT_UI_HDRS} ${SUPPORT_RC_SRCS})
+
+- if (X11_FOUND)
++ if (NOT ENABLE_QT5 AND X11_FOUND)
+ target_link_libraries(support ${X11_LIBRARIES})
+- endif (X11_FOUND)
++ endif (NOT ENABLE_QT5 AND X11_FOUND)
+ endif (NOT ENABLE_UBUNTU AND NOT ENABLE_WEB)
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/cantata/, media-sound/cantata/files/
@ 2017-08-02 21:37 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2017-08-02 21:37 UTC (permalink / raw
To: gentoo-commits
commit: 8606353ff85e982c42f8d10e519af8cf15d47b48
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 2 21:33:55 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 2 21:34:32 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8606353f
media-sound/cantata: Drop old
Package-Manager: Portage-2.3.6, Repoman-2.3.1
media-sound/cantata/Manifest | 1 -
media-sound/cantata/cantata-2.0.1-r1.ebuild | 120 ---------------------
.../files/cantata-2.0.1-mpris-plasma57.patch | 46 --------
.../cantata/files/cantata-2.0.1-mpris-true.patch | 100 -----------------
.../cantata/files/cantata-2.0.1-qt5-no-X11.patch | 14 ---
5 files changed, 281 deletions(-)
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 6b8b4883803..220f9d133c3 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1 @@
-DIST cantata-2.0.1.tar.bz2 2151126 SHA256 122bda13c0b4078b84640dabef444b37d705d71c6f95209a2d949acd28a0bbca SHA512 69ae0c67970ec43f407c5ad11c0ddf254060a16de5023b2fdaf14ad9637ad8be06101ebe6c5cb07283e058400b24d80177b89f10a7be486cdb994aed1ff5ba02 WHIRLPOOL 138fab5ebbe9418b2c2d37b5c479fa7118a4c567f9ecd2a1fe2f4f1ff53e78803ca1f0192c126940ab2409b13448631a6e96e4e1542255378ff2f237df46ea3c
DIST cantata-2.1.0.tar.bz2 2207271 SHA256 9317afcae75c709ec733da069d4245b47e6e2c297a259eaf87a181fa9d1cd4c4 SHA512 bf03933785110d0d0c1dfbfc27f4974869ae7c79afe3cf1da1f3024c95d86733d8bea77f2a882887de79a7897ffcdac4262e58747dd4e979824943991675c5d2 WHIRLPOOL 5d58b84290c387d535e556553e64bba36520a099565c44bed1c4e9cf800c2a432ac09296b989a557e72d81a951c926b4bb638f2d2ab7976735059ebb74b8c8e2
diff --git a/media-sound/cantata/cantata-2.0.1-r1.ebuild b/media-sound/cantata/cantata-2.0.1-r1.ebuild
deleted file mode 100644
index 5b524f4a4fb..00000000000
--- a/media-sound/cantata/cantata-2.0.1-r1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PLOCALES="cs de en_GB es fr hu 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 http-server mtp musicbrainz replaygain taglib udisks"
-REQUIRED_USE="
- cdda? ( udisks || ( cddb musicbrainz ) )
- cddb? ( cdda taglib )
- mtp? ( taglib udisks )
- musicbrainz? ( cdda taglib )
- replaygain? ( taglib )
-"
-
-RDEPEND="
- dev-db/sqlite:3
- dev-qt/qtconcurrent:5
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtnetwork:5
- dev-qt/qtsql:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- sys-libs/zlib
- || ( kde-frameworks/breeze-icons:5 kde-frameworks/oxygen-icons:* )
- cdda? ( media-sound/cdparanoia )
- cddb? ( media-libs/libcddb )
- mtp? ( media-libs/libmtp )
- musicbrainz? ( media-libs/musicbrainz:5= )
- replaygain? (
- media-libs/libebur128
- media-sound/mpg123
- virtual/ffmpeg
- )
- taglib? (
- media-libs/taglib[asf(+),mp4(+)]
- media-libs/taglib-extras
- udisks? ( sys-fs/udisks:2 )
- )
-"
-DEPEND="${RDEPEND}
- dev-qt/linguist-tools:5
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${P}-mpris-true.patch"
- "${FILESDIR}/${P}-mpris-plasma57.patch"
- "${FILESDIR}/${P}-qt5-no-X11.patch"
-)
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # Unbundle 3rd party libs
- rm -rf 3rdparty/qtsingleapplication/ || die
- rm -rf 3rdparty/libebur128/ || die
- # qjson ebuild does not support Qt5 yet
- rm -rf 3rdparty/qjson/ || die
-
- l10n_find_plocales_changes 'po' '' '.po'
-}
-
-src_configure() {
- local langs="$(l10n_get_locales)"
-
- local mycmakeargs=(
- -DCANTATA_HELPERS_LIB_DIR="$(get_libdir)"
- -DCANTATA_TRANSLATIONS="${langs// /;}"
- -DENABLE_CDPARANOIA=$(usex cdda)
- -DENABLE_CDDB=$(usex cddb)
- -DENABLE_HTTP_SERVER=$(usex http-server)
- -DENABLE_MTP=$(usex mtp)
- -DENABLE_MUSICBRAINZ=$(usex musicbrainz)
- -DENABLE_QT5=ON
- -DLCONVERT_EXECUTABLE="$(qt5_get_bindir)/lconvert"
- -DLRELEASE_EXECUTABLE="$(qt5_get_bindir)/lrelease"
- -DENABLE_FFMPEG=$(usex replaygain)
- -DENABLE_MPG123=$(usex replaygain)
- -DENABLE_TAGLIB=$(usex taglib)
- -DENABLE_TAGLIB_EXTRAS=$(usex taglib)
- -DENABLE_DEVICES_SUPPORT=$(usex udisks)
- -DENABLE_HTTP_STREAM_PLAYBACK=OFF
- -DENABLE_REMOTE_DEVICES=OFF
- -DENABLE_UDISKS2=ON
- -DUSE_SYSTEM_MENU_ICON=OFF
- )
-# -DENABLE_KDE=$(usex kde) # not yet ported to KF5
-
- 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.0.1-mpris-plasma57.patch b/media-sound/cantata/files/cantata-2.0.1-mpris-plasma57.patch
deleted file mode 100644
index 3965b425a93..00000000000
--- a/media-sound/cantata/files/cantata-2.0.1-mpris-plasma57.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-Work-around KDE 5.7 MPRIS issues.
-
-diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
-index cc2b532..37eec9e 100644
---- a/gui/mainwindow.cpp
-+++ b/gui/mainwindow.cpp
-@@ -1410,8 +1410,8 @@ void MainWindow::setRating()
- }
- }
-
--void MainWindow::readSettings()
--{
-+void MainWindow::initMpris()
-+{
- #ifdef QT_QTDBUS_FOUND
- if (Settings::self()->mpris()) {
- if (!mpris) {
-@@ -1424,6 +1424,16 @@ void MainWindow::readSettings()
- mpris=0;
- }
- CurrentCover::self()->setEnabled(mpris || Settings::self()->showPopups() || 0!=Settings::self()->playQueueBackground() || Settings::self()->showCoverWidget());
-+ #endif
-+}
-+
-+void MainWindow::readSettings()
-+{
-+ #ifdef QT_QTDBUS_FOUND
-+ // It appears as if the KDE MPRIS code does not like the MPRIS interface to be setup before the window is visible.
-+ // to work-around this, initMpris in the next event loop iteration.
-+ // See #863
-+ QTimer::singleShot(0, this, SLOT(initMpris()));
- #else
- CurrentCover::self()->setEnabled(Settings::self()->showPopups() || 0!=Settings::self()->playQueueBackground() || Settings::self()->showCoverWidget());
- #endif
-diff --git a/gui/mainwindow.h b/gui/mainwindow.h
-index 6d6e960..aa3a80a 100644
---- a/gui/mainwindow.h
-+++ b/gui/mainwindow.h
-@@ -268,6 +268,7 @@ public Q_SLOTS:
- private Q_SLOTS:
- void toggleContext();
- void toggleMenubar();
-+ void initMpris();
-
- private:
- int prevPage;
diff --git a/media-sound/cantata/files/cantata-2.0.1-mpris-true.patch b/media-sound/cantata/files/cantata-2.0.1-mpris-true.patch
deleted file mode 100644
index c32f745b82f..00000000000
--- a/media-sound/cantata/files/cantata-2.0.1-mpris-true.patch
+++ /dev/null
@@ -1,100 +0,0 @@
-Always return true for MPRIS CanPlay, CanPause, etc.
-
-diff --git a/dbus/mpris.cpp b/dbus/mpris.cpp
-index 4736d19..45a539a 100644
---- a/dbus/mpris.cpp
-+++ b/dbus/mpris.cpp
-@@ -65,6 +65,31 @@ Mpris::~Mpris()
- QDBusConnection::sessionBus().unregisterService("org.mpris.MediaPlayer2.cantata");
- }
-
-+void Mpris::Pause()
-+{
-+ if (MPDState_Playing==MPDStatus::self()->state()) {
-+ StdActions::self()->playPauseTrackAction->trigger();
-+ }
-+}
-+
-+void Mpris::Play()
-+{
-+ MPDStatus * const status = MPDStatus::self();
-+ if (status->playlistLength() && MPDState_Playing!=status->state()) {
-+ StdActions::self()->playPauseTrackAction->trigger();
-+ }
-+}
-+
-+QString Mpris::PlaybackStatus() const
-+{
-+ switch(MPDStatus::self()->state()) {
-+ case MPDState_Playing: return QLatin1String("Playing");
-+ case MPDState_Paused: return QLatin1String("Paused");
-+ default:
-+ case MPDState_Stopped: return QLatin1String("Stopped");
-+ }
-+}
-+
- qlonglong Mpris::Position() const
- {
- // Cant use MPDStatus, as we dont poll for track position, but use a timer instead!
-diff --git a/dbus/mpris.h b/dbus/mpris.h
-index 64a4fbe..a1578b9 100644
---- a/dbus/mpris.h
-+++ b/dbus/mpris.h
-@@ -71,37 +71,15 @@ class Mpris : public QObject
- // org.mpris.MediaPlayer2.Player
- void Next() { StdActions::self()->nextTrackAction->trigger(); }
- void Previous() { StdActions::self()->prevTrackAction->trigger(); }
-- void Pause() {
-- if (MPDState_Playing==MPDStatus::self()->state()) {
-- StdActions::self()->playPauseTrackAction->trigger();
-- }
-- }
--
-+ void Pause();
- void PlayPause() { StdActions::self()->playPauseTrackAction->trigger(); }
- void Stop() { StdActions::self()->stopPlaybackAction->trigger(); }
- void StopAfterCurrent() { StdActions::self()->stopAfterCurrentTrackAction->trigger(); }
--
-- void Play() {
-- MPDStatus * const status = MPDStatus::self();
--
-- if (status->playlistLength() && MPDState_Playing!=status->state()) {
-- StdActions::self()->playPauseTrackAction->trigger();
-- }
-- }
--
-+ void Play();
- void Seek(qlonglong pos) { emit setSeekId(-1, pos/1000000); }
- void SetPosition(const QDBusObjectPath &, qlonglong pos) {emit setSeekId(-1, pos/1000000); }
- void OpenUri(const QString &) { }
--
-- QString PlaybackStatus() {
-- switch(MPDStatus::self()->state()) {
-- case MPDState_Playing: return QLatin1String("Playing");
-- case MPDState_Paused: return QLatin1String("Paused");
-- default:
-- case MPDState_Stopped: return QLatin1String("Stopped");
-- }
-- }
--
-+ QString PlaybackStatus() const;
- QString LoopStatus() { return MPDStatus::self()->repeat() ? QLatin1String("Playlist") : QLatin1String("None"); }
- void SetLoopStatus(const QString &s) { emit setRepeat(QLatin1String("None")!=s); }
- QVariantMap Metadata() const;
-@@ -115,11 +93,11 @@ class Mpris : public QObject
- double MinimumRate() const { return 1.0; }
- double MaximumRate() const { return 1.0; }
- bool CanControl() const { return true; }
-- bool CanPlay() const { return MPDState_Playing!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>0; }
-- bool CanPause() const { return MPDState_Playing==MPDStatus::self()->state(); }
-- bool CanSeek() const { return -1!=MPDStatus::self()->songId(); }
-- bool CanGoNext() const { return MPDState_Stopped!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>1; }
-- bool CanGoPrevious() const { return MPDState_Stopped!=MPDStatus::self()->state() && MPDStatus::self()->playlistLength()>1; }
-+ bool CanPlay() const { return true; }
-+ bool CanPause() const { return true; }
-+ bool CanSeek() const { return true; }
-+ bool CanGoNext() const { return true; }
-+ bool CanGoPrevious() const { return true; }
-
- // org.mpris.MediaPlayer2
- bool CanQuit() const { return true; }
diff --git a/media-sound/cantata/files/cantata-2.0.1-qt5-no-X11.patch b/media-sound/cantata/files/cantata-2.0.1-qt5-no-X11.patch
deleted file mode 100644
index de90cd68450..00000000000
--- a/media-sound/cantata/files/cantata-2.0.1-qt5-no-X11.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/support/CMakeLists.txt b/support/CMakeLists.txt
-index fcdaf5c..f6160f0 100644
---- a/support/CMakeLists.txt
-+++ b/support/CMakeLists.txt
-@@ -89,7 +89,7 @@ if (NOT ENABLE_UBUNTU AND NOT ENABLE_WEB)
-
- add_library(support STATIC ${SUPPORT_MOC_SRCS} ${SUPPORT_SRCS} ${SUPPORT_UI_HDRS} ${SUPPORT_RC_SRCS})
-
-- if (X11_FOUND)
-+ if (NOT ENABLE_QT5 AND X11_FOUND)
- target_link_libraries(support ${X11_LIBRARIES})
-- endif (X11_FOUND)
-+ endif (NOT ENABLE_QT5 AND X11_FOUND)
- endif (NOT ENABLE_UBUNTU AND NOT ENABLE_WEB)
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/cantata/, media-sound/cantata/files/
@ 2018-03-16 21:30 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-03-16 21:30 UTC (permalink / raw
To: gentoo-commits
commit: 95bbffe23369fa825ded61227a0ff6a40a277086
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 16 20:56:40 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Fri Mar 16 21:29:58 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95bbffe2
media-sound/cantata: Fix runtime crash w/ >=dev-qt/qtsql-5.10
Reported-by: Franz Fellner <alpine.art.de <AT> gmail.com>
Closes: https://bugs.gentoo.org/642196
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-sound/cantata/cantata-2.2.0-r1.ebuild | 122 +++++++++++++++++++++
.../cantata/files/cantata-2.2.0-qtsql-5.10.patch | 23 ++++
2 files changed, 145 insertions(+)
diff --git a/media-sound/cantata/cantata-2.2.0-r1.ebuild b/media-sound/cantata/cantata-2.2.0-r1.ebuild
new file mode 100644
index 00000000000..9b255bbabbb
--- /dev/null
+++ b/media-sound/cantata/cantata-2.2.0-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 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 )
+ 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? ( 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"
+ "${FILESDIR}/${P}-qtsql-5.10.patch" # bug 642196
+)
+
+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_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
+
+ has_version media-sound/mpd || \
+ elog "An instance of media-sound/mpd, local or remote, is required to set up Cantata."
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+ xdg_pkg_postrm
+}
diff --git a/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch b/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch
new file mode 100644
index 00000000000..16cb6d8c2d1
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.2.0-qtsql-5.10.patch
@@ -0,0 +1,23 @@
+From 4da7a9128f2c5eaf23ae2a5006d300dc4f21fc6a Mon Sep 17 00:00:00 2001
+From: Craig Drummond <craig.p.drummond@gmail.com>
+Date: Tue, 28 Nov 2017 22:37:01 +0000
+Subject: [PATCH] Create QSqlQuery, then call prepare Issue #1130
+
+---
+ db/librarydb.cpp | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/db/librarydb.cpp b/db/librarydb.cpp
+index 603d8abc1..4f75dc28f 100644
+--- a/db/librarydb.cpp
++++ b/db/librarydb.cpp
+@@ -453,7 +453,8 @@ class SqlQuery
+ if (limit>0) {
+ sql+=" LIMIT "+QString::number(limit);
+ }
+- query=QSqlQuery(sql, db);
++ query = QSqlQuery(db);
++ query.prepare(sql);
+
+ for (const QVariant &value: boundValues) {
+ query.addBindValue(value);
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/cantata/, media-sound/cantata/files/
@ 2018-09-03 20:15 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2018-09-03 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 7d434c0351d4a9b48f353a5d89eb13bd46735be9
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 3 20:04:52 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Mon Sep 3 20:04:52 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d434c03
media-sound/cantata: 2.3.2 version bump
Package-Manager: Portage-2.3.48, Repoman-2.3.10
media-sound/cantata/Manifest | 1 +
media-sound/cantata/cantata-2.3.2.ebuild | 125 +++++++++++++++++++++
.../cantata/files/cantata-2.3.2-opusfile.patch | 22 ++++
3 files changed, 148 insertions(+)
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index 28f944978e8..cef8831345c 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1,3 @@
DIST cantata-2.2.0.tar.bz2 2251649 BLAKE2B 9b28a4e3a77245fcf00f81780adecdc51e066f068798f92300ef8527872313f5fb56d4b90a6f5511caf951ba9fcd5c094dd5e9062fe3d314b75412b3e8e03d37 SHA512 519a2e24c8b2a1c98a2006a1f590945e1bd5e98a2c3a1b5da23e40f2297f1477d48d69b48ec669219f5ab8fdc955486fe29db6914abeef1fba2a47377f694ecd
DIST cantata-2.3.1.tar.bz2 2414702 BLAKE2B c44f7e95091dd4f84e630236e7f681d2ea47cd90705cdeeb17d3e892d4e0b978f88d4cb648841543494670c5dbc1a00ba9e2377dfd684b2fdee9223d4b6b28e3 SHA512 8199b08b1f3d2111fc50fbc4e5b1edced6ac480fd213a11eee569deeebf3a3f1167c2b53c3117bb90b2b81b46792c56b99b65eae5d2b290c0f3b3f90736108e5
+DIST cantata-2.3.2.tar.bz2 2440595 BLAKE2B d77a41752ff9660f27da11748497b394667f456edf52d785b3ebf31446045a4de2bcc9b22ac2d68dfd4e0f00d10a53ae9e79643e116783879eb68bab48b59589 SHA512 d55ee5f2194626db3465d8c499459bac82656e12bdb5f771581eef9d6a42ee25fc9b31e8bb5cea8913cbd47a967141f990efddb353797f81e722b7b99a73b1a4
diff --git a/media-sound/cantata/cantata-2.3.2.ebuild b/media-sound/cantata/cantata-2.3.2.ebuild
new file mode 100644
index 00000000000..db85ccf2fbc
--- /dev/null
+++ b/media-sound/cantata/cantata-2.3.2.ebuild
@@ -0,0 +1,125 @@
+# 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="
+ 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 )
+ 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/files/cantata-2.3.2-opusfile.patch b/media-sound/cantata/files/cantata-2.3.2-opusfile.patch
new file mode 100644
index 00000000000..956edf1d513
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.3.2-opusfile.patch
@@ -0,0 +1,22 @@
+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;
+
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/cantata/, media-sound/cantata/files/
@ 2019-02-17 16:19 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2019-02-17 16:19 UTC (permalink / raw
To: gentoo-commits
commit: 564cb54b235260ec1550e33bc2e4750cafc2226f
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 17 16:11:25 2019 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 17 16:12:59 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564cb54b
media-sound/cantata: Fix bundled solid-lite static linking
Thanks-to: Bigos <wielkiegie <AT> gmail.com>
Closes: https://bugs.gentoo.org/678228
Package-Manager: Portage-2.3.60, Repoman-2.3.12
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/cantata/cantata-2.3.3-r1.ebuild | 122 +++++++++++++++++++++
.../files/cantata-2.3.3-solidlite-static.patch | 29 +++++
2 files changed, 151 insertions(+)
diff --git a/media-sound/cantata/cantata-2.3.3-r1.ebuild b/media-sound/cantata/cantata-2.3.3-r1.ebuild
new file mode 100644
index 00000000000..0e490d59668
--- /dev/null
+++ b/media-sound/cantata/cantata-2.3.3-r1.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
+inherit cmake-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/${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 )
+"
+
+BDEPEND="
+ dev-qt/linguist-tools:5
+"
+COMMON_DEPEND="
+ 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
+ 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
+"
+
+# cantata has no tests
+RESTRICT="test"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.0-headers.patch"
+ "${FILESDIR}/${P}-solidlite-static.patch" # bug 678228
+)
+
+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() {
+ xdg_pkg_postinst
+
+ 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
+}
diff --git a/media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch b/media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch
new file mode 100644
index 00000000000..891917eebcb
--- /dev/null
+++ b/media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch
@@ -0,0 +1,29 @@
+From aa35362aa2835e9e2903f5f785f10402a6abd3a1 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Sun, 17 Feb 2019 16:58:48 +0100
+Subject: [PATCH] Fix solid-lite static linking
+
+If BUILD_SHARED_LIBS is part of standard system cmake args:
+
+ cantata: error while loading shared libraries: libsolidlite.so:
+ cannot open shared object file: No such file or directory
+---
+ 3rdparty/solid-lite/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/3rdparty/solid-lite/CMakeLists.txt b/3rdparty/solid-lite/CMakeLists.txt
+index 4ae51aab..86e37189 100644
+--- a/3rdparty/solid-lite/CMakeLists.txt
++++ b/3rdparty/solid-lite/CMakeLists.txt
+@@ -202,7 +202,7 @@ if(APPLE)
+ set(solidlite_OPTIONAL_LIBS ${IOKIT_LIBRARY})
+ endif()
+
+-add_library(solidlite ${solidlite_LIB_SRCS})
++add_library(solidlite STATIC ${solidlite_LIB_SRCS})
+
+ if ( UDEV_FOUND )
+ set(solidlite_OPTIONAL_LIBS ${solidlite_OPTIONAL_LIBS} ${UDEV_LIBS})
+--
+2.20.1
+
^ permalink raw reply related [flat|nested] 7+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: media-sound/cantata/, media-sound/cantata/files/
@ 2020-03-25 18:20 Andreas Sturmlechner
0 siblings, 0 replies; 7+ messages in thread
From: Andreas Sturmlechner @ 2020-03-25 18:20 UTC (permalink / raw
To: gentoo-commits
commit: d46312c6d1cb76d6d2191da8f8133bda9bf85690
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 25 15:55:44 2020 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Mar 25 18:20:33 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d46312c6
media-sound/cantata: Drop 2.3.3-r1
Package-Manager: Portage-2.3.96, Repoman-2.3.21
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-sound/cantata/Manifest | 1 -
media-sound/cantata/cantata-2.3.3-r1.ebuild | 122 ---------------------
.../files/cantata-2.3.3-solidlite-static.patch | 29 -----
3 files changed, 152 deletions(-)
diff --git a/media-sound/cantata/Manifest b/media-sound/cantata/Manifest
index dbc8d81d796..4e50119d2f5 100644
--- a/media-sound/cantata/Manifest
+++ b/media-sound/cantata/Manifest
@@ -1,2 +1 @@
-DIST cantata-2.3.3.tar.bz2 2445139 BLAKE2B 679ac68afa6219aa684aed1202bb2268552f6fe560db36e17748b9b220ae6ec4ef103ff68b3bcc7127835f8a2debd32895f5edf319a759ce78bc161c4e540a84 SHA512 8314930c9e16a5811f607f131ce7134daa0c6de81c5f87d45967c076895540b388b89b3f2cbd82950f6defb1087e61923c1719670f19b4ed3c074f05fe8577c6
DIST cantata-2.4.1.tar.bz2 2550982 BLAKE2B 1d965ce4a5a73d4695b51def9753c95376b71367f2e6abf69681aad84e387d86d87abcf623f613a517e5e08a633e4e9bf2bae2d28858535fac2f05ade73a6c01 SHA512 9bb9953f41ad562e186c201505db6ea42dccdcb0b60e0c6eda0c5521428ecafdba95b51e8827de3498b2b25284d36f800bfa96a49839d2a69e0f92705f44a439
diff --git a/media-sound/cantata/cantata-2.3.3-r1.ebuild b/media-sound/cantata/cantata-2.3.3-r1.ebuild
deleted file mode 100644
index b29c21cf273..00000000000
--- a/media-sound/cantata/cantata-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PLOCALES="cs da de en_GB es fr hu it ja ko pl pt_BR ru zh_CN"
-inherit cmake 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/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 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 )
-"
-
-BDEPEND="
- dev-qt/linguist-tools:5
-"
-COMMON_DEPEND="
- 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
- 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
-"
-
-# cantata has no tests
-RESTRICT="test"
-
-PATCHES=(
- "${FILESDIR}/${PN}-2.2.0-headers.patch"
- "${FILESDIR}/${P}-solidlite-static.patch" # bug 678228
-)
-
-src_prepare() {
- remove_locale() {
- rm "translations/${PN}_${1}".ts || die
- }
-
- cmake_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_src_configure
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-
- 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
-}
diff --git a/media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch b/media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch
deleted file mode 100644
index 891917eebcb..00000000000
--- a/media-sound/cantata/files/cantata-2.3.3-solidlite-static.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From aa35362aa2835e9e2903f5f785f10402a6abd3a1 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date: Sun, 17 Feb 2019 16:58:48 +0100
-Subject: [PATCH] Fix solid-lite static linking
-
-If BUILD_SHARED_LIBS is part of standard system cmake args:
-
- cantata: error while loading shared libraries: libsolidlite.so:
- cannot open shared object file: No such file or directory
----
- 3rdparty/solid-lite/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/3rdparty/solid-lite/CMakeLists.txt b/3rdparty/solid-lite/CMakeLists.txt
-index 4ae51aab..86e37189 100644
---- a/3rdparty/solid-lite/CMakeLists.txt
-+++ b/3rdparty/solid-lite/CMakeLists.txt
-@@ -202,7 +202,7 @@ if(APPLE)
- set(solidlite_OPTIONAL_LIBS ${IOKIT_LIBRARY})
- endif()
-
--add_library(solidlite ${solidlite_LIB_SRCS})
-+add_library(solidlite STATIC ${solidlite_LIB_SRCS})
-
- if ( UDEV_FOUND )
- set(solidlite_OPTIONAL_LIBS ${solidlite_OPTIONAL_LIBS} ${UDEV_LIBS})
---
-2.20.1
-
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2020-03-25 18:20 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-06 7:07 [gentoo-commits] repo/gentoo:master commit in: media-sound/cantata/, media-sound/cantata/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2016-11-05 15:43 Michael Palimaka
2017-08-02 21:37 Andreas Sturmlechner
2018-03-16 21:30 Andreas Sturmlechner
2018-09-03 20:15 Andreas Sturmlechner
2019-02-17 16:19 Andreas Sturmlechner
2020-03-25 18:20 Andreas Sturmlechner
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox