Attachment #204540 for bug #237135




PORTNAME=	cimg
DISTVERSIONPREFIX=	v.
DISTVERSION=	2.5.7
PORTREVISION=	1
PORTEPOCH=	3
CATEGORIES=	graphics devel


		libIlmImf.so:graphics/openexr		\
		libgimp-2.0.so:graphics/gimp-app	\
		libfftw3.so:math/fftw3			\
		libopencv_video.so:graphics/opencv	\
		libopencv_core.so:graphics/opencv-core	\
		libGraphicsMagick.so:graphics/GraphicsMagick
BUILD_DEPENDS+=	${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \
		${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3
RUN_DEPENDS+=	${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \
		${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3
USES+=		jpeg
ALL_TARGET=	Mlinux
. else

Lines 1-5 Link Here

(-)graphics/cimg/files/patch-examples__Makefile (-23 / +48 lines)
1	--- examples/Makefile.orig 2019-03-10 13:46:23 UTC	1	--- examples/Makefile.orig 2019-04-10 13:19:43 UTC
2	+++ examples/Makefile	2	+++ examples/Makefile
		3	@@ -1,6 +1,6 @@
		4	#
		5	# File : Makefile
		6	-# ( Makefile for GNU 'make' utility )
		7	+# ( Makefile for GNU 'ggmake' utility )
		8	#
		9	# Description : Makefile for compiling CImg-based code on Unix.
		10	# This file is a part of the CImg Library project.
3	@@ -89,7 +89,7 @@ VERSION2 = $(shell grep 'cimg_version\ ' ../CImg.h \| t	11	@@ -89,7 +89,7 @@ VERSION2 = $(shell grep 'cimg_version\ ' ../CImg.h \| t
4	VERSION3 = $(shell grep 'cimg_version\ ' ../CImg.h \| tail -c2 \| head -c1)	12	VERSION3 = $(shell grep 'cimg_version\ ' ../CImg.h \| tail -c2 \| head -c1)
5	SVERSION=$(VERSION1).$(VERSION2).$(VERSION3)	13	SVERSION=$(VERSION1).$(VERSION2).$(VERSION3)
Lines 30-36 Link Here
30	endif	38	endif
31	ifdef IS_ICPC	39	ifdef IS_ICPC
32	OPT_CFLAGS = -fast	40	OPT_CFLAGS = -fast
33	@@ -222,7 +222,7 @@ JPEG_LIBS = -ljpeg	41	@@ -165,9 +165,9 @@ endif
		42
		43	# Flags to enable OpenCV support.
		44	OPENCV_DEFINE = -Dcimg_use_opencv
		45	-OPENCV_INCDIR = $(shell pkg-config opencv --cflags \|\| echo -I/usr/include/opencv) -I/usr/include/opencv
		46	+OPENCV_INCDIR = $(shell pkg-config opencv3 --cflags \|\| echo -I/usr/include/opencv) -I/usr/include/opencv
		47	OPENCV_CFLAGS = $(OPENCV_DEFINE) $(OPENCV_INCDIR)
		48	-OPENCV_LIBS = $(shell pkg-config opencv --libs \|\| echo -lopencv_core -lopencv_highgui)
		49	+OPENCV_LIBS = $(shell pkg-config opencv3 --libs \|\| echo -lopencv_core -lopencv_highgui)
		50
		51	# Flags used to disable display capablities of CImg
		52	NODISPLAY_CFLAGS = -Dcimg_display=0
		53	@@ -217,7 +217,7 @@ JPEG_LIBS = -ljpeg
34	TIFF_DEFINE = -Dcimg_use_tiff	54	TIFF_DEFINE = -Dcimg_use_tiff
35	TIFF_INCDIR =	55	TIFF_INCDIR =
36	TIFF_CFLAGS = $(TIFF_DEFINE) $(TIFF_INCDIR)	56	TIFF_CFLAGS = $(TIFF_DEFINE) $(TIFF_INCDIR)
Lines 39-45 Link Here
39		59
40	# Flags to enable native support for MINC2 image files, using the MINC2 library.	60	# Flags to enable native support for MINC2 image files, using the MINC2 library.
41	# ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )	61	# ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide )
42	@@ -234,16 +234,16 @@ MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -	62	@@ -229,14 +229,14 @@ MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf -
43	# Flags to enable native support for EXR image files, using the OpenEXR library.	63	# Flags to enable native support for EXR image files, using the OpenEXR library.
44	# ( http://www.openexr.com/ )	64	# ( http://www.openexr.com/ )
45	OPENEXR_DEFINE = -Dcimg_use_openexr	65	OPENEXR_DEFINE = -Dcimg_use_openexr
Lines 50-77 Link Here
50		70
51	# Flags to enable native support for various video files, using the FFMPEG library.	71	# Flags to enable native support for various video files, using the FFMPEG library.
52	# ( http://www.ffmpeg.org/ )	72	# ( http://www.ffmpeg.org/ )
53	-FFMPEG_DEFINE = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS	73	FFMPEG_DEFINE = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS
54	-FFMPEG_INCDIR = -I/usr/include/libavcodec -I/usr/include/libavformat -I/usr/include/libswscale -I/usr/include/ffmpeg	74	-FFMPEG_INCDIR = -I/usr/include/libavcodec -I/usr/include/libavformat -I/usr/include/libswscale -I/usr/include/ffmpeg
55	-FFMPEG_CFLAGS = $(FFMPEG_DEFINE) $(FFMPEG_INCDIR)
56	-FFMPEG_LIBS = -lavcodec -lavformat -lswscale
57	+#FFMPEG_DEFINE = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS
58	+FFMPEG_INCDIR = -I$(LOCALBASE)/include/libavcodec -I$(LOCALBASE)/include/libavformat -I$(LOCALBASE)/include/libswscale -I$(LOCALBASE)/include/ffmpeg	75	+FFMPEG_INCDIR = -I$(LOCALBASE)/include/libavcodec -I$(LOCALBASE)/include/libavformat -I$(LOCALBASE)/include/libswscale -I$(LOCALBASE)/include/ffmpeg
59	+#FFMPEG_CFLAGS = $(FFMPEG_DEFINE) $(FFMPEG_INCDIR)	76	FFMPEG_CFLAGS = $(FFMPEG_DEFINE) $(FFMPEG_INCDIR)
60	+#FFMPEG_LIBS = -lavcodec -lavformat -lswscale	77	FFMPEG_LIBS = -lavcodec -lavformat -lswscale
61		78
62	# Flags to enable native support for compressed .cimgz files, using the Zlib library.	79	@@ -277,12 +277,12 @@ endif
63	# ( http://www.zlib.net/ )	80	LAPACK_DEFINE = -Dcimg_use_lapack
64	@@ -279,15 +279,15 @@ endif
65
66	# Flags to enable the use of LAPACK routines for matrix computation
67	# ( http://www.netlib.org/lapack/ )
68	-LAPACK_DEFINE = -Dcimg_use_lapack
69	+#LAPACK_DEFINE = -Dcimg_use_lapack
70	LAPACK_INCDIR =	81	LAPACK_INCDIR =
71	-LAPACK_CFLAGS = $(LAPACK_DEFINE) $(LAPACK_INCDIR)	82	LAPACK_CFLAGS = $(LAPACK_DEFINE) $(LAPACK_INCDIR)
72	-LAPACK_LIBS = -lblas -llapack	83	-LAPACK_LIBS = -lblas -llapack
73	+#LAPACK_CFLAGS = $(LAPACK_DEFINE) $(LAPACK_INCDIR)	84	+LAPACK_LIBS = -L/usr/local/lib -L/usr/local/lib -lblas -llapack
74	+#LAPACK_LIBS = -lblas -llapack
75		85
76	# Flags to enable the use of the Board library	86	# Flags to enable the use of the Board library
77	# ( https://github.com/c-koi/libboard )	87	# ( https://github.com/c-koi/libboard )
Lines 81-87 Link Here
81	BOARD_CFLAGS = $(BOARD_DEFINE) $(BOARD_INCDIR)	91	BOARD_CFLAGS = $(BOARD_DEFINE) $(BOARD_INCDIR)
82	BOARD_LIBS = -lboard	92	BOARD_LIBS = -lboard
83		93
84	@@ -366,6 +366,7 @@ $(X11_LIBS) \	94	@@ -336,7 +336,7 @@ menu:
		95	@echo " > clean : Clean generated files."
		96	@echo
		97	@echo "Choose your option :"
		98	- @read CHOICE; echo; $(MAKE) $$CHOICE; echo; echo "> Next time, you can bypass the menu by typing directly 'make $$CHOICE'"; echo;
		99	+ @read CHOICE; echo; $(MAKE) $$CHOICE; echo; echo "> Next time, you can bypass the menu by typing directly 'ggmake $$CHOICE'"; echo;
		100
		101	all: $(FILES)
		102
		103	@@ -361,6 +361,7 @@ $(X11_LIBS) \
85	$(TIFF_LIBS) \	104	$(TIFF_LIBS) \
86	$(LAPACK_LIBS) \	105	$(LAPACK_LIBS) \
87	$(XSHM_LIBS)" \	106	$(XSHM_LIBS)" \
Lines 89-95 Link Here
89	all $(EXTRA_FILES)	108	all $(EXTRA_FILES)
90		109
91	# Linux/BSD/Mac OSX targets, with X11 display.	110	# Linux/BSD/Mac OSX targets, with X11 display.
92	@@ -458,8 +459,11 @@ $(ZLIB_CFLAGS) \	111	@@ -453,8 +454,11 @@ $(ZLIB_CFLAGS) \
93	$(CURL_CFLAGS) \	112	$(CURL_CFLAGS) \
94	$(OPENCV_CFLAGS) \	113	$(OPENCV_CFLAGS) \
95	$(MAGICK_CFLAGS) \	114	$(MAGICK_CFLAGS) \
Lines 101-107 Link Here
101	$(X11_LIBS) \	120	$(X11_LIBS) \
102	$(XSHM_LIBS) \	121	$(XSHM_LIBS) \
103	$(XRANDR_LIBS) \	122	$(XRANDR_LIBS) \
104	@@ -471,6 +475,8 @@ $(ZLIB_LIBS) \	123	@@ -466,6 +470,8 @@ $(ZLIB_LIBS) \
105	$(CURL_LIBS) \	124	$(CURL_LIBS) \
106	$(OPENCV_LIBS) \	125	$(OPENCV_LIBS) \
107	$(MAGICK_LIBS) \	126	$(MAGICK_LIBS) \
Lines 110-112 Link Here
110	$(FFTW3_LIBS)" \	129	$(FFTW3_LIBS)" \
111	"STRIP_EXE=true" \	130	"STRIP_EXE=true" \
112	all $(EXTRA_FILES)	131	all $(EXTRA_FILES)
		132	@@ -679,4 +685,4 @@ $(FFTW3_LIBS)" \
		133	"STRIP_EXE=true" \
		134	all $(EXTRA_FILES)
		135
		136	-# End of makefile
		137	+# End of ggmakefile





PORTNAME=	gmic
PORTVERSION=	1.6.9
PORTREVISION=	20
CATEGORIES=	graphics
MASTER_SITES=	http://gmic.eu/files/source/
PKGNAMEPREFIX=	gimp-


LIB_DEPENDS=	libGraphicsMagick++.so:graphics/GraphicsMagick \
		libIlmImf.so:graphics/openexr \
		libopencv_video.so:graphics/opencv \
		libMagick++-6.so:graphics/ImageMagick6 \
		libavcodec.so:multimedia/ffmpeg \
		libfftw3.so:math/fftw3 \
		libgimp-2.0.so:graphics/gimp-app \
		libcurl.so:ftp/curl
BUILD_DEPENDS=	${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3
RUN_DEPENDS=	${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3

OPTIONS_DEFINE=	BASH EXAMPLES
OPTIONS_SUB=	yes




--- Makefile.orig	2019-05-17 15:01:43 UTC
+++ Makefile
@@ -158,14 +158,14 @@ OPENMP_LIBS = -lgomp
 # This requires the presence of the X11 include and library files.

 endif
 endif
 # Flags to enable fast display, using XShm.
@@ -215,8 +215,8 @@ CURL_LIBS = `pkg-config --libs libcurl || echo -lcurl`
 
 # Flags to enable native support of webcams and video streaming, using the OpenCV library.
 # This requires the presence of the OpenCV include and library files.
-OPENCV_CFLAGS = -Dcimg_use_opencv  `pkg-config opencv --cflags || echo -I/usr/include/opencv` -I/usr/include/opencv
-OPENCV_LIBS = `pkg-config opencv --libs || echo -lopencv_core -lopencv_highgui`
+OPENCV_CFLAGS = -Dcimg_use_opencv  `pkg-config opencv3 --cflags || echo -I/usr/include/opencv` -I/usr/include/opencv
+OPENCV_LIBS = `pkg-config opencv3 --libs || echo -lopencv_core -lopencv_highgui`
 
 # Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
 # This requires the presence of the GraphicsMagick++ include and library files.
@@ -287,7 +287,7 @@ STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(X11_CFLAGS)
 STD_GIMP_LIBS += $(PARALLEL_LIBS) $(X11_LIBS)
 else # Windows.
 STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(GDI32_CFLAGS)





BROKEN_i386=	error: "c++ crashes, clang-5 and 6 fail: undefined reference to `__atomic_load'"

BUILD_DEPENDS=	${LOCALBASE}/include/CImg.h:graphics/cimg \
		${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \
		${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3
RUN_DEPENDS=	${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \
		${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3
LIB_DEPENDS=	libfftw3.so:math/fftw3 \
		libGraphicsMagick++.so:graphics/GraphicsMagick \
		libIlmImf.so:graphics/openexr \
		libImath.so:graphics/ilmbase \
		libopencv_core.so:graphics/opencv-core \
		libopencv_video.so:graphics/opencv \
		libpng.so:graphics/png \
		libtiff.so:graphics/tiff


Lines 11-17 Link Here

(-)graphics/gstreamer1-plugins-opencv/Makefile (-1 / +1 lines)
11	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins	11	MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
12		12
13	# Clang has issues with Overloaded stuff inside OpenCV	13	# Clang has issues with Overloaded stuff inside OpenCV
14	CXXFLAGS+= -Wno-overloaded-virtual	14	# CXXFLAGS+= -Wno-overloaded-virtual
15		15
16	PLIST= ${.CURDIR}/pkg-plist	16	PLIST= ${.CURDIR}/pkg-plist
17		17

Lines 1-5 Link Here

(-)graphics/gstreamer1-plugins-opencv/pkg-plist (+1 lines)
1	include/gstreamer-%%VERSION%%/gst/opencv/gstopencvutils.h	1	include/gstreamer-%%VERSION%%/gst/opencv/gstopencvutils.h
2	include/gstreamer-%%VERSION%%/gst/opencv/gstopencvvideofilter.h	2	include/gstreamer-%%VERSION%%/gst/opencv/gstopencvvideofilter.h
		3	include/gstreamer-%%VERSION%%/gst/opencv/opencv-prelude.h
3	lib/gstreamer-%%VERSION%%/libgstopencv.so	4	lib/gstreamer-%%VERSION%%/libgstopencv.so
4	lib/libgstopencv-%%VERSION%%.so	5	lib/libgstopencv-%%VERSION%%.so
5	lib/libgstopencv-%%VERSION%%.so.0	6	lib/libgstopencv-%%VERSION%%.so.0

Lines 15-21 Link Here

(-)graphics/p5-Image-ObjectDetect/Makefile (-1 / +1 lines)
15	LICENSE_COMB= dual	15	LICENSE_COMB= dual
16		16
17	BUILD_DEPENDS= ${RUN_DEPENDS}	17	BUILD_DEPENDS= ${RUN_DEPENDS}
18	RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/opencv.pc:graphics/opencv	18	RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/opencv3.pc:graphics/opencv3
19		19
20	USE_PERL5= configure	20	USE_PERL5= configure
21	USES= perl5 pkgconfig	21	USES= perl5 pkgconfig




--- Makefile.PL.orig	2010-12-19 07:00:27 UTC
+++ Makefile.PL
@@ -3,8 +3,8 @@ use warnings;
 use ExtUtils::MakeMaker;
 
 link("lib/Image/ObjectDetect.xs", "ObjectDetect.xs");
-chomp(my $libs    = `pkg-config opencv --libs`);
-chomp(my $ccflags = `pkg-config opencv --cflags`);
+chomp(my $libs    = `pkg-config opencv3 --libs`);
+chomp(my $ccflags = `pkg-config opencv3 --cflags`);
 die "cannot find opencv library." unless $libs;
 $ccflags .= '-Isrc '.$ccflags;
 WriteMakefile(
@@ -16,7 +16,7 @@ WriteMakefile(
         'Test::More' => 0.32,
     },
     LIBS                => $libs,

Lines 12-18 Link Here

(-)graphics/rubygem-objectdetect/Makefile (-1 / +2 lines)
12		12
13	LICENSE= MIT	13	LICENSE= MIT
14		14
15	LIB_DEPENDS= libopencv_video.so:graphics/opencv	15	BUILD_DEPENDS= ${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3
		16	RUN_DEPENDS= ${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3
16		17
17	USE_RUBY= yes	18	USE_RUBY= yes
18	USES= gem pkgconfig	19	USES= gem pkgconfig

Line 0 Link Here

(-)graphics/rubygem-objectdetect/files/patch-ext_extconf.rb (+7 lines)
	1	--- ext/extconf.rb.orig 2019-05-21 11:58:20 UTC
	2	+++ ext/extconf.rb
	3	@@ -1,3 +1,3 @@
	4	require 'mkmf'
	5	-pkg_config 'opencv'
	6	+pkg_config 'opencv3'
	7	create_makefile 'objectdetect'




gst_ogg_LIB_DEPENDS=	libogg.so:audio/libogg

# opencv
# EXTRA_MODULES option is needed for graphics/opencv3
gst_opencv_BUILD_DEPENDS+=	${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \
			${LOCALBASE}/lib/opencv3.4/libopencv_highgui.so:graphics/opencv3 \
			${LOCALBASE}/lib/opencv3.4/libopencv_bgsegm.so:graphics/opencv3
gst_opencv_RUN_DEPENDS+=	${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \
			${LOCALBASE}/lib/opencv3.4/libopencv_highgui.so:graphics/opencv3 \
			${LOCALBASE}/lib/opencv3.4/libopencv_bgsegm.so:graphics/opencv3
gst_opencv_GST_PLUGIN_DIR=	gst-libs/gst/opencv ext/opencv
gst_opencv_PLIST_FILES=		#
gst_opencv_USES=	autoreconf compiler:c++11-lib

# openexr
gst_openexr_LIB_DEPENDS=libImath.so:graphics/ilmbase \




--- configure.ac.orig	2019-05-17 22:02:57 UTC
+++ configure.ac
@@ -1836,7 +1836,7 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv,
   dnl a new version and the no-backward-compatibility define. (There doesn't
   dnl seem to be a switch to suppress the warnings the cvcompat.h header
   dnl causes.)
-  PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.0 opencv < 3.5.0 , [
+  PKG_CHECK_MODULES(OPENCV, opencv3 >= 2.3.0 opencv3 < 3.5.0 , [
     AC_PROG_CXX
     AC_LANG([C++])
     OLD_CPPFLAGS=$CPPFLAGS
@@ -1851,7 +1851,7 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv,
                       opencv2/video/background_segm.hpp], [], [something_not_found=yes])
 
     dnl Only required for OpenCV >= 3, we have compat code for older versions
-    PKG_CHECK_MODULES(OPENCV_3, opencv >= 3, [
+    PKG_CHECK_MODULES(OPENCV_3, opencv3 >= 3, [
       dnl check opencv_contrib headers (not always present in opencv distributions)
       AC_CHECK_HEADERS([opencv2/bgsegm.hpp], [], [something_not_found=yes])],
       [NOT_A_PROBLEM=yes])

Lines 56-63 Link Here

(-)graphics/shotwell/Makefile (-2 / +8 lines)
56		56
57	FACED_CONFIGURE_ON= -Dface-detection=true	57	FACED_CONFIGURE_ON= -Dface-detection=true
58	FACED_CONFIGURE_OFF= -Dface-detection=false	58	FACED_CONFIGURE_OFF= -Dface-detection=false
59	FACED_LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \	59	FACED_BUILD_DEPENDS= ${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \
60	libopencv_photo.so:graphics/opencv	60	${LOCALBASE}/lib/opencv3.4/libopencv_photo.so:graphics/opencv3
		61	FACED_RUN_DEPENDS= ${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \
		62	${LOCALBASE}/lib/opencv3.4/libopencv_photo.so:graphics/opencv3
61	OPENMP_USES= compiler:openmp	63	OPENMP_USES= compiler:openmp
62	OPENMP_USES_OFF= compiler:c++11-lib	64	OPENMP_USES_OFF= compiler:c++11-lib
63		65
Lines 65-68 Link Here
65		67
66	GLIB_SCHEMAS= org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml	68	GLIB_SCHEMAS= org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml
67		69
		70	post-patch-FACED-on:
		71	${REINPLACE_CMD} -e 's/opencv/opencv3/' \
		72	${WRKSRC}/facedetect/meson.build
		73
68	.include <bsd.port.mk>	74	.include <bsd.port.mk>

Return to bug 237135

Lines 371-381 Link Here

(-)multimedia/gstreamer1-plugins/Makefile.common (-3 / +8 lines)
371	gst_ogg_LIB_DEPENDS= libogg.so:audio/libogg	371	gst_ogg_LIB_DEPENDS= libogg.so:audio/libogg
372		372
373	# opencv	373	# opencv
374	gst_opencv_LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \	374	# EXTRA_MODULES option is needed for graphics/opencv3
375	libopencv_highgui.so:graphics/opencv	375	gst_opencv_BUILD_DEPENDS+= ${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \
		376	${LOCALBASE}/lib/opencv3.4/libopencv_highgui.so:graphics/opencv3 \
		377	${LOCALBASE}/lib/opencv3.4/libopencv_bgsegm.so:graphics/opencv3
		378	gst_opencv_RUN_DEPENDS+= ${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \
		379	${LOCALBASE}/lib/opencv3.4/libopencv_highgui.so:graphics/opencv3 \
		380	${LOCALBASE}/lib/opencv3.4/libopencv_bgsegm.so:graphics/opencv3
376	gst_opencv_GST_PLUGIN_DIR= gst-libs/gst/opencv ext/opencv	381	gst_opencv_GST_PLUGIN_DIR= gst-libs/gst/opencv ext/opencv
377	gst_opencv_PLIST_FILES= #	382	gst_opencv_PLIST_FILES= #
378	gst_opencv_USES= compiler:c++11-lib	383	gst_opencv_USES= autoreconf compiler:c++11-lib
379		384
380	# openexr	385	# openexr
381	gst_openexr_LIB_DEPENDS=libImath.so:graphics/ilmbase \	386	gst_openexr_LIB_DEPENDS=libImath.so:graphics/ilmbase \

Lines 4-9 Link Here

(-)graphics/cimg/Makefile (-2 / +5 lines)
4	PORTNAME= cimg	4	PORTNAME= cimg
5	DISTVERSIONPREFIX= v.	5	DISTVERSIONPREFIX= v.
6	DISTVERSION= 2.5.7	6	DISTVERSION= 2.5.7
		7	PORTREVISION= 1
7	PORTEPOCH= 3	8	PORTEPOCH= 3
8	CATEGORIES= graphics devel	9	CATEGORIES= graphics devel
9		10
Lines 61-69 Link Here
61	libIlmImf.so:graphics/openexr \	62	libIlmImf.so:graphics/openexr \
62	libgimp-2.0.so:graphics/gimp-app \	63	libgimp-2.0.so:graphics/gimp-app \
63	libfftw3.so:math/fftw3 \	64	libfftw3.so:math/fftw3 \
64	libopencv_video.so:graphics/opencv \
65	libopencv_core.so:graphics/opencv-core \
66	libGraphicsMagick.so:graphics/GraphicsMagick	65	libGraphicsMagick.so:graphics/GraphicsMagick
		66	BUILD_DEPENDS+= ${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \
		67	${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3
		68	RUN_DEPENDS+= ${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \
		69	${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3
67	USES+= jpeg	70	USES+= jpeg
68	ALL_TARGET= Mlinux	71	ALL_TARGET= Mlinux
69	. else	72	. else

Lines 2-8 Link Here

(-)graphics/gimp-gmic-plugin/Makefile (-2 / +3 lines)
2		2
3	PORTNAME= gmic	3	PORTNAME= gmic
4	PORTVERSION= 1.6.9	4	PORTVERSION= 1.6.9
5	PORTREVISION= 19	5	PORTREVISION= 20
6	CATEGORIES= graphics	6	CATEGORIES= graphics
7	MASTER_SITES= http://gmic.eu/files/source/	7	MASTER_SITES= http://gmic.eu/files/source/
8	PKGNAMEPREFIX= gimp-	8	PKGNAMEPREFIX= gimp-
Lines 14-25 Link Here
14		14
15	LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick \	15	LIB_DEPENDS= libGraphicsMagick++.so:graphics/GraphicsMagick \
16	libIlmImf.so:graphics/openexr \	16	libIlmImf.so:graphics/openexr \
17	libopencv_video.so:graphics/opencv \
18	libMagick++-6.so:graphics/ImageMagick6 \	17	libMagick++-6.so:graphics/ImageMagick6 \
19	libavcodec.so:multimedia/ffmpeg \	18	libavcodec.so:multimedia/ffmpeg \
20	libfftw3.so:math/fftw3 \	19	libfftw3.so:math/fftw3 \
21	libgimp-2.0.so:graphics/gimp-app \	20	libgimp-2.0.so:graphics/gimp-app \
22	libcurl.so:ftp/curl	21	libcurl.so:ftp/curl
		22	BUILD_DEPENDS= ${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3
		23	RUN_DEPENDS= ${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3
23		24
24	OPTIONS_DEFINE= BASH EXAMPLES	25	OPTIONS_DEFINE= BASH EXAMPLES
25	OPTIONS_SUB= yes	26	OPTIONS_SUB= yes

Lines 1-4 Link Here

(-)graphics/gimp-gmic-plugin/files/patch-Makefile (-2 / +13 lines)
1	--- Makefile.orig 2016-03-22 21:02:38 UTC	1	--- Makefile.orig 2019-05-17 15:01:43 UTC
2	+++ Makefile	2	+++ Makefile
3	@@ -158,14 +158,14 @@ OPENMP_LIBS = -lgomp	3	@@ -158,14 +158,14 @@ OPENMP_LIBS = -lgomp
4	# This requires the presence of the X11 include and library files.	4	# This requires the presence of the X11 include and library files.
Lines 18-24 Link Here
18	endif	18	endif
19	endif	19	endif
20	# Flags to enable fast display, using XShm.	20	# Flags to enable fast display, using XShm.
21	@@ -287,7 +287,7 @@ STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(	21	@@ -215,8 +215,8 @@ CURL_LIBS = `pkg-config --libs libcurl \|\| echo -lcurl`
		22
		23	# Flags to enable native support of webcams and video streaming, using the OpenCV library.
		24	# This requires the presence of the OpenCV include and library files.
		25	-OPENCV_CFLAGS = -Dcimg_use_opencv `pkg-config opencv --cflags \|\| echo -I/usr/include/opencv` -I/usr/include/opencv
		26	-OPENCV_LIBS = `pkg-config opencv --libs \|\| echo -lopencv_core -lopencv_highgui`
		27	+OPENCV_CFLAGS = -Dcimg_use_opencv `pkg-config opencv3 --cflags \|\| echo -I/usr/include/opencv` -I/usr/include/opencv
		28	+OPENCV_LIBS = `pkg-config opencv3 --libs \|\| echo -lopencv_core -lopencv_highgui`
		29
		30	# Flags to enable native support of most classical image file formats, using the GraphicsMagick++ library.
		31	# This requires the presence of the GraphicsMagick++ include and library files.
		32	@@ -287,7 +287,7 @@ STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(X11_CFLAGS)
22	STD_GIMP_LIBS += $(PARALLEL_LIBS) $(X11_LIBS)	33	STD_GIMP_LIBS += $(PARALLEL_LIBS) $(X11_LIBS)
23	else # Windows.	34	else # Windows.
24	STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(GDI32_CFLAGS)	35	STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $(OPENMP_CFLAGS) $(GDI32_CFLAGS)

Lines 16-28 Link Here

(-)graphics/gmic/Makefile (-3 / +5 lines)
16		16
17	BROKEN_i386= error: "c++ crashes, clang-5 and 6 fail: undefined reference to `__atomic_load'"	17	BROKEN_i386= error: "c++ crashes, clang-5 and 6 fail: undefined reference to `__atomic_load'"
18		18
19	BUILD_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg	19	BUILD_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg \
		20	${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \
		21	${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3
		22	RUN_DEPENDS= ${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \
		23	${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3
20	LIB_DEPENDS= libfftw3.so:math/fftw3 \	24	LIB_DEPENDS= libfftw3.so:math/fftw3 \
21	libGraphicsMagick++.so:graphics/GraphicsMagick \	25	libGraphicsMagick++.so:graphics/GraphicsMagick \
22	libIlmImf.so:graphics/openexr \	26	libIlmImf.so:graphics/openexr \
23	libImath.so:graphics/ilmbase \	27	libImath.so:graphics/ilmbase \
24	libopencv_core.so:graphics/opencv-core \
25	libopencv_video.so:graphics/opencv \
26	libpng.so:graphics/png \	28	libpng.so:graphics/png \
27	libtiff.so:graphics/tiff	29	libtiff.so:graphics/tiff
28		30

Lines 1-6 Link Here

(-)graphics/p5-Image-ObjectDetect/files/patch-Makefile.PL (-3 / +14 lines)
1	--- Makefile.PL.orig 2012-03-01 11:06:49.000000000 +0000	1	--- Makefile.PL.orig 2010-12-19 07:00:27 UTC
2	+++ Makefile.PL 2012-03-01 11:07:14.000000000 +0000	2	+++ Makefile.PL
3	@@ -16,7 +16,7 @@	3	@@ -3,8 +3,8 @@ use warnings;
		4	use ExtUtils::MakeMaker;
		5
		6	link("lib/Image/ObjectDetect.xs", "ObjectDetect.xs");
		7	-chomp(my $libs = `pkg-config opencv --libs`);
		8	-chomp(my $ccflags = `pkg-config opencv --cflags`);
		9	+chomp(my $libs = `pkg-config opencv3 --libs`);
		10	+chomp(my $ccflags = `pkg-config opencv3 --cflags`);
		11	die "cannot find opencv library." unless $libs;
		12	$ccflags .= '-Isrc '.$ccflags;
		13	WriteMakefile(
		14	@@ -16,7 +16,7 @@ WriteMakefile(
4	'Test::More' => 0.32,	15	'Test::More' => 0.32,
5	},	16	},
6	LIBS => $libs,	17	LIBS => $libs,

Line 0 Link Here

(-)multimedia/gstreamer1-plugins-bad/files/patch-configure.ac (+20 lines)
	1	--- configure.ac.orig 2019-05-17 22:02:57 UTC
	2	+++ configure.ac
	3	@@ -1836,7 +1836,7 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv,
	4	dnl a new version and the no-backward-compatibility define. (There doesn't
	5	dnl seem to be a switch to suppress the warnings the cvcompat.h header
	6	dnl causes.)
	7	- PKG_CHECK_MODULES(OPENCV, opencv >= 2.3.0 opencv < 3.5.0 , [
	8	+ PKG_CHECK_MODULES(OPENCV, opencv3 >= 2.3.0 opencv3 < 3.5.0 , [
	9	AC_PROG_CXX
	10	AC_LANG([C++])
	11	OLD_CPPFLAGS=$CPPFLAGS
	12	@@ -1851,7 +1851,7 @@ AG_GST_CHECK_FEATURE(OPENCV, [opencv plugins], opencv,
	13	opencv2/video/background_segm.hpp], [], [something_not_found=yes])
	14
	15	dnl Only required for OpenCV >= 3, we have compat code for older versions
	16	- PKG_CHECK_MODULES(OPENCV_3, opencv >= 3, [
	17	+ PKG_CHECK_MODULES(OPENCV_3, opencv3 >= 3, [
	18	dnl check opencv_contrib headers (not always present in opencv distributions)
	19	AC_CHECK_HEADERS([opencv2/bgsegm.hpp], [], [something_not_found=yes])],
	20	[NOT_A_PROBLEM=yes])