From owner-svn-ports-all@freebsd.org  Fri Oct 23 09:02:43 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 04C7B440FC2;
 Fri, 23 Oct 2020 09:02:43 +0000 (UTC)
 (envelope-from pkubaj@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4CHdXy6MXJz3cSF;
 Fri, 23 Oct 2020 09:02:42 +0000 (UTC)
 (envelope-from pkubaj@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 BDC822504D;
 Fri, 23 Oct 2020 09:02:42 +0000 (UTC)
 (envelope-from pkubaj@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09N92gXk028795;
 Fri, 23 Oct 2020 09:02:42 GMT (envelope-from pkubaj@FreeBSD.org)
Received: (from pkubaj@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09N92gbl028794;
 Fri, 23 Oct 2020 09:02:42 GMT (envelope-from pkubaj@FreeBSD.org)
Message-Id: <202010230902.09N92gbl028794@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: pkubaj set sender to
 pkubaj@FreeBSD.org using -f
From: Piotr Kubaj <pkubaj@FreeBSD.org>
Date: Fri, 23 Oct 2020 09:02:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r553099 - head/graphics/opencv/files
X-SVN-Group: ports-head
X-SVN-Commit-Author: pkubaj
X-SVN-Commit-Paths: head/graphics/opencv/files
X-SVN-Commit-Revision: 553099
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.33
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 23 Oct 2020 09:02:43 -0000

Author: pkubaj
Date: Fri Oct 23 09:02:42 2020
New Revision: 553099
URL: https://svnweb.freebsd.org/changeset/ports/553099

Log:
  graphics/opencv: fix build of dependent ports on powerpc64le
  
  It's important to first undef the conflicting keywords, then import altivec.h.

Added:
  head/graphics/opencv/files/patch-modules_core_include_opencv2_core_cv__cpu__dispatch.h   (contents, props changed)

Added: head/graphics/opencv/files/patch-modules_core_include_opencv2_core_cv__cpu__dispatch.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/graphics/opencv/files/patch-modules_core_include_opencv2_core_cv__cpu__dispatch.h	Fri Oct 23 09:02:42 2020	(r553099)
@@ -0,0 +1,26 @@
+--- modules/core/include/opencv2/core/cv_cpu_dispatch.h.orig	2020-10-23 01:17:26 UTC
++++ modules/core/include/opencv2/core/cv_cpu_dispatch.h
+@@ -108,10 +108,10 @@
+ #endif
+ 
+ #if defined(__VSX__) && defined(__PPC64__) && defined(__LITTLE_ENDIAN__)
+-#  include <altivec.h>
+ #  undef vector
+ #  undef pixel
+ #  undef bool
++#  include <altivec.h>
+ #  define CV_VSX 1
+ #endif
+ 
+@@ -152,10 +152,10 @@ struct VZeroUpperGuard {
+ #  include <arm_neon.h>
+ #  define CV_NEON 1
+ #elif defined(__VSX__) && defined(__PPC64__) && defined(__LITTLE_ENDIAN__)
+-#  include <altivec.h>
+ #  undef vector
+ #  undef pixel
+ #  undef bool
++#  include <altivec.h>
+ #  define CV_VSX 1
+ #endif
+