From nobody Wed Aug 2 17:43:51 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 4RGK8t659MzZcqT; Wed, 2 Aug 2023 17:43:57 +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 4RGK8m6Xkxz4PDW; Wed, 2 Aug 2023 17:43:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690998233; 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=XtFsKJwH+SWAqDjc9Y5p8rN3urElfkNBZ1SVEpZU0X8=; b=rX8fRhdzjTBRcT8IJbNqlhSw9FoKsgwJt2lEpw3Lx4/QJ95jUpzXrGfozBvkbIoKSt8Ybl BeDWzVtfVvSTVama6SpmU6vd6Krso28WhpDGtxY1LyD6ZjNmSkAZyOmNbTDvUMhzAtql1y 8pdUDApfxFzJsIoaOJhVVq4wAEYwq97sDpML0lXr+UwTuEFrIvudgDsIe0T/591SSB3juF p1NO2VPt+Z8Wow39qEg5eLr4yec5sNY+EyZVy+64jOSzhfcZSh/9J8rihC79jovwdggnkA SisVOpx45CRWCmzBBwTohCwum8YWV70r0zw0jTN8xvT9GRkX8tLukSBtA8ZkqA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690998233; a=rsa-sha256; cv=none; b=m0+kqnvqgfwxqINwZxG3OzjHNiF684pYmsNhoTo030i5ZnInNJhQceML4PM1UWCHnWKXYe gjmwEhcq++h/ljFuNMlSWdj/vd8jytlPjA4X8GyA6xq+K+XKouv4N0Da2WCWHexhiAG6gF lOk0MGe/BrlXSx8b4UDljdPXZnTsLit+gKPZb2XlZ6cLC+sU7MuDxp9Y8RIjf82Yc4XRR5 rsD7K2jLMqVLY6v0qe/ua/jlJb8thTMp7R+gWglmbxQmO8MG/UX8pLfAoHn5S7lTGVTKTx KI5WilvuJ6Q5BMvcZ9obEaOsSDtNYzxOBVKZ/l6YjL80B3WRPZ5S/eFqLatudg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690998233; 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=XtFsKJwH+SWAqDjc9Y5p8rN3urElfkNBZ1SVEpZU0X8=; b=KGWfpiht6St3+u00/+gbrFh41AmxSsxC78U5IIEoCkYCRZXloD/Zv92rMgFy5MkIKix10K xW8VSKc2uGrqlLDGcHJxKn21561Rwl8hIBuF+O0XXvj8QlVBGYVH43IRfCMC5EN1spYrbk KN5N45/t5DcXiET/jJmckFTNUdwOHODDv/l0jD+pTUOVaA4c95nEw+Q6Ir+2okfUygmhST qpPcl2nB3BHBX1Fnc2Mz1IDwPUKL/aMBzDtFm/Joya1CA6yfvZuzBXlJD/a3XR5B3aTG1W MmVmn+cvBtMzckh2N15n1Jrd7NbsARtgPjVcCc9NlP235mhliJLC9F/IceLcVA== 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 4RGK8l75fJzT52; Wed, 2 Aug 2023 17:43:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 372HhpVK068028; Wed, 2 Aug 2023 17:43:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 372Hhp4T068027; Wed, 2 Aug 2023 17:43:51 GMT (envelope-from git) Date: Wed, 2 Aug 2023 17:43:51 GMT Message-Id: <202308021743.372Hhp4T068027@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Jason E. Hale" Subject: git: 5405244f3481 - main - graphics/qt6-3d: Fix pkg-plist on i386 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: jhale X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5405244f34816f4443bec396d1e8a05e7cedbcd4 Auto-Submitted: auto-generated The branch main has been updated by jhale: URL: https://cgit.FreeBSD.org/ports/commit/?id=5405244f34816f4443bec396d1e8a05e7cedbcd4 commit 5405244f34816f4443bec396d1e8a05e7cedbcd4 Author: Jason E. Hale AuthorDate: 2023-08-02 17:27:21 +0000 Commit: Jason E. Hale CommitDate: 2023-08-02 17:43:46 +0000 graphics/qt6-3d: Fix pkg-plist on i386 OPTIONS_SUB was subbing out %%SIMD%% in pkg-plist as "" for i386, even if CPUTYPE was not set, but bsd.cpu.mk only assumes that sse2 instructions are available for amd64 in this case. Reported by: pkg-fallout --- graphics/qt6-3d/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/graphics/qt6-3d/Makefile b/graphics/qt6-3d/Makefile index 87bcccf5cefd..f16c62323acb 100644 --- a/graphics/qt6-3d/Makefile +++ b/graphics/qt6-3d/Makefile @@ -34,19 +34,19 @@ OPTIONS_DEFINE_i386= SIMD OPTIONS_DEFINE_amd64= SIMD OPTIONS_DEFAULT_i386= SIMD OPTIONS_DEFAULT_amd64= SIMD -OPTIONS_SUB= yes .include .if ${PORT_OPTIONS:MSIMD} . if !empty(MACHINE_CPU:Mavx2) CMAKE_ARGS+= -DINPUT_qt3d_simd=avx2 -PLIST_SUB+= AVX2="" +PLIST_SUB+= AVX2="" SIMD="" . elif !empty(MACHINE_CPU:Msse2) CMAKE_ARGS+= -DINPUT_qt3d_simd=sse2 -PLIST_SUB+= AVX2="@comment " +PLIST_SUB+= AVX2="@comment " SIMD="" . else CMAKE_ARGS+= -DINPUT_qt3d_simd=no +PLIST_SUB+= SIMD="@comment " . endif .else CMAKE_ARGS+= -DINPUT_qt3d_simd=no