<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0b29efd98827b86f0af0168093835e8661077513">https://github.com/macports/macports-ports/commit/0b29efd98827b86f0af0168093835e8661077513</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 0b29efd9882 libocca: update to 1.6.0
</span>0b29efd9882 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0b29efd98827b86f0af0168093835e8661077513
</span>Author: Sergey Fedorov <vital.had@gmail.com>
AuthorDate: Thu Sep 28 19:53:46 2023 +0700
<span style='display:block; white-space:pre;color:#404040;'> libocca: update to 1.6.0
</span>---
devel/libocca/Portfile | 15 ++++++-------
...tch => 0001-CMakeLists-fix-install-paths.patch} | 6 +++---
...-for-macOS-use-numerical-constant-instead.patch | 24 ---------------------
.../0002-opencl.h-must-be-lowercase-on-macOS.patch | 22 -------------------
...CLOCK_UPTIME_RAW-on-macOS-before-using-it.patch | 25 ----------------------
5 files changed, 9 insertions(+), 83 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 9d07e1e6785..a221bd7223a 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;'>@@ -9,7 +9,7 @@ PortGroup legacysupport 1.1
</span> # getline
legacysupport.newest_darwin_requires_legacy 10
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup libocca occa 1.5.0 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup libocca occa 1.6.0 v
</span> name libocca
revision 0
categories devel parallel
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,21 +21,18 @@ long_description OCCA is an open source, portable and vendor-neutral framewor
</span> concepts — such as a device, memory or kernel — while the OCCA Kernel Language (OKL) \
enables the creation of portable device kernels using a directive-based extension to the C language.
homepage htpps://libocca.org
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 9bb2e898df51508ef25206cb9d155da71fbcded0 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 29e5115a87fda513801aba3b7b5d6cfaa58e6c81f51b4e5a0daddc0e99d2d445 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 1125463
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 74974bd170d9cf9b9dfe178a78d168cda6451d7e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b863a24171000097121aff5c43dadf22416c143824598a51c653689fd917794f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 1131891
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
compiler.c_standard 2011
compiler.cxx_standard 2017
compiler.openmp_version 4.0
compilers.setup require_fortran
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# Existing code here is wrong, see: https://github.com/libocca/occa/pull/651
</span><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:#ffe0e0;'>- 0002-opencl.h-must-be-lowercase-on-macOS.patch \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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 0004-CMakeLists-fix-install-paths.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-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/0004-CMakeLists-fix-install-paths.patch b/devel/libocca/files/0001-CMakeLists-fix-install-paths.patch
</span>similarity index 85%
rename from devel/libocca/files/0004-CMakeLists-fix-install-paths.patch
rename to devel/libocca/files/0001-CMakeLists-fix-install-paths.patch
<span style='display:block; white-space:pre;color:#808080;'>index b7e7a34e086..17de61814a6 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libocca/files/0004-CMakeLists-fix-install-paths.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/libocca/files/0001-CMakeLists-fix-install-paths.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,7 +11,7 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
</span> index 5dc0a5fb..a0a5dbad 100644
--- CMakeLists.txt
+++ CMakeLists.txt
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -243,7 +243,7 @@ if(ENABLE_FORTRAN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -252,7 +252,7 @@
</span> install(CODE
"file(GLOB public-modules ${CMAKE_Fortran_MODULE_DIRECTORY}/*.mod)\n
file(INSTALL DESTINATION
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,10 +20,10 @@ index 5dc0a5fb..a0a5dbad 100644
</span> TYPE FILE
FILES \${public-modules})")
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -283,7 +283,7 @@ include(ExportAndPackageConfig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -292,7 +292,7 @@
</span> install(CODE
"configure_file(
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${CMAKE_SOURCE_DIR}/modulefiles/occa
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${OCCA_SOURCE_DIR}/modulefiles/occa
</span> - ${CMAKE_INSTALL_PREFIX}/modulefiles/occa
+ @DESTROOTDIR@/share/occa/modulefiles
@ONLY
<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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2befed6daa1..00000000000
</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;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,24 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 2e6ee119805451235e911589ba422530f53279a4 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 25 Feb 2023 03:39:45 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 1/3] sys.cpp: fix for macOS: use numerical constant instead of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- a macro
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/occa/internal/utils/sys.cpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index ea8442cf..eedbd4cb 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/occa/internal/utils/sys.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/occa/internal/utils/sys.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -401,7 +401,7 @@ namespace occa {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- int getTID() {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #if (OCCA_OS & (OCCA_LINUX_OS | OCCA_MACOS_OS))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#if OCCA_OS == OCCA_MACOS_OS & (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_12)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#if OCCA_OS == OCCA_MACOS_OS & (MAC_OS_X_VERSION_MAX_ALLOWED >= 101200)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint64_t tid64;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pthread_threadid_np(NULL, &tid64);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- pid_t tid = (pid_t)tid64;
</span><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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 4d5800afa66..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libocca/files/0002-opencl.h-must-be-lowercase-on-macOS.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,22 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 4bccc208d3a58192efd7d58405162140a62106bc Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 28 Feb 2023 23:18:10 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 2/3] opencl.h: must be lowercase on macOS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- src/occa/internal/modes/opencl/polyfill.hpp | 2 +-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 1 file changed, 1 insertion(+), 1 deletion(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-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:#ffe0e0;'>-index b1a5378f..31d701b3 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/occa/internal/modes/opencl/polyfill.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/occa/internal/modes/opencl/polyfill.hpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14,7 +14,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <CL/cl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <CL/cl_gl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # elif (OCCA_OS & OCCA_MACOS_OS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# include <OpenCL/OpenCl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# include <OpenCL/opencl.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include "CL/opencl.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 2b3affb0618..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/libocca/files/0003-Check-for-CLOCK_UPTIME_RAW-on-macOS-before-using-it.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,25 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 01ad927bdc38b11daa1cc88099757c6386dd5927 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: Sergey Fedorov <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Tue, 28 Feb 2023 23:20:26 +0800
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH 3/3] Check for CLOCK_UPTIME_RAW on macOS before using it
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/occa/internal/utils/sys.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/occa/internal/utils/sys.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,7 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <sys/sysinfo.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # else // OCCA_MACOS_OS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <mach/mach_host.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifdef __clang__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifdef CLOCK_UPTIME_RAW
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <CoreServices/CoreServices.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # include <mach/mach_time.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -82,7 +82,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (double) (ct.tv_sec + (1.0e-9 * ct.tv_nsec));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #elif (OCCA_OS == OCCA_MACOS_OS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--# ifdef __clang__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifdef CLOCK_UPTIME_RAW
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- uint64_t nanoseconds = clock_gettime_nsec_np(CLOCK_UPTIME_RAW);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1.0e-9 * nanoseconds;
</span></pre><pre style='margin:0'>
</pre>