* Fix building on Darwin.

* Switch to FFmpeg-2.x, so we can get rid of FFmpeg-1 easier.

5 files changed, 31 insertions, 13 deletions

diff --git a/audio/chromaprint/Makefile b/audio/chromaprint/Makefile
index 9d357555e00..e1299207c55 100644
--- a/audio/chromaprint/Makefile
+++ b/audio/chromaprint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2015/06/30 09:57:34 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2015/10/27 06:48:57 adam Exp $
 
 DISTNAME=	chromaprint-1.2
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	https://bitbucket.org/acoustid/chromaprint/downloads/
 
@@ -15,9 +15,10 @@ USE_CMAKE=	yes
 # build and install "fpcalc"
 CMAKE_ARGS+=	-DBUILD_EXAMPLES:BOOL=on
 # tell it where to find ffmpeg
-CMAKE_ARGS+=	-DFFMPEG_ROOT:PATH=${BUILDLINK_PREFIX.ffmpeg1}
+CMAKE_ARGS+=	-DFFMPEG_ROOT:PATH=${BUILDLINK_PREFIX.ffmpeg2}
 
 PKGCONFIG_OVERRIDE=	libchromaprint.pc.cmake
 
-.include "../../multimedia/ffmpeg1/buildlink3.mk"
+# On Darwin, chromaprint uses Accelerate.framework, but fpcalc still needs FFmpeg
+.include "../../multimedia/ffmpeg2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/chromaprint/buildlink3.mk b/audio/chromaprint/buildlink3.mk
index 1835902eadd..428b674c3ca 100644
--- a/audio/chromaprint/buildlink3.mk
+++ b/audio/chromaprint/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2014/08/11 23:09:44 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2015/10/27 06:48:57 adam Exp $
 
 BUILDLINK_TREE+=	chromaprint
 
@@ -8,7 +8,7 @@ CHROMAPRINT_BUILDLINK3_MK:=
 BUILDLINK_API_DEPENDS.chromaprint+=	chromaprint>=1.1
 BUILDLINK_PKGSRCDIR.chromaprint?=	../../audio/chromaprint
 
-#.include "../../multimedia/ffmpeg1/buildlink3.mk"
+.include "../../multimedia/ffmpeg2/buildlink3.mk"
 .endif	# CHROMAPRINT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=	-chromaprint
diff --git a/audio/chromaprint/distinfo b/audio/chromaprint/distinfo
index cec2aa90418..7919de1a159 100644
--- a/audio/chromaprint/distinfo
+++ b/audio/chromaprint/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2014/08/31 21:44:32 wiz Exp $
+$NetBSD: distinfo,v 1.6 2015/10/27 06:48:57 adam Exp $
 
 SHA1 (chromaprint-1.2.tar.gz) = 113415ca22298c201721b43e006824c7865afc17
 RMD160 (chromaprint-1.2.tar.gz) = 208ddea00c22451b6838ab8415834403e918b541
+SHA512 (chromaprint-1.2.tar.gz) = dc61db8894a20df3d7e7317cd7cd97148c19be5854dd66409341cb8e47c045e1c632b254e14a869279983a5af2cc6f9effea21b77a63dff729511e6144439cbb
 Size (chromaprint-1.2.tar.gz) = 529646 bytes
-SHA1 (patch-cmake_modules_FindFFmpeg.cmake) = 0c751824ef25fa393f7e74f432d97d26a44354f0
+SHA1 (patch-CMakeLists.txt) = bf0cbe6e1f00ad13eccc5316866a767d1c53f00e
+SHA1 (patch-cmake_modules_FindFFmpeg.cmake) = a43fc03f36c18477cdafb7382a4e101eed3f6a72
diff --git a/audio/chromaprint/patches/patch-CMakeLists.txt b/audio/chromaprint/patches/patch-CMakeLists.txt
new file mode 100644
index 00000000000..0c8dc32e024
--- /dev/null
+++ b/audio/chromaprint/patches/patch-CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2015/10/27 06:48:57 adam Exp $
+
+Install libchromaprint.pc also on Darwin.
+
+--- CMakeLists.txt.orig	2015-10-27 06:19:45.000000000 +0000
++++ CMakeLists.txt
+@@ -132,7 +132,7 @@ if(WITH_KISSFFT)
+ 	message(STATUS "Using KissFFT for FFT calculations")
+ endif()
+ 
+-if(NOT APPLE AND NOT BUILD_FRAMEWORK)
++if(NOT BUILD_FRAMEWORK)
+ 	configure_file(${CMAKE_CURRENT_SOURCE_DIR}/libchromaprint.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc)
+ 	install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libchromaprint.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+ endif()
diff --git a/audio/chromaprint/patches/patch-cmake_modules_FindFFmpeg.cmake b/audio/chromaprint/patches/patch-cmake_modules_FindFFmpeg.cmake
index e09d9c7d1b8..1e4f412cb9c 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.1 2014/08/11 23:21:11 wiz Exp $
+$NetBSD: patch-cmake_modules_FindFFmpeg.cmake,v 1.2 2015/10/27 06:48:57 adam Exp $
 
-Include ffmpeg1 pkgsrc paths in search path.
+Include ffmpeg2 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 ffmpeg1 pkgsrc paths in search path.
  	FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
  		PATHS
  		${FFMPEG_ROOT}/include
-+		${FFMPEG_ROOT}/include/ffmpeg1
++		${FFMPEG_ROOT}/include/ffmpeg2
  		$ENV{FFMPEG_DIR}/include
  		~/Library/Frameworks
  		/Library/Frameworks
@@ -17,7 +17,7 @@ Include ffmpeg1 pkgsrc paths in search path.
  	)
  	FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
 -		PATH_SUFFIXES ffmpeg
-+		PATH_SUFFIXES ffmpeg ffmpeg1
++		PATH_SUFFIXES ffmpeg ffmpeg2
  		DOC "Location of FFMPEG Headers"
  	)
  
@@ -25,7 +25,7 @@ Include ffmpeg1 pkgsrc paths in search path.
          NAMES ${shortname}
          PATHS
          ${FFMPEG_ROOT}/lib
-+        ${FFMPEG_ROOT}/lib/ffmpeg1
++        ${FFMPEG_ROOT}/lib/ffmpeg2
          $ENV{FFMPEG_DIR}/lib
          ~/Library/Frameworks
          /Library/Frameworks