From nobody Fri Dec 24 19:18:20 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 2F31F1908372; Fri, 24 Dec 2021 19:18:22 +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 4JLH0F24j8z3Lsr; Fri, 24 Dec 2021 19:18:21 +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 0D9D51446; Fri, 24 Dec 2021 19:18:21 +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 1BOJIK5x072833; Fri, 24 Dec 2021 19:18:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BOJIKh7072832; Fri, 24 Dec 2021 19:18:20 GMT (envelope-from git) Date: Fri, 24 Dec 2021 19:18:20 GMT Message-Id: <202112241918.1BOJIKh7072832@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: f89277b84f49 - main - graphics/dust3d: fix build on powerpc and riscv64 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f89277b84f49ac4d7a8656c44ff4e25e3293c116 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640373501; 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=p6BAXN2kNuY7V3GmNKYOP58Y3RMuIRrufnmKy0g7BoQ=; b=SX2h9DGTN61iYok1LJCXc7RCzibQicrpVjn2aoi8vb3EVJYSiLRFaHETRf/P2DEp+mZr3f D2+I66r7lWs285QL7vuATWACQX9IQv5r04aFpqq8dM2fv1M7A6uAKIfAgZNq5NBc+MtZEo HkBqdJjYrnZPAJl9mQE+JVb5ELcZqJ9AOuOabt8taOcTh83SKjtkBmymCDRVQY71c8es2S YwVlAgjHKrT6dPNKErT6e5zel4PAQjxUCwNJqG5otRCxjkHLlFyWED7yWRk6yIreKQbSU7 YGqhPSMOExAROg61wiLRrYaNQi0dGN3Reuxw1xastJQLko/mpsjFI6HZp6WbYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640373501; a=rsa-sha256; cv=none; b=G9T0w7AxSOOwbqaV1r+M8ZHzAYHjU9QXyOwGFVtOACCh9b0I1Qi8C7xeUAsq9844Swj/CM theyirmY33Rih8gEOeL+vAg4Zw5IODzu2AzbKfihj5FwJya3jZ7ILo3B+rZheZwThgoOt7 JGuH+GCGRuMCNd2NzcYZ6Hp6NIunHb/j4P4EUBTv6AAQzU/dMILuqgVHcxHcf/X+E/uvYW SQ7LxTRYBhiNhn9a7xJA9md6mso8ULvRDt+rojZS1Y4gZqA1Wla8peZb/MoQNla9wt2kWN eOpSIFzOnQffCOIWNyXFdkNLZjo98HmZfpAk/WAjfdkIVILkwH9Ejvl+ZZ98AA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=f89277b84f49ac4d7a8656c44ff4e25e3293c116 commit f89277b84f49ac4d7a8656c44ff4e25e3293c116 Author: Piotr Kubaj AuthorDate: 2021-12-24 19:10:57 +0000 Commit: Piotr Kubaj CommitDate: 2021-12-24 19:10:57 +0000 graphics/dust3d: fix build on powerpc and riscv64 Same issue as devel/onetbb. --- graphics/dust3d/Makefile | 6 ++++++ ...shes-dust3d_ext_tbb_src_tbb_tools__api_ittnotify__config.h | 11 +++++++++++ 2 files changed, 17 insertions(+) diff --git a/graphics/dust3d/Makefile b/graphics/dust3d/Makefile index 33544500a1bb..16f117615b79 100644 --- a/graphics/dust3d/Makefile +++ b/graphics/dust3d/Makefile @@ -30,6 +30,12 @@ DESKTOP_ENTRIES="Dust3D" "${COMMENT}" "${PORTNAME}" "${PORTNAME}" \ PLIST_FILES= bin/${PORTNAME} +.include + +.if ${ARCH} == powerpc || ${ARCH} == riscv64 +EXTRA_PATCHES= ${FILESDIR}/extra-patch-thirdparty_instant-meshes_instant-meshes-dust3d_ext_tbb_src_tbb_tools__api_ittnotify__config.h +.endif + post-patch: @${REINPLACE_CMD} -e '/PLATFORM =/s,Linux,${OPSYS},' \ ${WRKSRC}/${PORTNAME}.pro diff --git a/graphics/dust3d/files/extra-patch-thirdparty_instant-meshes_instant-meshes-dust3d_ext_tbb_src_tbb_tools__api_ittnotify__config.h b/graphics/dust3d/files/extra-patch-thirdparty_instant-meshes_instant-meshes-dust3d_ext_tbb_src_tbb_tools__api_ittnotify__config.h new file mode 100644 index 000000000000..cb95787669b4 --- /dev/null +++ b/graphics/dust3d/files/extra-patch-thirdparty_instant-meshes_instant-meshes-dust3d_ext_tbb_src_tbb_tools__api_ittnotify__config.h @@ -0,0 +1,11 @@ +--- thirdparty/instant-meshes/instant-meshes-dust3d/ext/tbb/src/tbb/tools_api/ittnotify_config.h.orig 2021-06-30 18:42:09 UTC ++++ thirdparty/instant-meshes/instant-meshes-dust3d/ext/tbb/src/tbb/tools_api/ittnotify_config.h +@@ -335,7 +335,7 @@ ITT_INLINE long + __itt_interlocked_increment(volatile long* ptr) ITT_INLINE_ATTRIBUTE; + ITT_INLINE long __itt_interlocked_increment(volatile long* ptr) + { +- return __TBB_machine_fetchadd4(ptr, 1) + 1L; ++ return __atomic_fetch_add(ptr, 1L, __ATOMIC_SEQ_CST) + 1L; + } + #endif /* ITT_SIMPLE_INIT */ +