diff options
| -rw-r--r-- | libre/clementine/PKGBUILD | 17 | ||||
| -rw-r--r-- | libre/clementine/add-missing-functional-includes-5630.patch | 51 | ||||
| -rw-r--r-- | libre/clementine/clementine-1.3.1-chromaprint-1.4.0.patch | 41 | ||||
| -rw-r--r-- | libre/clementine/clementine-gcc6.patch | 22 |
4 files changed, 125 insertions, 6 deletions
diff --git a/libre/clementine/PKGBUILD b/libre/clementine/PKGBUILD index 57d0574b7..540551ea3 100644 --- a/libre/clementine/PKGBUILD +++ b/libre/clementine/PKGBUILD @@ -3,14 +3,15 @@ # Contributor (Arch): Stéphane Gaudreault <stephane@archlinux.org> # Contributor (Arch): BlackEagle <ike.devolder@gmail.com> # Contributor (Arch): Dany Martineau <dany.luc.martineau@gmail.com> -# Maintainer: André Silva <emulatorman@parabola.nu> +# Maintainer (Hyperbola): André Silva <emulatorman@hyperbola.info> +# Contributor (Hyperbola): Márcio Silva <coadde@hyperbola.info> +# Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe> # Contributor: Kete <kete@ninthfloor.org> -# Contributor: Márcio Silva <coadde@parabola.nu> pkgname=clementine _pkgname=$pkgname-libre pkgver=1.3.1 -pkgrel=7.parabola2 +pkgrel=9.parabola1 pkgdesc='A modern music player and library organizer, without nonfree artwork and Spotify support' url="http://www.$pkgname-player.org/" license=('GPL') @@ -30,13 +31,15 @@ optdepends=('gst-plugins-base: "Base" plugin libraries' 'gvfs: Various devices support') mksource=("${pkgname}-${pkgver}.tar.gz::https://github.com/$pkgname-player/${pkgname^}/archive/${pkgver}.tar.gz") source=("https://repo.parabola.nu/other/${_pkgname}/${_pkgname}-${pkgver}.tar.gz" - clementine-gcc6.patch::"https://github.com/clementine-player/Clementine/commit/e31278.patch" - clementine-1.3.1-chromaprint-1.4.0.patch::"https://github.com/clementine-player/Clementine/commit/ded3126.patch" + clementine-gcc6.patch + add-missing-functional-includes-5630.patch + clementine-1.3.1-chromaprint-1.4.0.patch remove-nonfree-artwork-and-spotify.patch moognu.png) mksha256sums=('f885931a9ab7c88607d07b50c64fcce46fc05f13dd2c0a04188c94eff938f37c') sha256sums=('9b84b3b867963da265308b150746aec0faaf5bcd79f78e3363a741edda7286ec' '05bd4dc0138eed084332fa1a688a96858418731f337f54e0d8ab0853123f40ee' + '213a1c2eb3f3c1d2904ed855ad851c10705d04cfa20b36b843b60003469fdc1a' '4cc9c9df599df4a595c6acf4e129a54296c0a8e537627435e3df14e1e95447b0' 'aecd13727a55a4556b70db73519a6ff4cecabefadedad9f952b5499aa5131711' 'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4') @@ -75,8 +78,10 @@ prepare() { # create a blank file because it's a dependency for Clementine touch data/schema/schema-30.sql - # fix build with GCC 6 + # Fix build with GCC 6 patch -p1 -i ../clementine-gcc6.patch + # https://github.com/clementine-player/Clementine/pull/5630 + patch -p1 -i ../add-missing-functional-includes-5630.patch # fix build with chromaprint 1.4.0 patch -p1 -i ../clementine-1.3.1-chromaprint-1.4.0.patch diff --git a/libre/clementine/add-missing-functional-includes-5630.patch b/libre/clementine/add-missing-functional-includes-5630.patch new file mode 100644 index 000000000..0355eefca --- /dev/null +++ b/libre/clementine/add-missing-functional-includes-5630.patch @@ -0,0 +1,51 @@ +From 8a6cc8b5069265e1e92e22def985e22c5955e503 Mon Sep 17 00:00:00 2001 +From: Morris Hafner <mmha@users.noreply.github.com> +Date: Mon, 13 Feb 2017 17:46:46 +0100 +Subject: [PATCH] Add missing <functional> includes (#5630) + +--- + src/core/mergedproxymodel.cpp | 1 + + src/devices/giolister.cpp | 1 + + src/library/groupbydialog.cpp | 2 ++ + 3 files changed, 4 insertions(+) + +diff --git a/src/core/mergedproxymodel.cpp b/src/core/mergedproxymodel.cpp +index 56217f6fd..8c210d391 100644 +--- a/src/core/mergedproxymodel.cpp ++++ b/src/core/mergedproxymodel.cpp +@@ -23,6 +23,7 @@ + + #include <QStringList> + ++#include <functional> + #include <limits> + + // boost::multi_index still relies on these being in the global namespace. +diff --git a/src/devices/giolister.cpp b/src/devices/giolister.cpp +index aa3bddb34..5f63ef248 100644 +--- a/src/devices/giolister.cpp ++++ b/src/devices/giolister.cpp +@@ -17,6 +17,7 @@ + + #include "config.h" + ++#include <functional> + #include <memory> + + #include <QFile> +diff --git a/src/library/groupbydialog.cpp b/src/library/groupbydialog.cpp +index 5efdc9f36..e5f711b34 100644 +--- a/src/library/groupbydialog.cpp ++++ b/src/library/groupbydialog.cpp +@@ -20,6 +20,8 @@ + + #include <QPushButton> + ++#include <functional> ++ + // boost::multi_index still relies on these being in the global namespace. + using std::placeholders::_1; + using std::placeholders::_2; +-- +2.13.4 + diff --git a/libre/clementine/clementine-1.3.1-chromaprint-1.4.0.patch b/libre/clementine/clementine-1.3.1-chromaprint-1.4.0.patch new file mode 100644 index 000000000..099704026 --- /dev/null +++ b/libre/clementine/clementine-1.3.1-chromaprint-1.4.0.patch @@ -0,0 +1,41 @@ +From ded312685735fc266d4154d355286eeb86db3bcd Mon Sep 17 00:00:00 2001 +From: Chocobozzz <florian.bigard@gmail.com> +Date: Thu, 8 Dec 2016 23:12:17 +0100 +Subject: [PATCH] Add compatibility with chromaprint >= 1.4 + +--- + src/musicbrainz/chromaprinter.cpp | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/src/musicbrainz/chromaprinter.cpp b/src/musicbrainz/chromaprinter.cpp +index 9579b62ae..c7ad99e2e 100644 +--- a/src/musicbrainz/chromaprinter.cpp ++++ b/src/musicbrainz/chromaprinter.cpp +@@ -143,16 +143,24 @@ QString Chromaprinter::CreateFingerprint() { + ChromaprintContext* chromaprint = + chromaprint_new(CHROMAPRINT_ALGORITHM_DEFAULT); + chromaprint_start(chromaprint, kDecodeRate, kDecodeChannels); +- chromaprint_feed(chromaprint, reinterpret_cast<void*>(data.data()), ++ chromaprint_feed(chromaprint, reinterpret_cast<int16_t *>(data.data()), + data.size() / 2); + chromaprint_finish(chromaprint); + +- void* fprint = nullptr; + int size = 0; ++ ++#if CHROMAPRINT_VERSION_MAJOR >= 1 && CHROMAPRINT_VERSION_MINOR >= 4 ++ u_int32_t *fprint = nullptr; ++ char *encoded = nullptr; ++#else ++ void *fprint = nullptr; ++ void *encoded = nullptr; ++#endif ++ + int ret = chromaprint_get_raw_fingerprint(chromaprint, &fprint, &size); ++ + QByteArray fingerprint; + if (ret == 1) { +- void* encoded = nullptr; + int encoded_size = 0; + chromaprint_encode_fingerprint(fprint, size, CHROMAPRINT_ALGORITHM_DEFAULT, + &encoded, &encoded_size, 1); diff --git a/libre/clementine/clementine-gcc6.patch b/libre/clementine/clementine-gcc6.patch new file mode 100644 index 000000000..24c38735e --- /dev/null +++ b/libre/clementine/clementine-gcc6.patch @@ -0,0 +1,22 @@ +From e31278c05666f8ae0e819bd831c65e8766ba2679 Mon Sep 17 00:00:00 2001 +From: Bigard Florian <florian.bigard@gmail.com> +Date: Mon, 9 May 2016 11:55:34 +0200 +Subject: [PATCH] Fix projectm compilation with GCC 6 (#5371) + +--- + 3rdparty/libprojectm/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/3rdparty/libprojectm/CMakeLists.txt b/3rdparty/libprojectm/CMakeLists.txt +index e6287f176..0ef785c49 100644 +--- a/3rdparty/libprojectm/CMakeLists.txt ++++ b/3rdparty/libprojectm/CMakeLists.txt +@@ -24,6 +24,8 @@ set(BUILD_PROJECTM_STATIC ON) + set(DISABLE_NATIVE_PRESETS ON) + set(DISABLE_MILKDROP_PRESETS OFF) + ++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++98") ++ + if(DISABLE_NATIVE_PRESETS) + ADD_DEFINITIONS(-DDISABLE_NATIVE_PRESETS) + endif(DISABLE_NATIVE_PRESETS) |