svn commit: r459232 - in head/graphics/frei0r: . files

[Tobias C. Berner]

Author: tcberner
Date: Wed Jan 17 09:59:37 2018
New Revision: 459232
URL: https://svnweb.freebsd.org/changeset/ports/459232

Log:
  graphics/frei0r-plugins-opencv, fix build against clang6
  
  PR:		224669

Added:
  head/graphics/frei0r/files/extra-patch-src_filter_facedetect_CMakeLists.txt   (contents, props changed)
Modified:
  head/graphics/frei0r/Makefile

Modified: head/graphics/frei0r/Makefile
==============================================================================
--- head/graphics/frei0r/Makefile	Wed Jan 17 09:31:14 2018	(r459231)
+++ head/graphics/frei0r/Makefile	Wed Jan 17 09:59:37 2018	(r459232)
@@ -22,13 +22,14 @@ IGNORE=		cannot build OpenCV and gavl plugins simultan
 .endif
 
 .if defined(BUILDING_FREI0R_OPENCV) || defined(BUILDING_FREI0R_GAVL)
-EXTRA_PATCHES=	${PATCHDIR}/extra-patch-frei0r-plugins
+EXTRA_PATCHES=	${PATCHDIR}/extra-patch-frei0r-plugins \
+		${PATCHDIR}/extra-patch-src_filter_facedetect_CMakeLists.txt
 
 USES+=	localbase
 .endif
 
 .if defined(BUILDING_FREI0R_OPENCV)
-PORTREVISION=	2
+PORTREVISION=	3
 COMMENT=	Frei0r OpenCV plugins
 PKGNAMESUFFIX=	-plugins-opencv
 LIB_DEPENDS+=	libopencv_legacy.so:graphics/opencv

Added: head/graphics/frei0r/files/extra-patch-src_filter_facedetect_CMakeLists.txt
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/frei0r/files/extra-patch-src_filter_facedetect_CMakeLists.txt	Wed Jan 17 09:59:37 2018	(r459232)
@@ -0,0 +1,15 @@
+The facedetect plugin cannot be built with C++11:
+
+frei0r-plugins-1.5.0/src/filter/facedetect/facedetect.cpp:271:15: 
+  error: non-constant-expression cannot be narrowed from type 'int' 
+  to 'double' in initializer list [-Wc++11-narrowing]
+
+--- src/filter/facedetect/CMakeLists.txt.orig	2018-01-17 09:42:26 UTC
++++ src/filter/facedetect/CMakeLists.txt
+@@ -11,5 +11,6 @@ LINK_LIBRARIES(${OpenCV_LIBS} ${OpenCV_LIBRARIES})
+ 
+ add_library (${TARGET}  MODULE ${SOURCES})
+ set_target_properties (${TARGET} PROPERTIES PREFIX "")
++set_property(TARGET facedetect PROPERTY CXX_STANDARD 98)
+ 
+ install (TARGETS ${TARGET} LIBRARY DESTINATION ${LIBDIR})