<pre style='margin:0'>
Haren S (harens) pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/cb62c184fd17c8b474afefe3655eeb6b99a34b60">https://github.com/macports/macports-ports/commit/cb62c184fd17c8b474afefe3655eeb6b99a34b60</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'>     new cb62c184fd1 libocca: fix the build on >10.6
</span>cb62c184fd1 is described below

<span style='display:block; white-space:pre;color:#808000;'>commit cb62c184fd17c8b474afefe3655eeb6b99a34b60
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Tue Feb 28 23:48:16 2023 +0800

<span style='display:block; white-space:pre;color:#404040;'>    libocca: fix the build on >10.6
</span>---
 devel/libocca/Portfile                             |  6 ++++--
 ...-for-macOS-use-numerical-constant-instead.patch |  4 ++--
 .../0002-opencl.h-must-be-lowercase-on-macOS.patch | 22 ++++++++++++++++++++++
 ...CLOCK_UPTIME_RAW-on-macOS-before-using-it.patch | 22 ++++++++++++++++++++++
 ...tch => 0004-CMakeLists-fix-install-paths.patch} |  0
 5 files changed, 50 insertions(+), 4 deletions(-)

<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libocca/Portfile b/devel/libocca/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index cc0fdf78431..9d07e1e6785 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libocca/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libocca/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,9 +31,11 @@ compiler.openmp_version 4.0
</span> compilers.setup         require_fortran
 
 # Existing code here is wrong, see: https://github.com/libocca/occa/pull/651
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   0001-sys.cpp-fix-for-macOS-use-numerical-constant-instead.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   0001-sys.cpp-fix-for-macOS-use-numerical-constant-instead.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0002-opencl.h-must-be-lowercase-on-macOS.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+                    0003-Check-for-CLOCK_UPTIME_RAW-on-macOS-before-using-it.patch
</span> # By default it installs into a weird location:
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append   0002-CMakeLists-fix-install-paths.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append   0004-CMakeLists-fix-install-paths.patch
</span> 
 post-patch {
     reinplace "s,@DESTROOTDIR@,${destroot}${prefix}," ${worksrcpath}/CMakeLists.txt
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libocca/files/0001-sys.cpp-fix-for-macOS-use-numerical-constant-instead.patch b/devel/libocca/files/0001-sys.cpp-fix-for-macOS-use-numerical-constant-instead.patch
</span><span style='display:block; white-space:pre;color:#808080;'>index 086ca66938b..2befed6daa1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libocca/files/0001-sys.cpp-fix-for-macOS-use-numerical-constant-instead.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libocca/files/0001-sys.cpp-fix-for-macOS-use-numerical-constant-instead.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,8 @@
</span> From 2e6ee119805451235e911589ba422530f53279a4 Mon Sep 17 00:00:00 2001
 From: Sergey Fedorov <vital.had@gmail.com>
 Date: Sat, 25 Feb 2023 03:39:45 +0800
<span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] sys.cpp: fix for macOS: use numerical constant instead of a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macro
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 1/3] sys.cpp: fix for macOS: use numerical constant instead of
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ a macro
</span> 
 Signed-off-by: Sergey Fedorov <vital.had@gmail.com>
 ---
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libocca/files/0002-opencl.h-must-be-lowercase-on-macOS.patch b/devel/libocca/files/0002-opencl.h-must-be-lowercase-on-macOS.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..4d5800afa66
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libocca/files/0002-opencl.h-must-be-lowercase-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 4bccc208d3a58192efd7d58405162140a62106bc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 28 Feb 2023 23:18:10 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 2/3] opencl.h: must be lowercase on macOS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/occa/internal/modes/opencl/polyfill.hpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/occa/internal/modes/opencl/polyfill.hpp b/src/occa/internal/modes/opencl/polyfill.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b1a5378f..31d701b3 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/occa/internal/modes/opencl/polyfill.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/occa/internal/modes/opencl/polyfill.hpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #    include <CL/cl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #    include <CL/cl_gl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #  elif (OCCA_OS & OCCA_MACOS_OS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#    include <OpenCL/OpenCl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#    include <OpenCL/opencl.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #  else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #    include "CL/opencl.h"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #  endif
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libocca/files/0003-Check-for-CLOCK_UPTIME_RAW-on-macOS-before-using-it.patch b/devel/libocca/files/0003-Check-for-CLOCK_UPTIME_RAW-on-macOS-before-using-it.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..7c3a117225e
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libocca/files/0003-Check-for-CLOCK_UPTIME_RAW-on-macOS-before-using-it.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,22 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 01ad927bdc38b11daa1cc88099757c6386dd5927 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 28 Feb 2023 23:20:26 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH 3/3] Check for CLOCK_UPTIME_RAW on macOS before using it
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ src/occa/internal/utils/sys.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/src/occa/internal/utils/sys.cpp b/src/occa/internal/utils/sys.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index eedbd4cb..01d6b0ed 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/occa/internal/utils/sys.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/occa/internal/utils/sys.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,7 +82,7 @@ namespace occa {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       return (double) (ct.tv_sec + (1.0e-9 * ct.tv_nsec));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #elif (OCCA_OS == OCCA_MACOS_OS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#  ifdef __clang__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#  if defined __clang__ && defined CLOCK_UPTIME_RAW
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       uint64_t nanoseconds = clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       return 1.0e-9 * nanoseconds;
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/libocca/files/0002-CMakeLists-fix-install-paths.patch b/devel/libocca/files/0004-CMakeLists-fix-install-paths.patch
</span>similarity index 100%
rename from devel/libocca/files/0002-CMakeLists-fix-install-paths.patch
rename to devel/libocca/files/0004-CMakeLists-fix-install-paths.patch
</pre><pre style='margin:0'>

</pre>