From owner-freebsd-python@freebsd.org Fri Oct 27 17:22:54 2017 Return-Path: Delivered-To: freebsd-python@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 62706E4D00F for ; Fri, 27 Oct 2017 17:22:54 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mailman.ysv.freebsd.org (unknown [127.0.1.3]) by mx1.freebsd.org (Postfix) with ESMTP id 47B1F7122C for ; Fri, 27 Oct 2017 17:22:54 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: by mailman.ysv.freebsd.org (Postfix) id 42AEBE4D00E; Fri, 27 Oct 2017 17:22:54 +0000 (UTC) Delivered-To: python@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 425D6E4D00D for ; Fri, 27 Oct 2017 17:22:54 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2001:1900:2254:206a::16:76]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 281B87122B for ; Fri, 27 Oct 2017 17:22:54 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from bugs.freebsd.org ([127.0.1.118]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id v9RHMrsW053967 for ; Fri, 27 Oct 2017 17:22:54 GMT (envelope-from bugzilla-noreply@freebsd.org) From: bugzilla-noreply@freebsd.org To: python@FreeBSD.org Subject: [Bug 211805] graphics/opencv: Missing fortran dependency, causes graphics/py-opencv import cv2 fails Date: Fri, 27 Oct 2017 17:22:54 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Individual Port(s) X-Bugzilla-Version: Latest X-Bugzilla-Keywords: easy, needs-qa X-Bugzilla-Severity: Affects Many People X-Bugzilla-Who: jbeich@FreeBSD.org X-Bugzilla-Status: In Progress X-Bugzilla-Resolution: X-Bugzilla-Priority: Normal X-Bugzilla-Assigned-To: ler@FreeBSD.org X-Bugzilla-Flags: merge-quarterly? X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated MIME-Version: 1.0 X-BeenThere: freebsd-python@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: FreeBSD-specific Python issues List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Oct 2017 17:22:54 -0000 https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D211805 --- Comment #17 from Jan Beich --- 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 # $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.=