From owner-svn-ports-all@freebsd.org Wed Aug 8 20:02:46 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 903F210695A5; Wed, 8 Aug 2018 20:02:46 +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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46D7E91545; Wed, 8 Aug 2018 20:02:46 +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 0F9187504; Wed, 8 Aug 2018 20:02:46 +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 w78K2jix083294; Wed, 8 Aug 2018 20:02:45 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w78K2jqV083293; Wed, 8 Aug 2018 20:02:45 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201808082002.w78K2jqV083293@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 8 Aug 2018 20:02:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r476672 - 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: 476672 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.27 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, 08 Aug 2018 20:02:46 -0000 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) ==============================================================================