Import of pkgsrc-2016Q3

This commit is contained in:
2016-11-18 22:39:22 +01:00
committed by sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
+5 -4
View File
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.10 2015/06/30 09:57:34 ryoon Exp $
# $NetBSD: Makefile,v 1.16 2016/08/17 00:06:39 ryoon Exp $
DISTNAME= chromaprint-1.2
DISTNAME= chromaprint-1.3.2
PKGREVISION= 1
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"
+3 -3
View File
@@ -1,7 +1,7 @@
@comment $NetBSD: PLIST,v 1.3 2014/08/31 21:44:32 wiz Exp $
@comment $NetBSD: PLIST,v 1.4 2016/02/11 00:59:44 mef Exp $
bin/fpcalc
include/chromaprint.h
lib/libchromaprint.so
lib/libchromaprint.so.0
lib/libchromaprint.so.0.2.3
lib/libchromaprint.so.1
lib/libchromaprint.so.1.3.0
lib/pkgconfig/libchromaprint.pc
+3 -2
View File
@@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.2 2014/08/11 23:09:44 wiz Exp $
# $NetBSD: buildlink3.mk,v 1.6 2016/08/17 00:06:39 ryoon Exp $
BUILDLINK_TREE+= chromaprint
@@ -6,9 +6,10 @@ BUILDLINK_TREE+= chromaprint
CHROMAPRINT_BUILDLINK3_MK:=
BUILDLINK_API_DEPENDS.chromaprint+= chromaprint>=1.1
BUILDLINK_ABI_DEPENDS.chromaprint?= chromaprint>=1.3.2nb1
BUILDLINK_PKGSRCDIR.chromaprint?= ../../audio/chromaprint
#.include "../../multimedia/ffmpeg1/buildlink3.mk"
.include "../../multimedia/ffmpeg2/buildlink3.mk"
.endif # CHROMAPRINT_BUILDLINK3_MK
BUILDLINK_TREE+= -chromaprint
+6 -5
View File
@@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.5 2014/08/31 21:44:32 wiz Exp $
$NetBSD: distinfo,v 1.11 2016/07/21 12:22:55 wiz Exp $
SHA1 (chromaprint-1.2.tar.gz) = 113415ca22298c201721b43e006824c7865afc17
RMD160 (chromaprint-1.2.tar.gz) = 208ddea00c22451b6838ab8415834403e918b541
Size (chromaprint-1.2.tar.gz) = 529646 bytes
SHA1 (patch-cmake_modules_FindFFmpeg.cmake) = 0c751824ef25fa393f7e74f432d97d26a44354f0
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
@@ -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