diff options
| author | Jason E. Hale <jhale@FreeBSD.org> | 2013-12-10 23:56:44 +0000 |
|---|---|---|
| committer | Jason E. Hale <jhale@FreeBSD.org> | 2013-12-10 23:56:44 +0000 |
| commit | 049486f9e89367e0a11feaea81d32538fbe8de45 (patch) | |
| tree | 071c5ead6b97161cd87800cdceab16cd957d9eca /graphics/opencv | |
| parent | 3138ce89c5e45ff490074afe280b870d1ed7dac3 (diff) | |
| download | ports-049486f9e89367e0a11feaea81d32538fbe8de45.tar.gz ports-049486f9e89367e0a11feaea81d32538fbe8de45.zip | |
- Fix build with QT4 option (error: GL/glx.h: No such file or directory) [1]
- Specify major Qt version number to squash some CMake warnings about Qt5
- Use OPTIONS_RADIO for GUI support - build only allows use of one toolkit
- Make OpenGL support optional (off by default since it only works with
GUI support)
- Allow OpenGL support with GTK2
Reported by: Wolfgang Riegler <wolfgang.riegler@gmx.de> [1]
Notes
Notes:
svn path=/head/; revision=336129
Diffstat (limited to 'graphics/opencv')
| -rw-r--r-- | graphics/opencv/Makefile | 28 | ||||
| -rw-r--r-- | graphics/opencv/files/patch-cmake__OpenCVFindLibsGUI.cmake | 14 |
2 files changed, 34 insertions, 8 deletions
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index e4bdc279b3f8..36c8126ee591 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -42,20 +42,21 @@ OCV_NONFREE_MODS= nonfree OCV_JAVA_MODS= java OCV_PYTHON_MODS= python -OPTIONS_DEFINE= EXAMPLES DC1394 NONFREE -OPTIONS_GROUP= GUI IMAGE PERFORMANCE VIDEO -OPTIONS_GROUP_GUI= GTK2 QT4 +OPTIONS_DEFINE= DC1394 EXAMPLES NONFREE OPENGL +OPTIONS_GROUP= IMAGE PERFORMANCE VIDEO OPTIONS_GROUP_IMAGE= JASPER JPEG OPENEXR PNG TIFF OPTIONS_GROUP_PERFORMANCE= EIGEN3 TBB OPTIONS_GROUP_VIDEO= FFMPEG GSTREAMER V4L XINE +OPTIONS_RADIO= GUI +OPTIONS_RADIO_GUI= GTK2 QT4 OPTIONS_DEFAULT= EIGEN3 JASPER JPEG PNG TIFF V4L OPTIONS_SUB= yes .if defined(OCV_CORE) OPTIONS_EXCLUDE= DC1394 EXAMPLES GTK2 QT4 JASPER JPEG NONFREE OPENEXR \ - PNG TIFF FFMPEG GSTREAMER V4L XINE + OPENGL PNG TIFF FFMPEG GSTREAMER V4L XINE .elif defined(OCV_PYTHON) OPTIONS_EXCLUDE= DC1394 GTK2 QT4 JASPER JPEG NONFREE OPENEXR \ - PNG TIFF TBB EIGEN3 FFMPEG GSTREAMER V4L XINE + OPENGL PNG TIFF TBB EIGEN3 FFMPEG GSTREAMER V4L XINE .endif DC1394_DESC= IEEE 1394 camera support @@ -106,6 +107,9 @@ CMAKE_ARGS+= -DWITH_GSTREAMER:BOOL=Off .if ${PORT_OPTIONS:MGTK2} USE_GNOME+= gtk20 CMAKE_ARGS+= -DWITH_GTK:BOOL=On +. if ${PORT_OPTIONS:MOPENGL} +LIB_DEPENDS+= libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext +. endif .else CMAKE_ARGS+= -DWITH_GTK:BOOL=Off .endif @@ -137,6 +141,12 @@ CMAKE_ARGS+= -DWITH_OPENEXR:BOOL=On CMAKE_ARGS+= -DWITH_OPENEXR:BOOL=Off .endif +.if ${PORT_OPTIONS:MOPENGL} +CMAKE_ARGS+= -DWITH_OPENGL:BOOL=On +.else +CMAKE_ARGS+= -DWITH_OPENGL:BOOL=Off +.endif + .if ${PORT_OPTIONS:MPNG} LIB_DEPENDS+= libpng15.so:${PORTSDIR}/graphics/png CMAKE_ARGS+= -DWITH_PNG:BOOL=On @@ -145,9 +155,11 @@ CMAKE_ARGS+= -DWITH_PNG:BOOL=Off .endif .if ${PORT_OPTIONS:MQT4} -USE_QT4+= opengl moc_build qmake_build rcc_build uic_build qtestlib -CMAKE_ARGS+= -DWITH_QT:BOOL=On \ - -DWITH_OPENGL:BOOL=On +USE_QT4+= gui moc_build qmake_build rcc_build uic_build qtestlib +CMAKE_ARGS+= -DWITH_QT:STRING="4" +. if ${PORT_OPTIONS:MQT4} +USE_QT4+= opengl +. endif .else CMAKE_ARGS+= -DWITH_QT:BOOL=Off .endif diff --git a/graphics/opencv/files/patch-cmake__OpenCVFindLibsGUI.cmake b/graphics/opencv/files/patch-cmake__OpenCVFindLibsGUI.cmake new file mode 100644 index 000000000000..cfe9392d3e21 --- /dev/null +++ b/graphics/opencv/files/patch-cmake__OpenCVFindLibsGUI.cmake @@ -0,0 +1,14 @@ +--- ./cmake/OpenCVFindLibsGUI.cmake.orig 2013-12-10 09:20:59.000000000 -0500 ++++ ./cmake/OpenCVFindLibsGUI.cmake 2013-12-10 09:22:40.000000000 -0500 +@@ -56,10 +56,9 @@ + if(OPENGL_FOUND) + set(HAVE_OPENGL TRUE) + list(APPEND OPENCV_LINKER_LIBS ${OPENGL_LIBRARIES}) ++ ocv_include_directories(${OPENGL_INCLUDE_DIR}) + if(QT_QTOPENGL_FOUND) + set(HAVE_QT_OPENGL TRUE) +- else() +- ocv_include_directories(${OPENGL_INCLUDE_DIR}) + endif() + endif() + endif() |