Index: head/graphics/shotwell/Makefile
===================================================================
--- head/graphics/shotwell/Makefile	(revision 566230)
+++ head/graphics/shotwell/Makefile	(revision 566231)
@@ -1,69 +1,73 @@
 # Created by: Mario Sergio Fujikawa Ferreira <lioux@FreeBSD.org> et al.
 # $FreeBSD$
 
 PORTNAME=	shotwell
 PORTVERSION=	0.30.11
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 
 MAINTAINER=	cmt@FreeBSD.org
 COMMENT=	Open source photo manager for GNOME
 
 LICENSE=	LGPL21+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 BUILD_DEPENDS=	vala>=0.20.1:lang/vala \
 		itstool:textproc/itstool
 LIB_DEPENDS=	libgio-2.0.so:devel/glib20 \
 		libjson-glib-1.0.so:devel/json-glib \
 		libgdata.so:devel/libgdata \
 		libgee-0.8.so:devel/libgee \
 		libsoup-2.4.so:devel/libsoup \
 		libexiv2.so:graphics/exiv2 \
 		libgdk_pixbuf-2.0.so:graphics/gdk-pixbuf2 \
 		libgexiv2.so:graphics/gexiv2 \
 		libexif.so:graphics/libexif \
 		libgphoto2.so:graphics/libgphoto2 \
 		libraw.so:graphics/libraw \
 		libgstreamer-1.0.so:multimedia/gstreamer1 \
 		libgstapp-1.0.so:multimedia/gstreamer1-plugins \
 		libgcr-ui-3.so:security/gcr \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 		libxml2.so:textproc/libxml2
 
-USES=		gettext desktop-file-utils gnome meson ninja pkgconfig \
-		python:3.4+,build shebangfix sqlite tar:xz xorg
+# USES compiler: also see option OPENMP below
+USES=		compiler:c++11-lib desktop-file-utils gettext gnome meson \
+		ninja pkgconfig python:3.4+,build shebangfix sqlite tar:xz xorg
 USE_GNOME=	cairo dconf gtk30
 USE_GSTREAMER1=	yes
 USE_LDCONFIG=	yes
 USE_XORG=	x11
 
 SHEBANG_FILES=	build-aux/meson/postinstall.py
 python_OLD_CMD=	"/usr/bin/env python3"
 python_CMD=	${SETENV} ${PYTHON_VERSION}
 
 MESON_ARGS=	-Dudev=false -Dextra-plugins=true -Dinstall-apport-hook=false \
 		-Dpublishers=facebook,flickr,gallery3,picasa,piwigo,rajce,tumblr,yandex,youtube
 INSTALLS_ICONS=	yes
 PORTSCOUT=	limitw:1,even
 MAKE_JOBS_UNSAFE=	yes
 
-OPTIONS_DEFINE=	FACED OPENMP
+# facedetection fails to link against opencv4 when building with GCC
+# disable openmp until llvm becomes the default openmp provider, then
+# try again
+OPTIONS_DEFINE=	FACED # OPENMP
 OPTIONS_SUB=	yes
 
 FACED_DESC=	Face Detection
-OPENMP_DESC=	libraw uses OpenMP (implies GCC)
+# OPENMP_DESC=	libraw uses OpenMP (implies GCC)
 
 FACED_CONFIGURE_ON=	-Dface-detection=true
 FACED_CONFIGURE_OFF=	-Dface-detection=false
 FACED_LIB_DEPENDS=	libopencv_core.so:graphics/opencv \
 			libopencv_photo.so:graphics/opencv
-OPENMP_USES=		compiler:openmp
-OPENMP_USES_OFF=	compiler:c++11-lib
+# OPENMP_USES=		compiler:openmp
+# OPENMP_USES_OFF=	compiler:c++11-lib
 
 PLIST_SUB=	DISTVERSION=${DISTVERSION}
 
 GLIB_SCHEMAS=	org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml
 
 .include <bsd.port.mk>
Index: head/graphics/shotwell/files/patch-facedetect_meson.build
===================================================================
--- head/graphics/shotwell/files/patch-facedetect_meson.build	(nonexistent)
+++ head/graphics/shotwell/files/patch-facedetect_meson.build	(revision 566231)
@@ -0,0 +1,10 @@
+--- facedetect/meson.build.orig	2020-11-05 20:48:33 UTC
++++ facedetect/meson.build
+@@ -1,6 +1,6 @@
+ subproject = ('facedetect')
+ add_languages('cpp')
+-facedetect_dep = dependency('opencv', version : ['>= 2.3.0'], required : true)
++facedetect_dep = dependency('opencv4', version : ['>= 4.0.0'], required : true)
+ executable('shotwell-facedetect',
+            'shotwell-facedetect.cpp',
+            dependencies : facedetect_dep,

Property changes on: head/graphics/shotwell/files/patch-facedetect_meson.build
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/graphics/shotwell/files/patch-facedetect_shotwell-facedetect.cpp
===================================================================
--- head/graphics/shotwell/files/patch-facedetect_shotwell-facedetect.cpp	(nonexistent)
+++ head/graphics/shotwell/files/patch-facedetect_shotwell-facedetect.cpp	(revision 566231)
@@ -0,0 +1,20 @@
+--- facedetect/shotwell-facedetect.cpp.orig	2021-02-21 15:22:50 UTC
++++ facedetect/shotwell-facedetect.cpp
+@@ -34,7 +34,7 @@ void help() {
+ void detectFaces(Mat &img, CascadeClassifier &cascade, double scale) {
+ 
+ 	Mat gray;
+-	cvtColor(img, gray, CV_BGR2GRAY);
++	cvtColor(img, gray, COLOR_BGR2GRAY);
+ 
+ 	Mat smallImg(cvRound(img.rows / scale), cvRound(img.cols / scale), CV_8UC1);
+ 	Size smallImgSize = smallImg.size();
+@@ -43,7 +43,7 @@ void detectFaces(Mat &img, CascadeClassifier &cascade,
+ 	equalizeHist(smallImg, smallImg);
+ 
+ 	vector<Rect> faces;
+-	cascade.detectMultiScale(smallImg, faces, 1.1, 2, CV_HAAR_SCALE_IMAGE, Size(30, 30));
++	cascade.detectMultiScale(smallImg, faces, 1.1, 2, CASCADE_SCALE_IMAGE, Size(30, 30));
+ 
+ 	int i = 0;
+ 	for (vector<Rect>::const_iterator r = faces.begin(); r != faces.end(); r++, i++) {

Property changes on: head/graphics/shotwell/files/patch-facedetect_shotwell-facedetect.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property