Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 3 May 2021 18:35:19 GMT
From:      Adriaan de Groot <adridg@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ae0a42383164 - main - graphics/qt5-3d: fix AVX2 detection
Message-ID:  <202105031835.143IZJ3Z001671@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by adridg:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ae0a4238316456c6b26aff686d5d7e331e5ffb78

commit ae0a4238316456c6b26aff686d5d7e331e5ffb78
Author:     Steve Wills <swills@FreeBSD.org>
AuthorDate: 2021-05-03 18:29:24 +0000
Commit:     Adriaan de Groot <adridg@FreeBSD.org>
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" ]



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202105031835.143IZJ3Z001671>