svn commit: r476672 - in head/graphics/opencv: . files
Jan Beich
jbeich at FreeBSD.org
Wed Aug 8 20:02:46 UTC 2018
Author: jbeich
Date: Wed Aug 8 20:02:45 2018
New Revision: 476672
URL: https://svnweb.freebsd.org/changeset/ports/476672
Log:
graphics/opencv-core: unbreak after r476652
===> Applying FreeBSD patches for opencv-core-3.4.1_2
No file to patch. Skipping...
1 out of 1 hunks ignored--saving rejects to modules/stereo/src/descriptor.cpp.rej
Can't create modules/stereo/src/descriptor.cpp.rej, output is in /tmp/patchr6xYigwcnNn: No such file or directory
=> FreeBSD patch patch-modules_stereo_src_descriptor.cpp failed to apply cleanly.
=> Patch(es) patch-modules_core_include_opencv2_core_cvdef.h patch-modules_core_include_opencv2_core_types__c.h patch-modules_core_src_utils_filesystem.cpp patch-modules_highgui_include_opencv2_highgui_highgui__c.h patch-modules_highgui_src_window.cpp patch-modules_highgui_src_window__gtk.cpp applied cleanly.
*** Error code 1
Added:
head/graphics/opencv/files/extra-patch-modules_stereo_src_descriptor.cpp (contents, props changed)
- copied, changed from r476655, head/graphics/opencv/files/patch-modules_stereo_src_descriptor.cpp
Deleted:
head/graphics/opencv/files/patch-modules_stereo_src_descriptor.cpp
Modified:
head/graphics/opencv/Makefile (contents, props changed)
Modified: head/graphics/opencv/Makefile
==============================================================================
--- head/graphics/opencv/Makefile Wed Aug 8 20:00:05 2018 (r476671)
+++ head/graphics/opencv/Makefile Wed Aug 8 20:02:45 2018 (r476672)
@@ -263,7 +263,8 @@ EXTRA_MODULES_LIB_DEPENDS= libgflags.so:devel/gflags \
libglog.so:devel/glog \
libhdf5.so:science/hdf5
EXTRA_MODULES_EXTRA_PATCHES+= ${FILESDIR}/extra-patch-modules_dnn__modern_CMakeLists.txt \
- ${FILESDIR}/extra-patch-modules_sfm_src__libmv__light_libmv_numeric_numeric.h
+ ${FILESDIR}/extra-patch-modules_sfm_src__libmv__light_libmv_numeric_numeric.h \
+ ${FILESDIR}/extra-patch-modules_stereo_src_descriptor.cpp
OPENGL_DESC= OpenGL (require QT or GTK2)
OPENGL_CMAKE_BOOL= WITH_OPENGL
Copied and modified: head/graphics/opencv/files/extra-patch-modules_stereo_src_descriptor.cpp (from r476655, head/graphics/opencv/files/patch-modules_stereo_src_descriptor.cpp)
==============================================================================
More information about the svn-ports-all
mailing list