summaryrefslogtreecommitdiff
path: root/audio/chromaprint
diff options
context:
space:
mode:
authorwiz <wiz>2014-08-11 23:09:44 +0000
committerwiz <wiz>2014-08-11 23:09:44 +0000
commit4e99d7e68eae350201c1168d78a96f5dbb56dd12 (patch)
treedcf9dd704b954a6166618438d87abbe0365078c1 /audio/chromaprint
parentfa0437adf6bc7cee3f000d065733d0132e62e096 (diff)
downloadpkgsrc-4e99d7e68eae350201c1168d78a96f5dbb56dd12.tar.gz
Switch to ffmpeg1 instead of ffmpeg.
Note: some of these packages didn't build for me, e.g. osg, so I couldn't verify them all.
Diffstat (limited to 'audio/chromaprint')
-rw-r--r--audio/chromaprint/Makefile7
-rw-r--r--audio/chromaprint/buildlink3.mk4
-rw-r--r--audio/chromaprint/distinfo3
3 files changed, 9 insertions, 5 deletions
diff --git a/audio/chromaprint/Makefile b/audio/chromaprint/Makefile
index daa76d7c934..26da9a5378d 100644
--- a/audio/chromaprint/Makefile
+++ b/audio/chromaprint/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2014/04/27 16:29:39 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2014/08/11 23:09:44 wiz Exp $
DISTNAME= chromaprint-1.1
+PKGREVISION= 1
CATEGORIES= audio
MASTER_SITES= https://bitbucket.org/acoustid/chromaprint/downloads/
@@ -13,8 +14,10 @@ USE_LANGUAGES= c c++
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}
PKGCONFIG_OVERRIDE= libchromaprint.pc.cmake
-.include "../../multimedia/ffmpeg/buildlink3.mk"
+.include "../../multimedia/ffmpeg1/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/chromaprint/buildlink3.mk b/audio/chromaprint/buildlink3.mk
index 4f4569dc5d2..1835902eadd 100644
--- a/audio/chromaprint/buildlink3.mk
+++ b/audio/chromaprint/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2014/04/30 14:09:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2014/08/11 23:09:44 wiz 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/ffmpeg/buildlink3.mk"
+#.include "../../multimedia/ffmpeg1/buildlink3.mk"
.endif # CHROMAPRINT_BUILDLINK3_MK
BUILDLINK_TREE+= -chromaprint
diff --git a/audio/chromaprint/distinfo b/audio/chromaprint/distinfo
index ecb50ca87e6..044dbada29e 100644
--- a/audio/chromaprint/distinfo
+++ b/audio/chromaprint/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2014/04/27 16:27:09 wiz Exp $
+$NetBSD: distinfo,v 1.4 2014/08/11 23:09:44 wiz Exp $
SHA1 (chromaprint-1.1.tar.gz) = 5a250f761761d2ce08e2591b9daa909393552939
RMD160 (chromaprint-1.1.tar.gz) = f6b886b989b3de0d274c699696212c0350c1ad7a
Size (chromaprint-1.1.tar.gz) = 542360 bytes
+SHA1 (patch-cmake_modules_FindFFmpeg.cmake) = 0c751824ef25fa393f7e74f432d97d26a44354f0