Index: graphics/cimg/Makefile =================================================================== --- graphics/cimg/Makefile (revision 500577) +++ graphics/cimg/Makefile (working copy) @@ -4,6 +4,7 @@ PORTNAME= cimg DISTVERSIONPREFIX= v. DISTVERSION= 2.5.7 +PORTREVISION= 1 PORTEPOCH= 3 CATEGORIES= graphics devel @@ -61,9 +62,11 @@ 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 Index: graphics/cimg/files/patch-examples__Makefile =================================================================== --- graphics/cimg/files/patch-examples__Makefile (revision 500577) +++ graphics/cimg/files/patch-examples__Makefile (working copy) @@ -1,5 +1,13 @@ ---- examples/Makefile.orig 2019-03-10 13:46:23 UTC +--- examples/Makefile.orig 2019-04-10 13:19:43 UTC +++ examples/Makefile +@@ -1,6 +1,6 @@ + # + # File : Makefile +-# ( Makefile for GNU 'make' utility ) ++# ( Makefile for GNU 'ggmake' utility ) + # + # Description : Makefile for compiling CImg-based code on Unix. + # This file is a part of the CImg Library project. @@ -89,7 +89,7 @@ VERSION2 = $(shell grep 'cimg_version\ ' ../CImg.h | t VERSION3 = $(shell grep 'cimg_version\ ' ../CImg.h | tail -c2 | head -c1) SVERSION=$(VERSION1).$(VERSION2).$(VERSION3) @@ -30,7 +38,19 @@ endif ifdef IS_ICPC OPT_CFLAGS = -fast -@@ -222,7 +222,7 @@ JPEG_LIBS = -ljpeg +@@ -165,9 +165,9 @@ endif + + # Flags to enable OpenCV support. + OPENCV_DEFINE = -Dcimg_use_opencv +-OPENCV_INCDIR = $(shell pkg-config opencv --cflags || echo -I/usr/include/opencv) -I/usr/include/opencv ++OPENCV_INCDIR = $(shell pkg-config opencv3 --cflags || echo -I/usr/include/opencv) -I/usr/include/opencv + OPENCV_CFLAGS = $(OPENCV_DEFINE) $(OPENCV_INCDIR) +-OPENCV_LIBS = $(shell pkg-config opencv --libs || echo -lopencv_core -lopencv_highgui) ++OPENCV_LIBS = $(shell pkg-config opencv3 --libs || echo -lopencv_core -lopencv_highgui) + + # Flags used to disable display capablities of CImg + NODISPLAY_CFLAGS = -Dcimg_display=0 +@@ -217,7 +217,7 @@ JPEG_LIBS = -ljpeg TIFF_DEFINE = -Dcimg_use_tiff TIFF_INCDIR = TIFF_CFLAGS = $(TIFF_DEFINE) $(TIFF_INCDIR) @@ -39,7 +59,7 @@ # Flags to enable native support for MINC2 image files, using the MINC2 library. # ( http://en.wikibooks.org/wiki/MINC/Reference/MINC2.0_Users_Guide ) -@@ -234,16 +234,16 @@ MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf - +@@ -229,14 +229,14 @@ MINC2_LIBS = -lminc_io -lvolume_io2 -lminc2 -lnetcdf - # Flags to enable native support for EXR image files, using the OpenEXR library. # ( http://www.openexr.com/ ) OPENEXR_DEFINE = -Dcimg_use_openexr @@ -50,28 +70,18 @@ # Flags to enable native support for various video files, using the FFMPEG library. # ( http://www.ffmpeg.org/ ) --FFMPEG_DEFINE = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS + FFMPEG_DEFINE = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS -FFMPEG_INCDIR = -I/usr/include/libavcodec -I/usr/include/libavformat -I/usr/include/libswscale -I/usr/include/ffmpeg --FFMPEG_CFLAGS = $(FFMPEG_DEFINE) $(FFMPEG_INCDIR) --FFMPEG_LIBS = -lavcodec -lavformat -lswscale -+#FFMPEG_DEFINE = -Dcimg_use_ffmpeg -D__STDC_CONSTANT_MACROS +FFMPEG_INCDIR = -I$(LOCALBASE)/include/libavcodec -I$(LOCALBASE)/include/libavformat -I$(LOCALBASE)/include/libswscale -I$(LOCALBASE)/include/ffmpeg -+#FFMPEG_CFLAGS = $(FFMPEG_DEFINE) $(FFMPEG_INCDIR) -+#FFMPEG_LIBS = -lavcodec -lavformat -lswscale + FFMPEG_CFLAGS = $(FFMPEG_DEFINE) $(FFMPEG_INCDIR) + FFMPEG_LIBS = -lavcodec -lavformat -lswscale - # Flags to enable native support for compressed .cimgz files, using the Zlib library. - # ( http://www.zlib.net/ ) -@@ -279,15 +279,15 @@ endif - - # Flags to enable the use of LAPACK routines for matrix computation - # ( http://www.netlib.org/lapack/ ) --LAPACK_DEFINE = -Dcimg_use_lapack -+#LAPACK_DEFINE = -Dcimg_use_lapack +@@ -277,12 +277,12 @@ endif + LAPACK_DEFINE = -Dcimg_use_lapack LAPACK_INCDIR = --LAPACK_CFLAGS = $(LAPACK_DEFINE) $(LAPACK_INCDIR) + LAPACK_CFLAGS = $(LAPACK_DEFINE) $(LAPACK_INCDIR) -LAPACK_LIBS = -lblas -llapack -+#LAPACK_CFLAGS = $(LAPACK_DEFINE) $(LAPACK_INCDIR) -+#LAPACK_LIBS = -lblas -llapack ++LAPACK_LIBS = -L/usr/local/lib -L/usr/local/lib -lblas -llapack # Flags to enable the use of the Board library # ( https://github.com/c-koi/libboard ) @@ -81,7 +91,16 @@ BOARD_CFLAGS = $(BOARD_DEFINE) $(BOARD_INCDIR) BOARD_LIBS = -lboard -@@ -366,6 +366,7 @@ $(X11_LIBS) \ +@@ -336,7 +336,7 @@ menu: + @echo " > clean : Clean generated files." + @echo + @echo "Choose your option :" +- @read CHOICE; echo; $(MAKE) $$CHOICE; echo; echo "> Next time, you can bypass the menu by typing directly 'make $$CHOICE'"; echo; ++ @read CHOICE; echo; $(MAKE) $$CHOICE; echo; echo "> Next time, you can bypass the menu by typing directly 'ggmake $$CHOICE'"; echo; + + all: $(FILES) + +@@ -361,6 +361,7 @@ $(X11_LIBS) \ $(TIFF_LIBS) \ $(LAPACK_LIBS) \ $(XSHM_LIBS)" \ @@ -89,7 +108,7 @@ all $(EXTRA_FILES) # Linux/BSD/Mac OSX targets, with X11 display. -@@ -458,8 +459,11 @@ $(ZLIB_CFLAGS) \ +@@ -453,8 +454,11 @@ $(ZLIB_CFLAGS) \ $(CURL_CFLAGS) \ $(OPENCV_CFLAGS) \ $(MAGICK_CFLAGS) \ @@ -101,7 +120,7 @@ $(X11_LIBS) \ $(XSHM_LIBS) \ $(XRANDR_LIBS) \ -@@ -471,6 +475,8 @@ $(ZLIB_LIBS) \ +@@ -466,6 +470,8 @@ $(ZLIB_LIBS) \ $(CURL_LIBS) \ $(OPENCV_LIBS) \ $(MAGICK_LIBS) \ @@ -110,3 +129,9 @@ $(FFTW3_LIBS)" \ "STRIP_EXE=true" \ all $(EXTRA_FILES) +@@ -679,4 +685,4 @@ $(FFTW3_LIBS)" \ + "STRIP_EXE=true" \ + all $(EXTRA_FILES) + +-# End of makefile ++# End of ggmakefile Index: graphics/gimp-gmic-plugin/Makefile =================================================================== --- graphics/gimp-gmic-plugin/Makefile (revision 500577) +++ graphics/gimp-gmic-plugin/Makefile (working copy) @@ -2,7 +2,7 @@ PORTNAME= gmic PORTVERSION= 1.6.9 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= graphics MASTER_SITES= http://gmic.eu/files/source/ PKGNAMEPREFIX= gimp- @@ -14,12 +14,13 @@ 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 Index: graphics/gimp-gmic-plugin/files/patch-Makefile =================================================================== --- graphics/gimp-gmic-plugin/files/patch-Makefile (revision 500577) +++ graphics/gimp-gmic-plugin/files/patch-Makefile (working copy) @@ -1,4 +1,4 @@ ---- Makefile.orig 2016-03-22 21:02:38 UTC +--- 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. @@ -18,7 +18,18 @@ endif endif # Flags to enable fast display, using XShm. -@@ -287,7 +287,7 @@ STD_GIMP_CFLAGS += $(PARALLEL_CFLAGS) $( +@@ -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) Index: graphics/gmic/Makefile =================================================================== --- graphics/gmic/Makefile (revision 500577) +++ graphics/gmic/Makefile (working copy) @@ -16,13 +16,15 @@ BROKEN_i386= error: "c++ crashes, clang-5 and 6 fail: undefined reference to `__atomic_load'" -BUILD_DEPENDS= ${LOCALBASE}/include/CImg.h:graphics/cimg +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 Index: graphics/gstreamer1-plugins-opencv/Makefile =================================================================== --- graphics/gstreamer1-plugins-opencv/Makefile (revision 500577) +++ graphics/gstreamer1-plugins-opencv/Makefile (working copy) @@ -11,7 +11,7 @@ MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins # Clang has issues with Overloaded stuff inside OpenCV -CXXFLAGS+= -Wno-overloaded-virtual +# CXXFLAGS+= -Wno-overloaded-virtual PLIST= ${.CURDIR}/pkg-plist Index: graphics/gstreamer1-plugins-opencv/pkg-plist =================================================================== --- graphics/gstreamer1-plugins-opencv/pkg-plist (revision 500577) +++ graphics/gstreamer1-plugins-opencv/pkg-plist (working copy) @@ -1,5 +1,6 @@ include/gstreamer-%%VERSION%%/gst/opencv/gstopencvutils.h include/gstreamer-%%VERSION%%/gst/opencv/gstopencvvideofilter.h +include/gstreamer-%%VERSION%%/gst/opencv/opencv-prelude.h lib/gstreamer-%%VERSION%%/libgstopencv.so lib/libgstopencv-%%VERSION%%.so lib/libgstopencv-%%VERSION%%.so.0 Index: graphics/p5-Image-ObjectDetect/Makefile =================================================================== --- graphics/p5-Image-ObjectDetect/Makefile (revision 500577) +++ graphics/p5-Image-ObjectDetect/Makefile (working copy) @@ -15,7 +15,7 @@ LICENSE_COMB= dual BUILD_DEPENDS= ${RUN_DEPENDS} -RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/opencv.pc:graphics/opencv +RUN_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/opencv3.pc:graphics/opencv3 USE_PERL5= configure USES= perl5 pkgconfig Index: graphics/p5-Image-ObjectDetect/files/patch-Makefile.PL =================================================================== --- graphics/p5-Image-ObjectDetect/files/patch-Makefile.PL (revision 500577) +++ graphics/p5-Image-ObjectDetect/files/patch-Makefile.PL (working copy) @@ -1,6 +1,17 @@ ---- Makefile.PL.orig 2012-03-01 11:06:49.000000000 +0000 -+++ Makefile.PL 2012-03-01 11:07:14.000000000 +0000 -@@ -16,7 +16,7 @@ +--- 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, Index: graphics/rubygem-objectdetect/Makefile =================================================================== --- graphics/rubygem-objectdetect/Makefile (revision 500577) +++ graphics/rubygem-objectdetect/Makefile (working copy) @@ -12,7 +12,8 @@ LICENSE= MIT -LIB_DEPENDS= libopencv_video.so:graphics/opencv +BUILD_DEPENDS= ${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3 +RUN_DEPENDS= ${LOCALBASE}/lib/opencv3.4/libopencv_video.so:graphics/opencv3 USE_RUBY= yes USES= gem pkgconfig Index: graphics/rubygem-objectdetect/files/patch-ext_extconf.rb =================================================================== --- graphics/rubygem-objectdetect/files/patch-ext_extconf.rb (nonexistent) +++ graphics/rubygem-objectdetect/files/patch-ext_extconf.rb (working copy) @@ -0,0 +1,7 @@ +--- ext/extconf.rb.orig 2019-05-21 11:58:20 UTC ++++ ext/extconf.rb +@@ -1,3 +1,3 @@ + require 'mkmf' +-pkg_config 'opencv' ++pkg_config 'opencv3' + create_makefile 'objectdetect' Property changes on: graphics/rubygem-objectdetect/files/patch-ext_extconf.rb ___________________________________________________________________ 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: multimedia/gstreamer1-plugins/Makefile.common =================================================================== --- multimedia/gstreamer1-plugins/Makefile.common (revision 500577) +++ multimedia/gstreamer1-plugins/Makefile.common (working copy) @@ -371,11 +371,16 @@ gst_ogg_LIB_DEPENDS= libogg.so:audio/libogg # opencv -gst_opencv_LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \ - libopencv_highgui.so:graphics/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= compiler:c++11-lib +gst_opencv_USES= autoreconf compiler:c++11-lib # openexr gst_openexr_LIB_DEPENDS=libImath.so:graphics/ilmbase \ Index: multimedia/gstreamer1-plugins-bad/files/patch-configure.ac =================================================================== --- multimedia/gstreamer1-plugins-bad/files/patch-configure.ac (nonexistent) +++ multimedia/gstreamer1-plugins-bad/files/patch-configure.ac (working copy) @@ -0,0 +1,20 @@ +--- 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]) Property changes on: multimedia/gstreamer1-plugins-bad/files/patch-configure.ac ___________________________________________________________________ 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: graphics/shotwell/Makefile =================================================================== --- graphics/shotwell/Makefile (revision 500577) +++ graphics/shotwell/Makefile (working copy) @@ -56,8 +56,10 @@ FACED_CONFIGURE_ON= -Dface-detection=true FACED_CONFIGURE_OFF= -Dface-detection=false -FACED_LIB_DEPENDS= libopencv_core.so:graphics/opencv-core \ - libopencv_photo.so:graphics/opencv +FACED_BUILD_DEPENDS= ${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \ + ${LOCALBASE}/lib/opencv3.4/libopencv_photo.so:graphics/opencv3 +FACED_RUN_DEPENDS= ${LOCALBASE}/lib/opencv3.4/libopencv_core.so:graphics/opencv3-core \ + ${LOCALBASE}/lib/opencv3.4/libopencv_photo.so:graphics/opencv3 OPENMP_USES= compiler:openmp OPENMP_USES_OFF= compiler:c++11-lib @@ -65,4 +67,8 @@ GLIB_SCHEMAS= org.yorba.shotwell.gschema.xml org.yorba.shotwell-extras.gschema.xml +post-patch-FACED-on: + ${REINPLACE_CMD} -e 's/opencv/opencv3/' \ + ${WRKSRC}/facedetect/meson.build + .include