From nobody Tue May 30 00:18:13 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 4QVXzn5RGPz4XQrD; Tue, 30 May 2023 00:18:13 +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 4QVXzn42Mrz3q05; Tue, 30 May 2023 00:18:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685405893; 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=WLiN5t5dT0sEq5T6Xa5sPfPWJnieYKV1pIj9E9nxUoI=; b=a93RvScGA2z2wxGMM1JBnu3CXsU+qAeIk5edqyyr6kdZoOO8eAIKM4XiBq/9m/DzRWX7nY MFlaR+/X+bDPXIWhruAPRqQ3GXKNzRsJsIn2wXQwBPyZx0ZGT8L1cLv1gRH3B4MvjTAxto 4bUssRGYSftD3dY40RQHW5C8y2QNW1BTFwCxNMIn6z8fBCXaEOPrfQjOuJdm1xlVslgtVF XgcV1VYmH5QhfqaeiScyXeLVAoKonv7Jjl0nAwvMx79Kbd/hvGPb1V4tor9MvZbsCZiMCT Rxa8oVF6mP8Z/fP5YB66XuG63xb4Ae9TvLSpWHkUlh4SAENv/BOykIlGX8nHzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685405893; 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=WLiN5t5dT0sEq5T6Xa5sPfPWJnieYKV1pIj9E9nxUoI=; b=yr8Af+aEalAhsIN4F2IEA/VWHqWze9SLdm7JPhTKgK9wRVe6w6mpOM/cYwEtjVYuVGIUM9 HVrJVEESjz6DK9xEwOE61H99oZA0FRdLvvpy0MK+OprrOAi7GU8RZK/Srgrss3LJlsPcuN cZL/s9EKXIEl0tVj3WWibm3lxrZsB5XVYNho8MsTIuRfxDlvUxSUzktCz2Z+yg9q63WPNH OKB8zUx0TrHE+nnB8vUWiXPnRgKRo0/HPT9Y9BoGaqw2Pt8Hb+h2zM1ceXGuBzvCbZC8vm zVZS1w4v7pJxnVb5KjLfoskzD7c1jvcI/fR3o8JPkHMh9zJYKRQAfQTcXdj7HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685405893; a=rsa-sha256; cv=none; b=emz8iybsc8JVLoCVRSbiDN2kymjpN0iGghN9ACWAcMqKQe67ZjFy1a/f34lDJ8wkakSEZ7 98nlUZbUYepDMl4ifOMlsparzlGiIOXP973Yt5GTWXV+9wnK2tyV2Y9KFgLUDSq6iewPEp mackO1G5LsItXl1a0mpmvarX43s9isHTrI1RT/LjEeVM3oSLOQpOXNX6kW7ZoalSbSgj7p 9oYM9LssasXK1iCna6aw+sGwlqG9EYgMXA7l3ZLXUBHX8azFagn88ah2gmRkp08/nK21aA NkgFHPIr6F6h/EHix5CXbCb6hQEqdlsaATlNuzqR6QPl+E7Pst9ciXSvKsnqzg== 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 4QVXzn2YWFzXJ0; Tue, 30 May 2023 00:18:13 +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 34U0IDao047344; Tue, 30 May 2023 00:18:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34U0ID8k047343; Tue, 30 May 2023 00:18:13 GMT (envelope-from git) Date: Tue, 30 May 2023 00:18:13 GMT Message-Id: <202305300018.34U0ID8k047343@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: 4b9936fd2f86 - main - graphics/oidn: Unbreak build on 12 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: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4b9936fd2f8629487ebd2414e7258c12f2c52bbd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b9936fd2f8629487ebd2414e7258c12f2c52bbd commit 4b9936fd2f8629487ebd2414e7258c12f2c52bbd Author: Yuri Victorovich AuthorDate: 2023-05-30 00:17:03 +0000 Commit: Yuri Victorovich CommitDate: 2023-05-30 00:18:08 +0000 graphics/oidn: Unbreak build on 12 Submitted by: Tatsuki Makino --- graphics/oidn/Makefile | 1 - graphics/oidn/files/patch-core_thread.h | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/graphics/oidn/Makefile b/graphics/oidn/Makefile index f3bf553ca529..2098e2c26871 100644 --- a/graphics/oidn/Makefile +++ b/graphics/oidn/Makefile @@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE.txt ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= Intel(R) MKL-DNN supports x86 64 bit platforms only (oidn contains a custom version of mkl-dnn, see math/mkl-dnn), and ISPC has a limited availability -BROKEN_FreeBSD_12= error: unknown type name 'cpuset_t'; did you mean 'cpusetid_t'? FETCH_DEPENDS= git:devel/git \ git-lfs:devel/git-lfs diff --git a/graphics/oidn/files/patch-core_thread.h b/graphics/oidn/files/patch-core_thread.h index 826c204631e7..86c7e1697ca5 100644 --- a/graphics/oidn/files/patch-core_thread.h +++ b/graphics/oidn/files/patch-core_thread.h @@ -1,6 +1,18 @@ --- core/thread.h.orig 2023-05-24 17:03:47 UTC +++ core/thread.h -@@ -130,7 +130,7 @@ OIDN_NAMESPACE_BEGIN +@@ -8,6 +8,11 @@ + #if !defined(_WIN32) + #include + #include ++ #if __FreeBSD__ <= 12 ++ #include ++ struct _cpuset; ++ typedef struct _cpuset cpu_set_t; ++ #endif + #if defined(__APPLE__) + #include + #endif +@@ -130,7 +135,7 @@ OIDN_NAMESPACE_BEGIN std::vector oldAffinities; // original thread affinities }; @@ -9,7 +21,7 @@ // ----------------------------------------------------------------------------------------------- // ThreadAffinity: Linux -@@ -153,8 +153,8 @@ OIDN_NAMESPACE_BEGIN +@@ -153,8 +158,8 @@ OIDN_NAMESPACE_BEGIN void restore(int threadIndex); private: