update to 3.4.3 and fix build

3 files changed, 70 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8082021c3ab5..9ae9b06fc5b2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Wed Oct  5 17:11:49 UTC 2016
+# Sat Dec 17 11:08:40 UTC 2016
 pkgbase = kid3-cli
 	pkgdesc = An MP3, Ogg/Vorbis and FLAC tag editor, CLI version
-	pkgver = 3.4.2
+	pkgver = 3.4.3
 	pkgrel = 1
 	url = http://kid3.sourceforge.net/
 	changelog = kid3.changelog
@@ -24,8 +24,10 @@ pkgbase = kid3-cli
 	depends = qt5-multimedia
 	provides = kid3
 	conflicts = kid3-kde kid3-qt
-	source = http://downloads.sourceforge.net/kid3/kid3-3.4.2.tar.gz
-	sha256sums = 5c0707f1be73c486d09522ca086693d3ee830b7a28a88dbd2c010c5494256a3e
+	source = http://downloads.sourceforge.net/kid3/kid3-3.4.3.tar.gz
+	source = fix-build-with-chromaprint-1.4.patch
+	sha256sums = e8b03bb784fd4ef944ac4f31c770434719747c7750dee62f51efdfd61f4e3b2a
+	sha256sums = b5f23564234c57576bfd20d229f8c988f9050cc77a0c76735135a73b8e96ebc2
 
 pkgname = kid3-cli
 
diff --git a/PKGBUILD b/PKGBUILD
index dd85d1c27ecd..074af7f61eeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Alois Nespor <alois.nespor@gmail.com>
 
 pkgname=kid3-cli
-pkgver=3.4.2
+pkgver=3.4.3
 pkgrel=1
 pkgdesc="An MP3, Ogg/Vorbis and FLAC tag editor, CLI version"
 arch=('i686' 'x86_64')
@@ -15,8 +15,16 @@ makedepends=('chromaprint' 'id3lib' 'taglib' 'libmp4v2'
 conflicts=('kid3-kde'' kid3-qt')
 provides=('kid3')
 changelog=${pkgname/-cli/}.changelog
-source=(http://downloads.sourceforge.net/${pkgname/-cli/}/${pkgname/-cli/}-$pkgver.tar.gz)
-sha256sums=('5c0707f1be73c486d09522ca086693d3ee830b7a28a88dbd2c010c5494256a3e')
+source=(http://downloads.sourceforge.net/${pkgname/-cli/}/${pkgname/-cli/}-$pkgver.tar.gz
+       fix-build-with-chromaprint-1.4.patch
+)
+sha256sums=('e8b03bb784fd4ef944ac4f31c770434719747c7750dee62f51efdfd61f4e3b2a'
+            'b5f23564234c57576bfd20d229f8c988f9050cc77a0c76735135a73b8e96ebc2')
+
+prepare() {
+	cd ${srcdir}/kid3-${pkgver}
+	patch -Np1 -i ../fix-build-with-chromaprint-1.4.patch
+}
 
 build() {
   mkdir -p ${srcdir}/build
@@ -29,7 +37,9 @@ build() {
     -DWITH_QML=OFF \
     -DWITH_MP4V2=ON \
     -DWITH_FFMPEG=ON \
-    -DWITH_GSTREAMER=OFF
+    -DWITH_GSTREAMER=OFF \
+    -DWITH_QT4=OFF \
+    -DWITH_PHONON=OFF \
 
 }
 
diff --git a/fix-build-with-chromaprint-1.4.patch b/fix-build-with-chromaprint-1.4.patch
new file mode 100644
index 000000000000..caa70bc09933
--- /dev/null
+++ b/fix-build-with-chromaprint-1.4.patch
@@ -0,0 +1,50 @@
+From 305e5536b889e6e1609b2a8e27f2a04d97f2a7ad Mon Sep 17 00:00:00 2001
+From: Urs Fleisch <ufleisch@users.sourceforge.net>
+Date: Fri, 9 Dec 2016 07:54:19 +0100
+Subject: Fix building with Chromaprint 1.4, [bugs:#146].
+
+
+diff --git a/src/plugins/acoustidimport/fingerprintcalculator.cpp b/src/plugins/acoustidimport/fingerprintcalculator.cpp
+index 840efae..00d12e0 100644
+--- a/src/plugins/acoustidimport/fingerprintcalculator.cpp
++++ b/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,9 @@ void FingerprintCalculator::startChromaprint(int sampleRate, int channelCount)
+  */
+ void FingerprintCalculator::feedChromaprint(QByteArray data)
+ {
+-  if (!::chromaprint_feed(m_chromaprintCtx, data.data(), data.size() / 2)) {
++  if (!::chromaprint_feed(m_chromaprintCtx,
++                          reinterpret_cast<int16_t*>(data.data()),
++                          data.size() / 2)) {
+     m_decoder->stop();
+     emit finished(QString(), 0, FingerprintCalculationFailed);
+   }
+diff --git a/src/plugins/acoustidimport/fingerprintcalculator.h b/src/plugins/acoustidimport/fingerprintcalculator.h
+index dea2f2f..596409b 100644
+--- a/src/plugins/acoustidimport/fingerprintcalculator.h
++++ b/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;
+ };
+