Mon Aug 3 23:02:18 2020 UTC ()
Drop first PKG_SUPPORTED_OPTION of gtk, it is later added for !Darwin.
Thanks leot.


(joerg)
diff -r1.12 -r1.13 pkgsrc/graphics/opencv/options.mk
cvs diff -r1.12 -r1.13 pkgsrc/graphics/opencv/options.mk (switch to unified diff)

--- pkgsrc/graphics/opencv/options.mk 2020/08/03 22:37:05 1.12
+++ pkgsrc/graphics/opencv/options.mk 2020/08/03 23:02:18 1.13
@@ -1,41 +1,41 @@ @@ -1,41 +1,41 @@
1# $NetBSD: options.mk,v 1.12 2020/08/03 22:37:05 joerg Exp $ 1# $NetBSD: options.mk,v 1.13 2020/08/03 23:02:18 joerg Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.opencv 3PKG_OPTIONS_VAR= PKG_OPTIONS.opencv
4PKG_SUPPORTED_OPTIONS= ffmpeg gtk jasper 4PKG_SUPPORTED_OPTIONS= ffmpeg jasper
5 5
6.include "../../mk/bsd.prefs.mk" 6.include "../../mk/bsd.prefs.mk"
7 7
8.if ${OPSYS} != "Darwin" 8.if ${OPSYS} != "Darwin"
9PKG_SUPPORTED_OPTIONS+= gtk 9PKG_SUPPORTED_OPTIONS+= gtk
10PKG_SUGGESTED_OPTIONS+= gtk 10PKG_SUGGESTED_OPTIONS+= gtk
11.endif 11.endif
12 12
13.include "../../mk/bsd.options.mk" 13.include "../../mk/bsd.options.mk"
14 14
15.if !empty(PKG_OPTIONS:Mffmpeg) 15.if !empty(PKG_OPTIONS:Mffmpeg)
16CMAKE_ARGS+= -DWITH_FFMPEG=ON 16CMAKE_ARGS+= -DWITH_FFMPEG=ON
17CMAKE_ARGS+= -DFFMPEG_INCLUDE_DIR=${PREFIX}/include/ffmpeg4 17CMAKE_ARGS+= -DFFMPEG_INCLUDE_DIR=${PREFIX}/include/ffmpeg4
18CMAKE_ARGS+= -DFFMPEG_LIB_DIR=${PREFIX}/lib/ffmpeg4 18CMAKE_ARGS+= -DFFMPEG_LIB_DIR=${PREFIX}/lib/ffmpeg4
19.include "../../multimedia/ffmpeg4/buildlink3.mk" 19.include "../../multimedia/ffmpeg4/buildlink3.mk"
20.else 20.else
21CMAKE_ARGS+= -DWITH_FFMPEG=OFF 21CMAKE_ARGS+= -DWITH_FFMPEG=OFF
22.endif 22.endif
23 23
24.if !empty(PKG_OPTIONS:Mjasper) 24.if !empty(PKG_OPTIONS:Mjasper)
25CMAKE_ARGS+= -DWITH_JASPER=ON 25CMAKE_ARGS+= -DWITH_JASPER=ON
26# jasper uses SIZE_MAX and friends in its headers. 26# jasper uses SIZE_MAX and friends in its headers.
27CXXFLAGS+= -D__STDC_LIMIT_MACROS 27CXXFLAGS+= -D__STDC_LIMIT_MACROS
28.include "../../graphics/jasper/buildlink3.mk" 28.include "../../graphics/jasper/buildlink3.mk"
29.else 29.else
30CMAKE_ARGS+= -DWITH_JASPER=OFF 30CMAKE_ARGS+= -DWITH_JASPER=OFF
31.endif 31.endif
32 32
33.if !empty(PKG_OPTIONS:Mgtk) 33.if !empty(PKG_OPTIONS:Mgtk)
34CMAKE_ARGS+= -DWITH_GTK=ON 34CMAKE_ARGS+= -DWITH_GTK=ON
35.include "../../x11/gtk3/buildlink3.mk" 35.include "../../x11/gtk3/buildlink3.mk"
36.else 36.else
37CMAKE_ARGS+= -DWITH_GTK=OFF 37CMAKE_ARGS+= -DWITH_GTK=OFF
38.endif 38.endif
39 39
40# FIXME: should be option.mk'ed instead 40# FIXME: should be option.mk'ed instead
41CMAKE_ARGS+= -DBUILD_DOCS=OFF 41CMAKE_ARGS+= -DBUILD_DOCS=OFF