Date: Sat, 1 Oct 2016 13:26:39 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r423062 - head/graphics/opencv Message-ID: <201610011326.u91DQdYC012101@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Sat Oct 1 13:26:39 2016 New Revision: 423062 URL: https://svnweb.freebsd.org/changeset/ports/423062 Log: graphics/opencv: convert to option helpers (cpu) Modified: head/graphics/opencv/Makefile (contents, props changed) Modified: head/graphics/opencv/Makefile ============================================================================== --- head/graphics/opencv/Makefile Sat Oct 1 13:26:24 2016 (r423061) +++ head/graphics/opencv/Makefile Sat Oct 1 13:26:39 2016 (r423062) @@ -43,14 +43,18 @@ OCV_NONFREE_MODS= nonfree OCV_JAVA_MODS= java OCV_PYTHON_MODS= python -OPTIONS_DEFINE= DC1394 EXAMPLES NONFREE OPENGL SIMD -OPTIONS_GROUP= IMAGE PERFORMANCE VIDEO +OPTIONS_DEFINE= DC1394 EXAMPLES NONFREE OPENGL +OPTIONS_GROUP= IMAGE PERFORMANCE SIMD VIDEO OPTIONS_GROUP_IMAGE= JASPER JPEG OPENEXR PNG TIFF OPTIONS_GROUP_PERFORMANCE= EIGEN3 TBB +OPTIONS_GROUP_SIMD= ${OPTIONS_GROUP_SIMD_${MACHINE_ARCH}} +OPTIONS_GROUP_SIMD_amd64= ${OPTIONS_GROUP_SIMD_i386} +OPTIONS_GROUP_SIMD_armv6= NEON VFPV3 +OPTIONS_GROUP_SIMD_i386= SSE SSE2 SSE3 SSSE3 SSE41 SSE42 AVX OPTIONS_GROUP_VIDEO= FFMPEG GSTREAMER V4L XINE OPTIONS_RADIO= GUI OPTIONS_RADIO_GUI= GTK2 QT4 -OPTIONS_DEFAULT= EIGEN3 JASPER JPEG PNG SIMD TIFF V4L +OPTIONS_DEFAULT= EIGEN3 JASPER JPEG PNG TIFF V4L ${MACHINE_CPU:tu} OPTIONS_SUB= yes .if defined(OCV_CORE) OPTIONS_EXCLUDE= DC1394 EXAMPLES GTK2 QT4 JASPER JPEG NONFREE OPENEXR \ @@ -101,6 +105,11 @@ QT4_USE= QT4=gui,moc_build,qmake_build, QT4_CMAKE_ON= -DWITH_QT:STRING="4" QT4_CMAKE_OFF= -DWITH_QT:BOOL=false +.for _simd in ${OPTIONS_GROUP_SIMD} +${_simd}_DESC= ${MMX_DESC:S/MMX/${_simd}/} +${_simd}_CMAKE_BOOL= ENABLE_${_simd} +.endfor + TBB_LIB_DEPENDS= libtbb.so:devel/tbb TBB_CMAKE_BOOL= WITH_TBB TBB_CMAKE_ON= -DTBB_INCLUDE_DIR:STRING="${LOCALBASE}/include" @@ -121,37 +130,6 @@ NONFREE_DESC= Build functionality that PERFORMANCE_DESC= Performance enhancing libraries TBB_DESC= TBB support -.include <bsd.port.options.mk> - -.if ${PORT_OPTIONS:MSIMD} -. if ${MACHINE_CPU:Msse} -CMAKE_ARGS+= -DENABLE_SSE:BOOL=On -. else -CMAKE_ARGS+= -DENABLE_SSE:BOOL=Off -. endif -. if ${MACHINE_CPU:Msse2} -CMAKE_ARGS+= -DENABLE_SSE2:BOOL=On -. else -CMAKE_ARGS+= -DENABLE_SSE2:BOOL=Off -. endif -. if ${MACHINE_CPU:Msse3} -CMAKE_ARGS+= -DENABLE_SSE3:BOOL=On -. else -CMAKE_ARGS+= -DENABLE_SSE3:BOOL=Off -. endif -# TODO: Add support for instructions above SSE3 (upstream has them off by default) -CMAKE_ARGS+= -DENABLE_SSSE3:BOOL=Off \ - -DENABLE_SSE41:BOOL=Off \ - -DENABLE_SSE42:BOOL=Off -.else -CMAKE_ARGS+= -DENABLE_SSE:BOOL=Off \ - -DENABLE_SSE2:BOOL=Off \ - -DENABLE_SSE3:BOOL=Off \ - -DENABLE_SSSE3:BOOL=Off \ - -DENABLE_SSE41:BOOL=Off \ - -DENABLE_SSE42:BOOL=Off -.endif - .if defined(OCV_CORE) . for module in ${OCV_MODS} ${OCV_JAVA_MODS} ${OCV_PYTHON_MODS} CMAKE_ARGS+= -DBUILD_opencv_${module}:BOOL=Off
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610011326.u91DQdYC012101>