clementine: update to 1.4.0rc1, use system projectM.
Using 1.4.0rc1-343.
This commit is contained in:
parent
1d9afba66a
commit
ce63bb08b8
|
@ -1,36 +0,0 @@
|
||||||
diff --git a/src/widgets/freespacebar.cpp b/src/widgets/freespacebar.cpp
|
|
||||||
index 3067f72..c9789d3 100644
|
|
||||||
--- a/src/widgets/freespacebar.cpp
|
|
||||||
+++ b/src/widgets/freespacebar.cpp
|
|
||||||
@@ -20,6 +20,7 @@
|
|
||||||
|
|
||||||
#include <QLinearGradient>
|
|
||||||
#include <QPainter>
|
|
||||||
+#include <QPainterPath>
|
|
||||||
|
|
||||||
const int FreeSpaceBar::kBarHeight = 20;
|
|
||||||
const int FreeSpaceBar::kBarBorderRadius = 8;
|
|
||||||
diff --git a/src/widgets/osdpretty.cpp b/src/widgets/osdpretty.cpp
|
|
||||||
index 9d95716..30cef7d 100644
|
|
||||||
--- a/src/widgets/osdpretty.cpp
|
|
||||||
+++ b/src/widgets/osdpretty.cpp
|
|
||||||
@@ -26,6 +26,7 @@
|
|
||||||
#include <QLayout>
|
|
||||||
#include <QMouseEvent>
|
|
||||||
#include <QPainter>
|
|
||||||
+#include <QPainterPath>
|
|
||||||
#include <QSettings>
|
|
||||||
#include <QTimer>
|
|
||||||
#include <QTimeLine>
|
|
||||||
diff --git a/src/widgets/sliderwidget.cpp b/src/widgets/sliderwidget.cpp
|
|
||||||
index 581a0de..27b81f7 100644
|
|
||||||
--- a/src/widgets/sliderwidget.cpp
|
|
||||||
+++ b/src/widgets/sliderwidget.cpp
|
|
||||||
@@ -24,6 +24,7 @@
|
|
||||||
#include <QBrush>
|
|
||||||
#include <QImage>
|
|
||||||
#include <QPainter>
|
|
||||||
+#include <QPainterPath>
|
|
||||||
#include <QSize>
|
|
||||||
#include <QTimer>
|
|
||||||
#include <QStyle>
|
|
|
@ -1,15 +1,17 @@
|
||||||
--- a/logging.cpp 2017-09-22 21:33:36.030774014 +0200
|
diff --git a/ext/libclementine-common/core/logging.cpp b/ext/libclementine-common/core/logging.cpp
|
||||||
+++ b/ext/libclementine-common/core/logging.cpp 2017-09-22 21:35:34.327766268 +0200
|
index 8012c0c..ce77c77 100644
|
||||||
|
--- ext/libclementine-common/core/logging.cpp
|
||||||
|
+++ ext/libclementine-common/core/logging.cpp
|
||||||
@@ -21,7 +21,7 @@
|
@@ -21,7 +21,7 @@
|
||||||
#include <QtGlobal>
|
|
||||||
|
|
||||||
#include <cxxabi.h>
|
#include <cxxabi.h>
|
||||||
|
|
||||||
|
#include <QtGlobal>
|
||||||
-#ifdef Q_OS_UNIX
|
-#ifdef Q_OS_UNIX
|
||||||
+#if defined Q_OS_UNIX && defined __GLIBC__
|
+#if defined Q_OS_UNIX && defined __GLIBC__
|
||||||
#include <execinfo.h>
|
#include <execinfo.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@@ -249,7 +249,7 @@
|
@@ -315,7 +315,7 @@ QString DemangleSymbol(const QString& symbol) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void DumpStackTrace() {
|
void DumpStackTrace() {
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
# Template file for 'clementine'
|
# Template file for 'clementine'
|
||||||
pkgname=clementine
|
pkgname=clementine
|
||||||
version=1.3.1
|
_fullver=1.4.0rc1-343-gb49afcc5b
|
||||||
revision=27
|
version=${_fullver%%-*}
|
||||||
_commit=75f18dab23f0842713a4200a7e362efd51b12e31
|
wrksrc=${pkgname}-${_fullver}
|
||||||
wrksrc="Clementine-${_commit}"
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF"
|
configure_args="-DUSE_SYSTEM_TAGLIB=ON -DBUILD_WERROR=OFF -DUSE_SYSTEM_PROJECTM=ON"
|
||||||
hostmakedepends="gettext sparsehash pkg-config qt5-qmake qt5-host-tools protobuf"
|
hostmakedepends="gettext sparsehash pkg-config qt5-qmake qt5-host-tools protobuf"
|
||||||
makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel
|
makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel
|
||||||
qt5-devel glew-devel sqlite-devel protobuf-devel libplist-devel
|
qt5-devel glew-devel sqlite-devel protobuf-devel libplist-devel
|
||||||
|
@ -13,15 +13,14 @@ makedepends="chromaprint-devel boost-devel gst-plugins-base1-devel
|
||||||
taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel)
|
taglib-devel crypto++-devel $(vopt_if spotify libspotify-devel)
|
||||||
libgpod-devel libmygpo-qt-devel qt5-x11extras-devel qt5-plugin-mysql
|
libgpod-devel libmygpo-qt-devel qt5-x11extras-devel qt5-plugin-mysql
|
||||||
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc
|
qt5-plugin-pgsql qt5-plugin-sqlite qt5-plugin-tds qt5-plugin-odbc
|
||||||
qt5-tools-devel liblastfm-qt5-devel libechonest-qt5-devel"
|
qt5-tools-devel liblastfm-qt5-devel libechonest-qt5-devel projectM-devel"
|
||||||
depends="desktop-file-utils"
|
depends="desktop-file-utils"
|
||||||
short_desc="Modern music player and library organizer"
|
short_desc="Modern music player and library organizer"
|
||||||
maintainer="Andrea Brancaleoni <abc@pompel.me>"
|
maintainer="Andrea Brancaleoni <abc@pompel.me>"
|
||||||
license="GPL-3.0-or-later"
|
license="GPL-3.0-or-later"
|
||||||
homepage="https://www.clementine-player.org/"
|
homepage="https://www.clementine-player.org/"
|
||||||
distfiles="https://github.com/clementine-player/Clementine/archive/${_commit}.tar.gz"
|
distfiles="https://github.com/clementine-player/Clementine/releases/download/${_fullver}/${pkgname}-${_fullver}.tar.xz"
|
||||||
checksum=0c29e596cb5acc6970754e3c20616c5474859b7d2e6f05f5cda5c539581e2c8a
|
checksum=e1fa2482b81336282a36a5451a0217c274e5b45aa3eeed83fe3fd29a5df59397
|
||||||
patch_args="-Np1"
|
|
||||||
build_options="spotify"
|
build_options="spotify"
|
||||||
|
|
||||||
case "$XBPS_TARGET_MACHINE" in
|
case "$XBPS_TARGET_MACHINE" in
|
||||||
|
|
Loading…
Reference in New Issue