CVS commit: pkgsrc/graphics/opencv

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Mon Aug  3 22:37:06 UTC 2020

Modified Files:
        pkgsrc/graphics/opencv: Makefile options.mk

Log Message:
Make GTK support optional. opencv is useful for server-side processing,
but GTK is a waste of space in that case.


To generate a diff of this commit:
cvs rdiff -u -r1.92 -r1.93 pkgsrc/graphics/opencv/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/opencv/options.mk

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

Modified files:

Index: pkgsrc/graphics/opencv/Makefile
diff -u pkgsrc/graphics/opencv/Makefile:1.92 pkgsrc/graphics/opencv/Makefile:1.93
--- pkgsrc/graphics/opencv/Makefile:1.92        Thu May 21 20:53:38 2020
+++ pkgsrc/graphics/opencv/Makefile     Mon Aug  3 22:37:05 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2020/05/21 20:53:38 ryoon Exp $
+# $NetBSD: Makefile,v 1.93 2020/08/03 22:37:05 joerg Exp $
 
 .include "Makefile.common"
 
@@ -39,8 +39,5 @@ post-install:
 .include "../../graphics/tiff/buildlink3.mk"
 .include "../../lang/python/extension.mk"
 .include "../../math/py-numpy/buildlink3.mk"
-.if ${OPSYS} != "Darwin"
-.include "../../x11/gtk3/buildlink3.mk"
-.endif
 .include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/graphics/opencv/options.mk
diff -u pkgsrc/graphics/opencv/options.mk:1.11 pkgsrc/graphics/opencv/options.mk:1.12
--- pkgsrc/graphics/opencv/options.mk:1.11      Sun Mar  1 15:36:01 2020
+++ pkgsrc/graphics/opencv/options.mk   Mon Aug  3 22:37:05 2020
@@ -1,7 +1,14 @@
-# $NetBSD: options.mk,v 1.11 2020/03/01 15:36:01 nia Exp $
+# $NetBSD: options.mk,v 1.12 2020/08/03 22:37:05 joerg Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.opencv
-PKG_SUPPORTED_OPTIONS= ffmpeg jasper
+PKG_SUPPORTED_OPTIONS= ffmpeg gtk jasper
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} != "Darwin"
+PKG_SUPPORTED_OPTIONS+=        gtk
+PKG_SUGGESTED_OPTIONS+=        gtk
+.endif
 
 .include "../../mk/bsd.options.mk"
 
@@ -23,5 +30,12 @@ CXXFLAGS+=   -D__STDC_LIMIT_MACROS
 CMAKE_ARGS+=   -DWITH_JASPER=OFF
 .endif
 
+.if !empty(PKG_OPTIONS:Mgtk)
+CMAKE_ARGS+=   -DWITH_GTK=ON
+.include "../../x11/gtk3/buildlink3.mk"
+.else
+CMAKE_ARGS+=   -DWITH_GTK=OFF
+.endif
+
 # FIXME: should be option.mk'ed instead
 CMAKE_ARGS+=   -DBUILD_DOCS=OFF