[pkgsrc/trunk]: pkgsrc/audio/chromaprint chromaprint: Clean up. Use ffmpeg4 a...

[nia <nia%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0f8e27d3b524
branches:  trunk
changeset: 413716:0f8e27d3b524
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Mar 22 07:34:03 2020 +0000

description:
chromaprint: Clean up. Use ffmpeg4 and fftw3.

Bump PKGREVISION.

diffstat:

 audio/chromaprint/Makefile                                     |  25 ++++++-
 audio/chromaprint/buildlink3.mk                                |   4 +-
 audio/chromaprint/distinfo                                     |   3 +-
 audio/chromaprint/patches/patch-cmake_modules_FindFFmpeg.cmake |  31 ----------
 4 files changed, 21 insertions(+), 42 deletions(-)

diffs (108 lines):

diff -r fe656bc81df3 -r 0f8e27d3b524 audio/chromaprint/Makefile
--- a/audio/chromaprint/Makefile        Sun Mar 22 07:31:42 2020 +0000
+++ b/audio/chromaprint/Makefile        Sun Mar 22 07:34:03 2020 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.26 2018/11/23 08:06:28 ryoon Exp $
+# $NetBSD: Makefile,v 1.27 2020/03/22 07:34:03 nia Exp $
 
 DISTNAME=      chromaprint-1.4.3
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    audio
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=acoustid/}
 GITHUB_TAG=    v${PKGVERSION_NOREV}
@@ -14,12 +14,25 @@
 USE_LANGUAGES= c c++
 USE_CMAKE=     yes
 # build and install "fpcalc"
-CMAKE_ARGS+=   -DBUILD_TOOLS:BOOL=ON
-# tell it where to find ffmpeg
-CMAKE_ARGS+=   -DFFMPEG_ROOT:PATH=${BUILDLINK_PREFIX.ffmpeg3}
+CMAKE_ARGS+=   -DBUILD_TOOLS=ON
+CMAKE_ARGS+=   -DFFT_LIB=fftw3
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Darwin"
+SOEXT= dylib
+.else
+SOEXT= so
+.endif
+
+.for lib in AVCODEC AVFORMAT AVUTIL SWRESAMPLE
+CMAKE_ARGS+=   -DFFMPEG_LIB${lib}_INCLUDE_DIRS=${BUILDLINK_PREFIX.ffmpeg4}/include/ffmpeg4
+CMAKE_ARGS+=   -DFFMPEG_LIB${lib}_LIBRARIES=${BUILDLINK_PREFIX.ffmpeg4}/lib/ffmpeg4/lib${lib:tl}.${SOEXT}
+.endfor
 
 PKGCONFIG_OVERRIDE=    libchromaprint.pc.cmake
 
+.include "../../math/fftw/buildlink3.mk"
 # On Darwin, chromaprint uses Accelerate.framework, but fpcalc still needs FFmpeg
-.include "../../multimedia/ffmpeg3/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r fe656bc81df3 -r 0f8e27d3b524 audio/chromaprint/buildlink3.mk
--- a/audio/chromaprint/buildlink3.mk   Sun Mar 22 07:31:42 2020 +0000
+++ b/audio/chromaprint/buildlink3.mk   Sun Mar 22 07:34:03 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2018/11/23 08:06:28 ryoon Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2020/03/22 07:34:03 nia Exp $
 
 BUILDLINK_TREE+=       chromaprint
 
@@ -8,8 +8,6 @@
 BUILDLINK_API_DEPENDS.chromaprint+=    chromaprint>=1.1
 BUILDLINK_ABI_DEPENDS.chromaprint?=    chromaprint>=1.4.3nb3
 BUILDLINK_PKGSRCDIR.chromaprint?=      ../../audio/chromaprint
-
-.include "../../multimedia/ffmpeg3/buildlink3.mk"
 .endif # CHROMAPRINT_BUILDLINK3_MK
 
 BUILDLINK_TREE+=       -chromaprint
diff -r fe656bc81df3 -r 0f8e27d3b524 audio/chromaprint/distinfo
--- a/audio/chromaprint/distinfo        Sun Mar 22 07:31:42 2020 +0000
+++ b/audio/chromaprint/distinfo        Sun Mar 22 07:34:03 2020 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.15 2018/01/28 15:43:03 wiz Exp $
+$NetBSD: distinfo,v 1.16 2020/03/22 07:34:03 nia Exp $
 
 SHA1 (chromaprint-1.4.3.tar.gz) = b87ac1a5597cc28d930ed1de6c6f6892d80c2eaa
 RMD160 (chromaprint-1.4.3.tar.gz) = 49945e81e161b4ca300766b42732c30fda0f5a11
 SHA512 (chromaprint-1.4.3.tar.gz) = aab00ca3d42047f20f48b24efdc50ef06fac799c69b3007a0e9c4e8217133a3626c51e49b4c842a59fc0e606169f2542c91997b0e838c62e9492a7ff5968363b
 Size (chromaprint-1.4.3.tar.gz) = 613718 bytes
-SHA1 (patch-cmake_modules_FindFFmpeg.cmake) = 193eac515ea1152762d911cf5cb2fac32ec62b4b
diff -r fe656bc81df3 -r 0f8e27d3b524 audio/chromaprint/patches/patch-cmake_modules_FindFFmpeg.cmake
--- a/audio/chromaprint/patches/patch-cmake_modules_FindFFmpeg.cmake    Sun Mar 22 07:31:42 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,31 +0,0 @@
-$NetBSD: patch-cmake_modules_FindFFmpeg.cmake,v 1.3 2016/12/12 10:15:13 wiz Exp $
-
-Include ffmpeg3 pkgsrc paths in search path.
-
---- cmake/modules/FindFFmpeg.cmake.orig        2013-11-23 15:43:42.000000000 +0000
-+++ cmake/modules/FindFFmpeg.cmake
-@@ -28,6 +28,7 @@ MACRO(FFMPEG_FIND varname shortname head
-       FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
-               PATHS
-               ${FFMPEG_ROOT}/include
-+              ${FFMPEG_ROOT}/include/ffmpeg3
-               $ENV{FFMPEG_DIR}/include
-               ~/Library/Frameworks
-               /Library/Frameworks
-@@ -43,7 +44,7 @@ MACRO(FFMPEG_FIND varname shortname head
-               DOC "Location of FFMPEG Headers"
-       )
-       FIND_PATH(FFMPEG_${varname}_INCLUDE_DIRS lib${shortname}/${headername}
--              PATH_SUFFIXES ffmpeg
-+              PATH_SUFFIXES ffmpeg ffmpeg3
-               DOC "Location of FFMPEG Headers"
-       )
- 
-@@ -51,6 +52,7 @@ MACRO(FFMPEG_FIND varname shortname head
-         NAMES ${shortname}
-         PATHS
-         ${FFMPEG_ROOT}/lib
-+        ${FFMPEG_ROOT}/lib/ffmpeg3
-         $ENV{FFMPEG_DIR}/lib
-         ~/Library/Frameworks
-         /Library/Frameworks