diff options
author | wiz <wiz@pkgsrc.org> | 2021-10-10 12:54:13 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2021-10-10 12:54:13 +0000 |
commit | 7c5614036c00a73ca02bca5c4f90bedb6eefdcd4 (patch) | |
tree | a76a855b69e8d2bdcf3c0f1971f0013446df803f /graphics/opencv | |
parent | 60883d640d5180943d93d639ef30ddd9c28265a4 (diff) | |
download | pkgsrc-7c5614036c00a73ca02bca5c4f90bedb6eefdcd4.tar.gz |
opencv: remove partial update
Committed by accident in libaom bump.
Ok nia@
Diffstat (limited to 'graphics/opencv')
-rw-r--r-- | graphics/opencv/Makefile.common | 28 | ||||
-rw-r--r-- | graphics/opencv/buildlink3.mk | 8 |
2 files changed, 12 insertions, 24 deletions
diff --git a/graphics/opencv/Makefile.common b/graphics/opencv/Makefile.common index 37283f57e45..4399492b27e 100644 --- a/graphics/opencv/Makefile.common +++ b/graphics/opencv/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2021/10/10 07:02:01 adam Exp $ +# $NetBSD: Makefile.common,v 1.11 2021/10/10 12:54:13 wiz Exp $ # used by graphics/opencv/Makefile # used by graphics/opencv-contrib-face/Makefile # @@ -7,15 +7,7 @@ OPENCV_VERSION= 3.4.16 CATEGORIES= graphics devel - -DISTFILES+= opencv-${OPENCV_VERSION}.tar.gz -DISTFILES+= ade-${ADE_VERSION}.tar.gz - -SITES.ade-${ADE_VERSION}.tar.gz= \ - -https://github.com/opencv/ade/archive/refs/tags/v${ADE_VERSION}.tar.gz - -SITES.opencv-${OPENCV_VERSION}.tar.gz= \ - -https://github.com/opencv/opencv/archive/refs/tags/v${OPENCV_VERSION}.tar.gz +MASTER_SITES= ${MASTER_SITE_GITHUB:=opencv/} HOMEPAGE= https://opencv.org/ LICENSE= modified-bsd @@ -23,29 +15,23 @@ LICENSE= modified-bsd PATCHDIR= ${.CURDIR}/../../graphics/opencv/patches USE_CMAKE= yes -USE_LANGUAGES= c c++ +USE_LANGUAGES= c c++11 USE_PKGLOCALEDIR= yes -USE_TOOLS+= pkg-config +USE_TOOLS+= gmake pkg-config CONFIGURE_DIRS+= build CONFIGURE_ENV+= MACHINE_ARCH=${MACHINE_ARCH} CHECK_PORTABILITY_SKIP+= platforms/ios/cmake/Toolchains/xcodebuild_wrapper.in CMAKE_ARG_PATH= ${WRKSRC} -CMAKE_ARGS+= -DWITH_GSTREAMER=OFF -CMAKE_ARGS+= -DBUILD_JAVA=OFF CMAKE_ARGS+= -DBUILD_PROTOBUF=OFF -CMAKE_ARGS+= -DBUILD_TESTS=OFF CMAKE_ARGS+= -DCV_ENABLE_INTRINSICS=OFF # XXX: problematic CMAKE_ARGS+= -DENABLE_CCACHE=OFF CMAKE_ARGS+= -DOPENCV_GENERATE_SETUPVARS=OFF -CMAKE_ARGS+= -DOPENCV_GENERATE_PKGCONFIG=ON CMAKE_ARGS+= -DPROTOBUF_UPDATE_FILES=ON CMAKE_ARGS+= -DWITH_EIGEN=OFF -CMAKE_ARGS+= -DWITH_VA=OFF # build problems on NetBSD -CMAKE_ARGS+= -DWITH_VA_INTEL=OFF # build problems on NetBSD CMAKE_ARGS+= -DZLIB_ROOT=${BUILDLINK_PREFIX.zlib} -CMAKE_ARGS+= -DENABLE_PRECOMPILED_HEADERS=OFF +CMAKE_ARGS.SunOS+= -DENABLE_PRECOMPILED_HEADERS=OFF CMAKE_ARGS.SunOS+= -DOPENCV_PYTHON_SKIP_LINKER_EXCLUDE_LIBS=ON .include "../../mk/bsd.prefs.mk" @@ -57,10 +43,6 @@ CMAKE_ARGS+= -DCPU_BASELINE="" PYTHON_VERSIONS_INCOMPATIBLE= 27 # avoid Python 2.7 -post-extract: - ${MKDIR} ${WRKSRC}/build/3rdparty/ade - ${CP} -r ${WRKDIR}/ade-${ADE_VERSION} ${WRKSRC}/build/3rdparty/ade - pre-configure: ${MKDIR} ${WRKSRC}/build diff --git a/graphics/opencv/buildlink3.mk b/graphics/opencv/buildlink3.mk index 139177285c2..631722227e8 100644 --- a/graphics/opencv/buildlink3.mk +++ b/graphics/opencv/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.11 2021/10/09 15:35:06 nia Exp $ +# $NetBSD: buildlink3.mk,v 1.12 2021/10/10 12:54:13 wiz Exp $ BUILDLINK_TREE+= opencv @@ -9,8 +9,14 @@ BUILDLINK_API_DEPENDS.opencv+= opencv>=3.0.0 BUILDLINK_ABI_DEPENDS.opencv+= opencv>=3.4.9nb9 BUILDLINK_PKGSRCDIR.opencv?= ../../graphics/opencv +pkgbase := opencv +.include "../../mk/pkg-build-options.mk" + .include "../../devel/protobuf/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" +.if ${PKG_BUILD_OPTIONS.opencv:Mjasper} +. include "../../graphics/jasper/buildlink3.mk" +.endif .include "../../graphics/libwebp/buildlink3.mk" .include "../../graphics/openexr/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" |