Fix build with chromaprint-1.4.x.

3 files changed, 49 insertions, 1 deletions

diff --git a/audio/kid3/distinfo b/audio/kid3/distinfo
index 7029770952f..61a129f7381 100644
--- a/audio/kid3/distinfo
+++ b/audio/kid3/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.11 2015/11/01 09:13:16 adam Exp $
+$NetBSD: distinfo,v 1.12 2016/12/19 09:20:10 wiz Exp $
 
 SHA1 (kid3-3.3.0.tar.gz) = 5d9d02b2063b87023459fea0283444052978329e
 RMD160 (kid3-3.3.0.tar.gz) = 2442e95724a71fcd63f6de5dba0d689c4acec8b4
 SHA512 (kid3-3.3.0.tar.gz) = 42b238c2cc7023477606419a13bb677b8bfcc044a78ec36b8fa96db40ece8a2e623c581a2274d319c760fa6e101625dd282e1c7a39a63b8a2c6f0b1265be6eca
 Size (kid3-3.3.0.tar.gz) = 1258378 bytes
 SHA1 (patch-CMakeLists.txt) = 81e4ee22279dd9acf0619380f3b41e8316f7c2ea
+SHA1 (patch-src_plugins_acoustidimport_fingerprintcalculator.cpp) = 8ef550096f4a89c6074b94bb467832dfb2f1c98f
+SHA1 (patch-src_plugins_acoustidimport_fingerprintcalculator.h) = 9b9815db812d38eac65cc6c153c58ca86acd8dec
diff --git a/audio/kid3/patches/patch-src_plugins_acoustidimport_fingerprintcalculator.cpp b/audio/kid3/patches/patch-src_plugins_acoustidimport_fingerprintcalculator.cpp
new file mode 100644
index 00000000000..00e043bd08f
--- /dev/null
+++ b/audio/kid3/patches/patch-src_plugins_acoustidimport_fingerprintcalculator.cpp
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_plugins_acoustidimport_fingerprintcalculator.cpp,v 1.1 2016/12/19 09:20:10 wiz Exp $
+
+Fix build with chromaprint-1.4.x.
+
+--- src/plugins/acoustidimport/fingerprintcalculator.cpp.orig	2015-09-30 06:40:08.000000000 +0000
++++ src/plugins/acoustidimport/fingerprintcalculator.cpp
+@@ -26,7 +26,6 @@
+ 
+ #define __STDC_CONSTANT_MACROS
+ #include "fingerprintcalculator.h"
+-#include <chromaprint.h>
+ #include "config.h"
+ #include "abstractfingerprintdecoder.h"
+ 
+@@ -94,7 +93,7 @@ void FingerprintCalculator::startChromap
+  */
+ void FingerprintCalculator::feedChromaprint(QByteArray data)
+ {
+-  if (!::chromaprint_feed(m_chromaprintCtx, data.data(), data.size() / 2)) {
++  if (!::chromaprint_feed(m_chromaprintCtx, (int16_t*)data.data(), data.size() / 2)) {
+     m_decoder->stop();
+     emit finished(QString(), 0, FingerprintCalculationFailed);
+   }
diff --git a/audio/kid3/patches/patch-src_plugins_acoustidimport_fingerprintcalculator.h b/audio/kid3/patches/patch-src_plugins_acoustidimport_fingerprintcalculator.h
new file mode 100644
index 00000000000..8cd0f3ebde5
--- /dev/null
+++ b/audio/kid3/patches/patch-src_plugins_acoustidimport_fingerprintcalculator.h
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_plugins_acoustidimport_fingerprintcalculator.h,v 1.1 2016/12/19 09:20:10 wiz Exp $
+
+Fix build with chromaprint-1.4.x.
+
+--- src/plugins/acoustidimport/fingerprintcalculator.h.orig	2015-09-30 06:40:08.000000000 +0000
++++ src/plugins/acoustidimport/fingerprintcalculator.h
+@@ -29,6 +29,7 @@
+ 
+ #include <QObject>
+ #include <QString>
++#include <chromaprint.h>
+ 
+ class AbstractFingerprintDecoder;
+ 
+@@ -110,7 +111,7 @@ private slots:
+   void finishChromaprint(int duration);
+ 
+ private:
+-  void** m_chromaprintCtx;
++  ChromaprintContext* m_chromaprintCtx;
+   AbstractFingerprintDecoder* m_decoder;
+ };
+