From nobody Sun Dec 19 14:11:48 2021 X-Original-To: dev-commits-ports-main@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 D977C18F2428; Sun, 19 Dec 2021 14:11:48 +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 4JH4Qr4T5Yz4rkR; Sun, 19 Dec 2021 14:11:48 +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 7B58623F1D; Sun, 19 Dec 2021 14:11:48 +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 1BJEBmCg030996; Sun, 19 Dec 2021 14:11:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BJEBmuC030979; Sun, 19 Dec 2021 14:11:48 GMT (envelope-from git) Date: Sun, 19 Dec 2021 14:11:48 GMT Message-Id: <202112191411.1BJEBmuC030979@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 183d079fd681 - main - graphics/qt5-q3d: convert AVX2 detection hack to OPTIONS (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 183d079fd681df544b67cf2f03c7d1d5aa7853fc Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639923108; 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=LtWGvZ0vtvwwg8StjoQUXNXSGELo7FlLXQUO+K//2LU=; b=BMgUVsbDUBxWfUq1AhFH1xo8r0UidaqrlX3yrrSBvtEKv8hpYPGjceBU/5Q/XPR9z52/Qt cYenWDwV0TtF4xPswa9K/KJCbH1aCDTID19s/CusqNH6Bxu5oXb77mnHXaVO9aeQ6LeHgX rd8d1pRf08jdQAOpvWWsAvtoWMsDVtUoXaOJjMzlD7TS4eaD3BLfgzBFL1qgdvatznNhEx 5Bju5vpobD8f72ZPaPPAZ00b8hFtrjjJz+fcXiQR+Bzvd75S0bxJzWSw6xAoboQkgFM2ZD pUtSnOpiSnsar9XhoJmrE53XPnaSiteKFmvQ8LOPwDksDXeMxK2JyAMkUKyjvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639923108; a=rsa-sha256; cv=none; b=C/9l/KbgXtLfhaL49DYZPQ5fI3rcfqxVY90R+5wYFzRgj7JYIoUbJ5f1PAdULltlnjqjsj 6E3PHoEm9mB+ZTnSON8k73RoxgYnhp/cj5kTxUiXJVA8k3yh3eW+x39WH3xUfwR09YeaOW 5YD5ZHawwGIMmX6LxrpOZ4wdwHTP0gbpPPiAmZXPQak43w3d7U3xuLZjetJUwDDSQW2Nmq /XQNd/LXxWnF6lT9uKZMZ99jK6dnZ0CPKFPhblIzjpBnU7kDtR3Wu/2d79mBuyAGSuC+5J K2J6V1Gcq8VxtBM/yKUSNJph8IEUl1Twj/Jdm0UEjzCtDK4OzwnOR1qpMUHsKg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=183d079fd681df544b67cf2f03c7d1d5aa7853fc commit 183d079fd681df544b67cf2f03c7d1d5aa7853fc Author: Dima Panov AuthorDate: 2021-12-19 14:04:58 +0000 Commit: Dima Panov CommitDate: 2021-12-19 14:04:58 +0000 graphics/qt5-q3d: convert AVX2 detection hack to OPTIONS (+) Force qt5-qmake to pass CXXFLAGS to cpu features test. Define AVX OPTION only amd64/i386 arches due to cpu used. Off by default to keep out-of-box behavior and allow to build qt5-q3d and its consumes on any old processors. Necromages, go forward! :) PR: 255753 With hat: desktop Sponsored by: Netzkommune GmbH --- devel/qt5-qmake/Makefile | 2 +- devel/qt5-qmake/files/patch-config.tests_arch_arch.pro | 6 ++++++ graphics/qt5-3d/Makefile | 8 +++++++- ...src_core_configure.json => extrapatch-src_core_configure.json} | 0 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/devel/qt5-qmake/Makefile b/devel/qt5-qmake/Makefile index 421d4694e8a4..c73de40c0aef 100644 --- a/devel/qt5-qmake/Makefile +++ b/devel/qt5-qmake/Makefile @@ -1,6 +1,6 @@ PORTNAME= qmake DISTVERSION= ${QT5_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-qmake/files/patch-config.tests_arch_arch.pro b/devel/qt5-qmake/files/patch-config.tests_arch_arch.pro new file mode 100644 index 000000000000..051a52f38555 --- /dev/null +++ b/devel/qt5-qmake/files/patch-config.tests_arch_arch.pro @@ -0,0 +1,6 @@ +--- config.tests/arch/arch.pro.orig 2021-05-26 21:40:42 UTC ++++ config.tests/arch/arch.pro +@@ -1,2 +1,3 @@ + SOURCES = arch.cpp ++QMAKE_CXXFLAGS += $$(CXXFLAGS) + include(write_info.pri) diff --git a/graphics/qt5-3d/Makefile b/graphics/qt5-3d/Makefile index 073c11b7d136..cbcda61880d6 100644 --- a/graphics/qt5-3d/Makefile +++ b/graphics/qt5-3d/Makefile @@ -1,6 +1,6 @@ PORTNAME= 3d DISTVERSION= ${QT5_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= graphics PKGNAMEPREFIX= qt5- @@ -12,6 +12,12 @@ LIB_DEPENDS= libassimp.so:multimedia/assimp USES= compiler:c++11-lang pkgconfig qmake:norecursive qt-dist:5,3d USE_QT= concurrent core declarative gui network buildtools_build +OPTIONS_DEFINE_amd64= AVX +OPTIONS_DEFINE_i386= AVX + +AVX_DESC= Build for Intel CPUs with AVX* support (Haswell+) +AVX_EXTRA_PATCHES= ${FILESDIR}/extrapatch-src_core_configure.json + QT_BINARIES= yes .include diff --git a/graphics/qt5-3d/files/patch-src_core_configure.json b/graphics/qt5-3d/files/extrapatch-src_core_configure.json similarity index 100% rename from graphics/qt5-3d/files/patch-src_core_configure.json rename to graphics/qt5-3d/files/extrapatch-src_core_configure.json