From owner-dev-commits-ports-main@freebsd.org Mon May 3 18:35:19 2021 Return-Path: Delivered-To: dev-commits-ports-main@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 4FB62639A72; Mon, 3 May 2021 18:35:19 +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 4FYs931sKTz3MKr; Mon, 3 May 2021 18:35:19 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 2E7FE2318F; Mon, 3 May 2021 18:35:19 +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 143IZJx8001672; Mon, 3 May 2021 18:35:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 143IZJ3Z001671; Mon, 3 May 2021 18:35:19 GMT (envelope-from git) Date: Mon, 3 May 2021 18:35:19 GMT Message-Id: <202105031835.143IZJ3Z001671@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: ae0a42383164 - main - graphics/qt5-3d: fix AVX2 detection MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae0a4238316456c6b26aff686d5d7e331e5ffb78 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 May 2021 18:35:19 -0000 The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=ae0a4238316456c6b26aff686d5d7e331e5ffb78 commit ae0a4238316456c6b26aff686d5d7e331e5ffb78 Author: Steve Wills AuthorDate: 2021-05-03 18:29:24 +0000 Commit: Adriaan de Groot CommitDate: 2021-05-03 18:35:02 +0000 graphics/qt5-3d: fix AVX2 detection Fails to build with CPUTYPE set to AVX2-enabled CPU (e.g. haswell). Reported by: GregV PR: 248155 --- graphics/qt5-3d/Makefile | 2 +- graphics/qt5-3d/files/patch-src_core_configure.json | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile index ee16610602a1..0b4a9a90bcb3 100644 --- a/graphics/qt5-3d/Makefile +++ b/graphics/qt5-3d/Makefile @@ -1,6 +1,6 @@ PORTNAME= 3d DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-3d/files/patch-src_core_configure.json b/graphics/qt5-3d/files/patch-src_core_configure.json new file mode 100644 index 000000000000..c9b346b16d22 --- /dev/null +++ b/graphics/qt5-3d/files/patch-src_core_configure.json @@ -0,0 +1,11 @@ +--- src/core/configure.json.orig 2021-04-29 15:52:01 UTC ++++ src/core/configure.json +@@ -96,7 +96,7 @@ + "qt3d-simd-avx2": { + "label": "Use AVX2 instructions", + "purpose": "Use AVX2 SIMD instructions to accelerate matrix operations", +- "autoDetect": "subarch.avx2", ++ "autoDetect": "features.avx2", + "enable": "input.qt3d-simd == 'avx2'", + "disable": "input.qt3d-simd == 'sse2' || input.qt3d-simd == 'no' || arch.i386", + "output": [ "privateFeature" ]