Updated chromaprint to 1.4.

Switch to ffmpeg3.

Version 1.4 -- December 3, 2016
===============================

 - Fully streaming audio processing without any post-processing step for the fingerprint generation.
 - Many performance optimizations. Especially when processing long streams, operations should be faster and use less memory.
 - C++11 compiler is now required for building the library.
 - The public C API now uses standard fixed-size int types from stdint.h (breaks backwards compatibility).
 - All code written for the library is now distributed under the MIT license.
 - Kiss FFT is now included with the library and automatically used if no other FFT library is found.
 - Added support for using the FFTW3F version of FFTW3.
 - Boost is no longer used.

5 files changed, 22 insertions, 23 deletions

diff --git a/audio/chromaprint/Makefile b/audio/chromaprint/Makefile
index 0b53de79d0a..c3e38a18e1a 100644
--- a/audio/chromaprint/Makefile
+++ b/audio/chromaprint/Makefile
@@ -1,24 +1,23 @@
-# $NetBSD: Makefile,v 1.16 2016/08/17 00:06:39 ryoon Exp $
+# $NetBSD: Makefile,v 1.17 2016/12/12 10:15:13 wiz Exp $
 
-DISTNAME=	chromaprint-1.3.2
-PKGREVISION=	1
+DISTNAME=	chromaprint-1.4
 CATEGORIES=	audio
 MASTER_SITES=	https://bitbucket.org/acoustid/chromaprint/downloads/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://acoustid.org/chromaprint
 COMMENT=	Audio fingerprinting
-LICENSE=	gnu-lgpl-v2
+LICENSE=	mit
 
 USE_LANGUAGES=	c c++
 USE_CMAKE=	yes
 # build and install "fpcalc"
-CMAKE_ARGS+=	-DBUILD_EXAMPLES:BOOL=on
+CMAKE_ARGS+=	-DBUILD_TOOLS:BOOL=ON
 # tell it where to find ffmpeg
-CMAKE_ARGS+=	-DFFMPEG_ROOT:PATH=${BUILDLINK_PREFIX.ffmpeg2}
+CMAKE_ARGS+=	-DFFMPEG_ROOT:PATH=${BUILDLINK_PREFIX.ffmpeg3}
 
 PKGCONFIG_OVERRIDE=	libchromaprint.pc.cmake
 
 # On Darwin, chromaprint uses Accelerate.framework, but fpcalc still needs FFmpeg
-.include "../../multimedia/ffmpeg2/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/chromaprint/PLIST b/audio/chromaprint/PLIST
index 2ce88d8d8cc..cdadb620709 100644
--- a/audio/chromaprint/PLIST
+++ b/audio/chromaprint/PLIST
@@ -1,7 +1,7 @@
-@comment $NetBSD: PLIST,v 1.4 2016/02/11 00:59:44 mef Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/12/12 10:15:13 wiz Exp $
 bin/fpcalc
 include/chromaprint.h
 lib/libchromaprint.so
 lib/libchromaprint.so.1
-lib/libchromaprint.so.1.3.0
+lib/libchromaprint.so.${PKGVERSION}.0
 lib/pkgconfig/libchromaprint.pc
diff --git a/audio/chromaprint/buildlink3.mk b/audio/chromaprint/buildlink3.mk
index 6c80d245aab..8c07a5f0e1d 100644
--- a/audio/chromaprint/buildlink3.mk
+++ b/audio/chromaprint/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.6 2016/08/17 00:06:39 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.7 2016/12/12 10:15:13 wiz Exp $
 
 BUILDLINK_TREE+=	chromaprint
 
@@ -6,10 +6,10 @@ BUILDLINK_TREE+=	chromaprint
 CHROMAPRINT_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.chromaprint+=	chromaprint>=1.1
-BUILDLINK_ABI_DEPENDS.chromaprint?=	chromaprint>=1.3.2nb1
+BUILDLINK_ABI_DEPENDS.chromaprint?=	chromaprint>=1.4
 BUILDLINK_PKGSRCDIR.chromaprint?=	../../audio/chromaprint
 
-.include "../../multimedia/ffmpeg2/buildlink3.mk"
+.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .endif	# CHROMAPRINT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-chromaprint
diff --git a/audio/chromaprint/distinfo b/audio/chromaprint/distinfo
index 72401c64afe..e57cb5a875a 100644
--- a/audio/chromaprint/distinfo
+++ b/audio/chromaprint/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2016/07/21 12:22:55 wiz Exp $
+$NetBSD: distinfo,v 1.12 2016/12/12 10:15:13 wiz Exp $
 
-SHA1 (chromaprint-1.3.2.tar.gz) = 29e86490f14c5d50f8720974b814340f9846f71f
-RMD160 (chromaprint-1.3.2.tar.gz) = 5d350e46d2217ac4f3e0c5389f3ce2c171ce74b5
-SHA512 (chromaprint-1.3.2.tar.gz) = 7f89eb09f293a3691efcb01544da612cf674a00af1c188db3f1075db44fee0a8e0aeff3ca6eccd0731ae6bbff9eb0fd51b22128fa927fdbd21638e2832f76e95
-Size (chromaprint-1.3.2.tar.gz) = 538395 bytes
-SHA1 (patch-cmake_modules_FindFFmpeg.cmake) = a43fc03f36c18477cdafb7382a4e101eed3f6a72
+SHA1 (chromaprint-1.4.tar.gz) = 1f512fdd01a6e0f9e534ad65493c75c4a1432813
+RMD160 (chromaprint-1.4.tar.gz) = 510313d3b02cce9807236f43113f0975ca534459
+SHA512 (chromaprint-1.4.tar.gz) = 7b394c81a5fe9c0fd8008322766841c280613df2f6b605ab449f667b5d2389e062d3dfcc92563d6bf3bdf709d56e66a537be95358070168ca4cbad9bf059469b
+Size (chromaprint-1.4.tar.gz) = 610787 bytes
+SHA1 (patch-cmake_modules_FindFFmpeg.cmake) = 193eac515ea1152762d911cf5cb2fac32ec62b4b
diff --git a/audio/chromaprint/patches/patch-cmake_modules_FindFFmpeg.cmake b/audio/chromaprint/patches/patch-cmake_modules_FindFFmpeg.cmake
index 1e4f412cb9c..a672fa69634 100644
--- a/audio/chromaprint/patches/patch-cmake_modules_FindFFmpeg.cmake
+++ b/audio/chromaprint/patches/patch-cmake_modules_FindFFmpeg.cmake
@@ -1,6 +1,6 @@
-$NetBSD: patch-cmake_modules_FindFFmpeg.cmake,v 1.2 2015/10/27 06:48:57 adam Exp $
+$NetBSD: patch-cmake_modules_FindFFmpeg.cmake,v 1.3 2016/12/12 10:15:13 wiz Exp $
 
-Include ffmpeg2 pkgsrc paths in search path.
+Include ffmpeg3 pkgsrc paths in search path.
 
 --- cmake/modules/FindFFmpeg.cmake.orig	2013-11-23 15:43:42.000000000 +0000
 +++ cmake/modules/FindFFmpeg.cmake
@@ -8,7 +8,7 @@ Include ffmpeg2 pkgsrc paths in search path.
  	FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
  		PATHS
  		${FFMPEG_ROOT}/include
-+		${FFMPEG_ROOT}/include/ffmpeg2
++		${FFMPEG_ROOT}/include/ffmpeg3
  		$ENV{FFMPEG_DIR}/include
  		~/Library/Frameworks
  		/Library/Frameworks
@@ -17,7 +17,7 @@ Include ffmpeg2 pkgsrc paths in search path.
  	)
  	FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
 -		PATH_SUFFIXES ffmpeg
-+		PATH_SUFFIXES ffmpeg ffmpeg2
++		PATH_SUFFIXES ffmpeg ffmpeg3
  		DOC "Location of FFMPEG Headers"
  	)
  
@@ -25,7 +25,7 @@ Include ffmpeg2 pkgsrc paths in search path.
          NAMES ${shortname}
          PATHS
          ${FFMPEG_ROOT}/lib
-+        ${FFMPEG_ROOT}/lib/ffmpeg2
++        ${FFMPEG_ROOT}/lib/ffmpeg3
          $ENV{FFMPEG_DIR}/lib
          ~/Library/Frameworks
          /Library/Frameworks