From nobody Wed Jun 21 11:33:46 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QmLx72F3qz4fs1W; Wed, 21 Jun 2023 11:33:47 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QmLx6714rz4YtZ; Wed, 21 Jun 2023 11:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687347227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lMizSed7N08X1obmbTYaIhD3pWhYVpiPrXc7lftObuk=; b=V9Tkx6dtaVyFb56ao5spzyeGyOZ8hT/+ob0devc7Hj79sgebz/3FWvkVOU/eBxxtyQ0U8r zUo4goQazVQQUO+cotKp2hNWAdBHaMQDLe0c845X4gm7qLtxkr27VSqhZ1ACDaprvPPuCJ hEw8jXBTHIB4r6+kQQZVhzvPcAvXK8gt3E2jVMl6xV2lpW5GJ6xnNFx8RobQkZafpmc5bH oWz4no47cC4NCJJjdOSLE2/g+3X260vAnxn1qkIi8Q1XQaDeOXiU2Ao8EWYKIMx6Dj3qmY QzxlJuqTKbyU4BdUjSFS5Rb5iMJ1ZZsb44K9GAiAePoGi05WZl5LDTVXYfxXcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687347227; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lMizSed7N08X1obmbTYaIhD3pWhYVpiPrXc7lftObuk=; b=iEjhjCcTk84hz60Ml4Jw+gqGhfvwd/pCJaOAF7FPPjUrbKbsCwhGQ3TB5ufu3ln/OOTKSr 6GcuUyKqpnahE4HV1OfO94SshoElnHQ9egqmGuGoo3S0gd4J6ABD2GcFqTigZ+oNOaL+WQ CbJy3xz3iNbT7hrZ8yPceDCmKo4qzSBKOtYb5SIQEs7lAphPFQp+wUUD8NpNUBNd7qbEyn FRKyOMGHvl+0UqB5ZjGCEzDMHQuDqUcjmk+JOWG0m3FTrbuXkWHSuL8EO9hFzq+jBdY1qa onGp/smZPN5QtL38S8TLPU5g94boMLje7X/Cfv8QSqab+ra3P/NUWxO/eK8R7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687347227; a=rsa-sha256; cv=none; b=oaKYY5kVoL5oo/+bWf6t+BA+Yyc3eC8YUL1Xg2NYeyyMX7QRexGe4boZBjfFbsXqZrMRgS Mh49/EBJv/wL4Y+eWlLVPy6cMnYWzYtZJyXYOz10IO3QW2TWIElSfBPl52b+BjspsAS9eJ jRHd4TKdnjP24wDiBkaB+sWO+BuleBi62ISlp154aIzpHDQiNBx9DxUZ2PAPSw8PGj6wxj vYieHUv1PjH9nbAUSO4Y0qOkRH+Q0gXwyQ6eLFzH1P+Z/Wk61o06/ASW5/89Xw4Wlvn6W9 sxCHc+4VnpZme7FqZBrjxfYyWQWnV/mQrOlNQvye43IQp72wb/8D1R+h62Tu2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QmLx64yb2zg4t; Wed, 21 Jun 2023 11:33:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35LBXkqx043038; Wed, 21 Jun 2023 11:33:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35LBXkl1043037; Wed, 21 Jun 2023 11:33:46 GMT (envelope-from git) Date: Wed, 21 Jun 2023 11:33:46 GMT Message-Id: <202306211133.35LBXkl1043037@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 3fc69f53ece7 - main - graphics/opencv: when on POWER9 on powerpc64le, allow setting VSX3 as baseline List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3fc69f53ece7bcd9cb7083fbbce75897f2fdfba7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=3fc69f53ece7bcd9cb7083fbbce75897f2fdfba7 commit 3fc69f53ece7bcd9cb7083fbbce75897f2fdfba7 Author: Piotr Kubaj AuthorDate: 2023-06-21 10:19:19 +0000 Commit: Piotr Kubaj CommitDate: 2023-06-21 11:33:46 +0000 graphics/opencv: when on POWER9 on powerpc64le, allow setting VSX3 as baseline Also GCC is necessary because base LLVM 15 fails with: UNREACHABLE executed at /usr/src/contrib/llvm-project/llvm/lib/Target/PowerPC/PPCISelLowering.cpp:11135! LLVM 16 also crashes and it seems 17 has already fixed this issue. --- graphics/opencv/Makefile | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile index 889d8c8ff414..e00fa76edfc2 100644 --- a/graphics/opencv/Makefile +++ b/graphics/opencv/Makefile @@ -19,7 +19,7 @@ LIB_DEPENDS= libfreetype.so:print/freetype2 \ libharfbuzz.so:print/harfbuzz \ libhdf5.so:science/hdf5 -USES= cmake compiler:c++14-lang cpe localbase:ldflags pkgconfig +USES= cmake cpe localbase:ldflags pkgconfig USE_GITHUB= yes GH_ACCOUNT= WeChatCV:wechat GH_PROJECT= opencv_contrib:contrib \ @@ -214,6 +214,15 @@ OPENJPEG_LIB_DEPENDS= libopenjp2.so:graphics/openjpeg _IPPICV_i386= ippicv/ippicv_2020_lnx_ia32_20191018_general.tgz _IPPICV_amd64= ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz +.include + +.if ${ARCH} == powerpc64le && defined(MACHINE_CPU) && ${MACHINE_CPU:Mvsx3} +CMAKE_ARGS+= -DCPU_BASELINE:STRING="VSX;VSX3;" +USES+= compiler:gcc-c++11-lib +.else +USES+= compiler:c++14-lang +.endif + post-extract: # Handle contrib ${MV} ${WRKSRC_contrib} ${WRKSRC}/contrib