CVS commit: pkgsrc/audio/chromaprint

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Mar 22 07:34:04 UTC 2020

Modified Files:
        pkgsrc/audio/chromaprint: Makefile buildlink3.mk distinfo
Removed Files:
        pkgsrc/audio/chromaprint/patches: patch-cmake_modules_FindFFmpeg.cmake

Log Message:
chromaprint: Clean up. Use ffmpeg4 and fftw3.

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/audio/chromaprint/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/audio/chromaprint/buildlink3.mk
cvs rdiff -u -r1.15 -r1.16 pkgsrc/audio/chromaprint/distinfo
cvs rdiff -u -r1.3 -r0 \
    pkgsrc/audio/chromaprint/patches/patch-cmake_modules_FindFFmpeg.cmake

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/audio/chromaprint/Makefile
diff -u pkgsrc/audio/chromaprint/Makefile:1.26 pkgsrc/audio/chromaprint/Makefile:1.27
--- pkgsrc/audio/chromaprint/Makefile:1.26      Fri Nov 23 08:06:28 2018
+++ pkgsrc/audio/chromaprint/Makefile   Sun Mar 22 07:34:03 2020
@@ -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 @@ LICENSE=    mit
 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"

Index: pkgsrc/audio/chromaprint/buildlink3.mk
diff -u pkgsrc/audio/chromaprint/buildlink3.mk:1.11 pkgsrc/audio/chromaprint/buildlink3.mk:1.12
--- pkgsrc/audio/chromaprint/buildlink3.mk:1.11 Fri Nov 23 08:06:28 2018
+++ pkgsrc/audio/chromaprint/buildlink3.mk      Sun Mar 22 07:34:03 2020
@@ -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 @@ CHROMAPRINT_BUILDLINK3_MK:=
 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

Index: pkgsrc/audio/chromaprint/distinfo
diff -u pkgsrc/audio/chromaprint/distinfo:1.15 pkgsrc/audio/chromaprint/distinfo:1.16
--- pkgsrc/audio/chromaprint/distinfo:1.15      Sun Jan 28 15:43:03 2018
+++ pkgsrc/audio/chromaprint/distinfo   Sun Mar 22 07:34:03 2020
@@ -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