From owner-svn-ports-all@freebsd.org Wed Dec 18 20:14:58 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 5ACE91E5B31; Wed, 18 Dec 2019 20:14:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 47dR7k1nsRz3Dfp; Wed, 18 Dec 2019 20:14:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 38E98374C; Wed, 18 Dec 2019 20:14:58 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xBIKEwNh051669; Wed, 18 Dec 2019 20:14:58 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id xBIKEvuW051665; Wed, 18 Dec 2019 20:14:57 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201912182014.xBIKEvuW051665@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 18 Dec 2019 20:14:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r520396 - in head/graphics/opencv: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/graphics/opencv: . files X-SVN-Commit-Revision: 520396 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Dec 2019 20:14:58 -0000 Author: jbeich Date: Wed Dec 18 20:14:57 2019 New Revision: 520396 URL: https://svnweb.freebsd.org/changeset/ports/520396 Log: graphics/opencv: expose Intel Quick Sync Video support Added: head/graphics/opencv/files/patch-cmake_OpenCVDetectMediaSDK.cmake (contents, props changed) head/graphics/opencv/files/patch-modules_videoio_src_cap__mfx__reader.cpp (contents, props changed) head/graphics/opencv/files/patch-modules_videoio_src_cap__mfx__writer.cpp (contents, props changed) Modified: head/graphics/opencv/Makefile (contents, props changed) Modified: head/graphics/opencv/Makefile ============================================================================== --- head/graphics/opencv/Makefile Wed Dec 18 20:14:47 2019 (r520395) +++ head/graphics/opencv/Makefile Wed Dec 18 20:14:57 2019 (r520396) @@ -90,7 +90,6 @@ CMAKE_ARGS+= -DWITH_1394:BOOL=OFF \ -DWITH_MATLAB:BOOL=OFF \ -DWITH_VA:BOOL=OFF \ -DWITH_VA_INTEL:BOOL=OFF \ - -DWITH_MFX:BOOL=OFF \ -DWITH_GDAL:BOOL=OFF \ -DWITH_GPHOTO2:BOOL=OFF \ -DWITH_LAPACK:BOOL=OFF \ @@ -158,7 +157,7 @@ OPTIONS_DEFINE= EXAMPLES EXTRA_MODULES OPENGL GTK2 OPTIONS_GROUP= PERFORMANCE IMAGE VIDEO OPTIONS_GROUP_PERFORMANCE= EIGEN3 OPENCL TBB OPTIONS_GROUP_IMAGE= GDAL GDCM JASPER JPEG OPENEXR PNG TIFF WEBP -OPTIONS_GROUP_VIDEO= ARAVIS DC1394 FFMPEG GPHOTO2 GSTREAMER V4L XINE +OPTIONS_GROUP_VIDEO= ARAVIS DC1394 FFMPEG GPHOTO2 GSTREAMER MFX V4L XINE # EXTRA_MODULES required for libopencv_dnn which is required by py-opencv OPTIONS_DEFAULT= EIGEN3 EXTRA_MODULES FFMPEG JASPER JPEG PNG TIFF WEBP V4L \ ${MACHINE_CPU:tu} @@ -207,6 +206,12 @@ GDAL_CMAKE_BOOL= WITH_GDAL GDCM_DESC= Open source DICOM library GDCM_LIB_DEPENDS= libgdcmMSFF.so:devel/gdcm GDCM_CMAKE_BOOL= WITH_GDCM + +MFX_DESC= Intel MediaSDK (aka Quick Sync Video) +MFX_LIB_DEPENDS= libmfx.so:multimedia/intel-media-sdk \ + libva-drm.so:multimedia/libva +MFX_CONFIGURE_ENV= MFX_HOME="${LOCALBASE}" +MFX_CMAKE_BOOL= WITH_MFX OPENEXR_LIB_DEPENDS= libIlmImf.so:graphics/openexr OPENEXR_CMAKE_BOOL= WITH_OPENEXR Added: head/graphics/opencv/files/patch-cmake_OpenCVDetectMediaSDK.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/opencv/files/patch-cmake_OpenCVDetectMediaSDK.cmake Wed Dec 18 20:14:57 2019 (r520396) @@ -0,0 +1,14 @@ +--- cmake/OpenCVDetectMediaSDK.cmake.orig 2018-02-23 08:38:33 UTC ++++ cmake/OpenCVDetectMediaSDK.cmake +@@ -19,9 +19,9 @@ else() + # ??? + endif() + +-find_path(MFX_INCLUDE mfxdefs.h PATHS "${root}/include" NO_DEFAULT_PATH) ++find_path(MFX_INCLUDE mfxdefs.h PATHS "${root}" PATH_SUFFIXES "include" "include/mfx" NO_DEFAULT_PATH) + message(STATUS "MFX_INCLUDE: ${MFX_INCLUDE} (${root}/include)") +-find_library(MFX_LIBRARY NAMES mfx PATHS "${root}/lib/${arch}" NO_DEFAULT_PATH) ++find_library(MFX_LIBRARY NAMES mfx PATHS "${root}" PATH_SUFFIXES "lib" "lib/${arch}" NO_DEFAULT_PATH) + if(MSVC) + if(MSVC14) + find_library(MFX_LIBRARY NAMES libmfx_vs2015.lib PATHS "${root}/lib/${arch}" NO_DEFAULT_PATH) Added: head/graphics/opencv/files/patch-modules_videoio_src_cap__mfx__reader.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/opencv/files/patch-modules_videoio_src_cap__mfx__reader.cpp Wed Dec 18 20:14:57 2019 (r520396) @@ -0,0 +1,12 @@ +--- modules/videoio/src/cap_mfx_reader.cpp.orig 2018-02-23 08:38:33 UTC ++++ modules/videoio/src/cap_mfx_reader.cpp +@@ -6,6 +6,9 @@ + #include "opencv2/core/base.hpp" + #include "cap_mfx_common.hpp" + #include "opencv2/imgproc/hal/hal.hpp" ++#ifndef _WIN32 ++#include // sleep ++#endif + + using namespace cv; + using namespace std; Added: head/graphics/opencv/files/patch-modules_videoio_src_cap__mfx__writer.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/opencv/files/patch-modules_videoio_src_cap__mfx__writer.cpp Wed Dec 18 20:14:57 2019 (r520396) @@ -0,0 +1,12 @@ +--- modules/videoio/src/cap_mfx_writer.cpp.orig 2018-02-23 08:38:33 UTC ++++ modules/videoio/src/cap_mfx_writer.cpp +@@ -6,6 +6,9 @@ + #include "opencv2/core/base.hpp" + #include "cap_mfx_common.hpp" + #include "opencv2/imgproc/hal/hal.hpp" ++#ifndef _WIN32 ++#include // sleep ++#endif + + using namespace std; + using namespace cv;