summaryrefslogtreecommitdiff
path: root/libre/clementine/clementine-1.3.1-chromaprint-1.4.0.patch
diff options
context:
space:
mode:
authorOmar Vega Ramos <ovruni@gnu.org.pe>2017-08-06 16:34:03 -0500
committerOmar Vega Ramos <ovruni@gnu.org.pe>2017-08-06 16:34:03 -0500
commitf3718e975c91fd89b6af19408621b37f34b06c5a (patch)
tree0bb75c60da06c587943d3e5c32dd56c74299cd2a /libre/clementine/clementine-1.3.1-chromaprint-1.4.0.patch
parent12a5b238a074a6b2e9d3e623661d3c301ff61bdf (diff)
downloadabslibre-f3718e975c91fd89b6af19408621b37f34b06c5a.tar.gz
abslibre-f3718e975c91fd89b6af19408621b37f34b06c5a.tar.bz2
abslibre-f3718e975c91fd89b6af19408621b37f34b06c5a.zip
clementine-1.3.1-9.parabola1: GLEW 2.1.0 rebuild
Diffstat (limited to 'libre/clementine/clementine-1.3.1-chromaprint-1.4.0.patch')
-rw-r--r--libre/clementine/clementine-1.3.1-chromaprint-1.4.0.patch41
1 files changed, 41 insertions, 0 deletions
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);