Date: Tue, 30 May 2023 00:18:13 GMT From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 4b9936fd2f86 - main - graphics/oidn: Unbreak build on 12 Message-ID: <202305300018.34U0ID8k047343@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=4b9936fd2f8629487ebd2414e7258c12f2c52bbd commit 4b9936fd2f8629487ebd2414e7258c12f2c52bbd Author: Yuri Victorovich <yuri@FreeBSD.org> AuthorDate: 2023-05-30 00:17:03 +0000 Commit: Yuri Victorovich <yuri@FreeBSD.org> CommitDate: 2023-05-30 00:18:08 +0000 graphics/oidn: Unbreak build on 12 Submitted by: Tatsuki Makino <tatsuki_makino@hotmail.com> --- 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 <pthread.h> + #include <sched.h> ++ #if __FreeBSD__ <= 12 ++ #include <sys/cpuset.h> ++ struct _cpuset; ++ typedef struct _cpuset cpu_set_t; ++ #endif + #if defined(__APPLE__) + #include <mach/thread_policy.h> + #endif +@@ -130,7 +135,7 @@ OIDN_NAMESPACE_BEGIN std::vector<GROUP_AFFINITY> 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:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305300018.34U0ID8k047343>