Date: Fri, 27 Oct 2017 17:22:54 +0000 From: bugzilla-noreply@freebsd.org To: python@FreeBSD.org Subject: [Bug 211805] graphics/opencv: Missing fortran dependency, causes graphics/py-opencv import cv2 fails Message-ID: <bug-211805-21822-qyEdWxS2GU@https.bugs.freebsd.org/bugzilla/> In-Reply-To: <bug-211805-21822@https.bugs.freebsd.org/bugzilla/> References: <bug-211805-21822@https.bugs.freebsd.org/bugzilla/>
next in thread | previous in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D211805 --- Comment #17 from Jan Beich <jbeich@FreeBSD.org> --- Why ports r451721 has anything to do with ports r452901? Both touch PORTREVISION, so merge conflict is expected. Subversion presents several options to resolve conflicts. If you didn't know how this was supposed to b= e a homework... $ ${PORTSDIR:-/usr/ports}/Tools/scripts/mfh 2017Q4 452901 U 2017Q4 Checked out revision 453016. A 2017Q4/graphics Updating '2017Q4/graphics/opencv': A 2017Q4/graphics/opencv A 2017Q4/graphics/opencv/files A 2017Q4/graphics/opencv/files/FindOpenCVCore.cmake.in A 2017Q4/graphics/opencv/files/patch-cmake__OpenCVCompilerOptions.cmake A 2017Q4/graphics/opencv/files/patch-cmake__OpenCVFindLibsGUI.cmake A 2017Q4/graphics/opencv/files/patch-cmake__OpenCVVersion.cmake A 2017Q4/graphics/opencv/files/patch-modules__contrib__src__spinimages.c= pp A 2017Q4/graphics/opencv/files/patch-modules__core__src__system.cpp A 2017Q4/graphics/opencv/files/patch-modules__highgui__src__cap_libv4l.c= pp A 2017Q4/graphics/opencv/files/patch-modules__highgui__src__cap_v4l.cpp A 2017Q4/graphics/opencv/files/patch-modules__python__src2__cv2.cv.hpp A 2017Q4/graphics/opencv/files/patch-modules__ts__src__ts.cpp A=20=20=20 2017Q4/graphics/opencv/files/patch-samples__cpp__tutorial_code__core__how_t= o_scan_images__how_to_scan_images.cpp A 2017Q4/graphics/opencv/Makefile A 2017Q4/graphics/opencv/distinfo A 2017Q4/graphics/opencv/pkg-descr A 2017Q4/graphics/opencv/pkg-plist Updated to revision 453016. Updating '2017Q4/graphics/py-opencv': A 2017Q4/graphics/py-opencv A 2017Q4/graphics/py-opencv/Makefile A 2017Q4/graphics/py-opencv/pkg-plist Updated to revision 453016. Summary of updates: Updated '2017Q4/graphics/opencv' to r453016. Updated '2017Q4/graphics/py-opencv' to r453016. --- Merging r452901 into '2017Q4': C 2017Q4/graphics/opencv/Makefile U 2017Q4/graphics/py-opencv/Makefile --- Recording mergeinfo for merge of r452901 into '2017Q4': U 2017Q4 --- Recording mergeinfo for merge of r452901 into '2017Q4/graphics': G 2017Q4/graphics --- Eliding mergeinfo from '2017Q4/graphics': U 2017Q4/graphics --- Recording mergeinfo for merge of r452901 into '2017Q4/graphics/opencv': G 2017Q4/graphics/opencv --- Eliding mergeinfo from '2017Q4/graphics/opencv': U 2017Q4/graphics/opencv --- Recording mergeinfo for merge of r452901 into '2017Q4/graphics/py-openc= v': G 2017Q4/graphics/py-opencv --- Eliding mergeinfo from '2017Q4/graphics/py-opencv': U 2017Q4/graphics/py-opencv Summary of conflicts: Text conflicts: 1 Conflict discovered in file '2017Q4/graphics/opencv/Makefile'. Select: (p) postpone, (df) show diff, (e) edit file, (m) merge, (mc) my side of conflict, (tc) their side of conflict, (s) show all options: e Waiting for Emacs... Select: (p) postpone, (df) show diff, (e) edit file, (m) merge, (r) mark resolved, (mc) my side of conflict, (tc) their side of conflict, (s) show all options: r Resolved conflicted state of '2017Q4/graphics/opencv/Makefile' Summary of conflicts: Text conflicts: 0 remaining (and 1 already resolved) M 2017Q4 M 2017Q4/graphics/opencv/Makefile ? 2017Q4/graphics/opencv/Makefile.edited M 2017Q4/graphics/py-opencv/Makefile Index: 2017Q4/graphics/opencv/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2017Q4/graphics/opencv/Makefile (revision 453016) +++ 2017Q4/graphics/opencv/Makefile (working copy) @@ -3,7 +3,7 @@ PORTNAME?=3D opencv PORTVERSION=3D 2.4.13.1 -PORTREVISION?=3D 7 +PORTREVISION?=3D 8 CATEGORIES=3D graphics MAINTAINER=3D ports@FreeBSD.org @@ -140,7 +140,7 @@ CMAKE_ARGS+=3D -DBUILD_opencv_${module}:BOOL=3DO= ff LIB_DEPENDS+=3D libopencv_legacy.so:graphics/opencv BUILD_DEPENDS+=3D ${PYNUMPY} RUN_DEPENDS+=3D ${PYNUMPY} -USES+=3D python:2.7 +USES+=3D fortran python:2.7 CMAKE_ARGS+=3D -DBUILD_opencv_python:BOOL=3DOn . for module in apps java stitching superres videostab CMAKE_ARGS+=3D -DBUILD_opencv_${module}:BOOL=3DOff Index: 2017Q4/graphics/py-opencv/Makefile =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2017Q4/graphics/py-opencv/Makefile (revision 453016) +++ 2017Q4/graphics/py-opencv/Makefile (working copy) @@ -1,7 +1,7 @@ # Created by: Martin Matuska <mm@FreeBSD.org> # $FreeBSD$ -PORTREVISION=3D 1 +PORTREVISION=3D 2 CATEGORIES=3D graphics python PKGNAMEPREFIX=3D ${PYTHON_PKGNAMEPREFIX} Index: 2017Q4 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 2017Q4 (revision 453016) +++ 2017Q4 (working copy) Property changes on: 2017Q4 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r452901 All the merge work was done in /tmp/merge.PcwlSy/2017Q4. Do you want to commit? (no =3D start a shell) [y/n] --=20 You are receiving this mail because: You are on the CC list for the bug.=
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-211805-21822-qyEdWxS2GU>