<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/e4bc8446464b69418be740ebb7144ee351f2bcf8">https://github.com/macports/macports-ports/commit/e4bc8446464b69418be740ebb7144ee351f2bcf8</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 e4bc8446464 csound: fix the port
</span>e4bc8446464 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit e4bc8446464b69418be740ebb7144ee351f2bcf8
</span>Author: barracuda156 <vital.had@gmail.com>
AuthorDate: Sun Jul 30 23:43:16 2023 +0800
<span style='display:block; white-space:pre;color:#404040;'> csound: fix the port
</span>---
audio/csound/Portfile | 19 ++++++-
...1-Use-correct-clang-options-in-CMakeLists.patch | 64 ++++++++++++++++++++++
...e-is-broken-for-Darwin-so-disable-it-ther.patch | 25 +++++++++
3 files changed, 106 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/csound/Portfile b/audio/csound/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 4d66e2d8912..7eb25edcd51 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/csound/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/csound/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,6 +5,7 @@ PortGroup cmake 1.0
</span> PortGroup github 1.0
github.setup csound csound 6.18.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories audio
license LGPL-2.1+
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -19,8 +20,9 @@ long_description Csound is a computer programming language for dealing with \
</span>
homepage http://www.csounds.com/
github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3702ec791eb5f98f807aed6ec3de7f4eb9deab77 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 b84be8237fa9258ef60fdddf36fae27b20c11665811bf5ed12540da9a9a4414e
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 3702ec791eb5f98f807aed6ec3de7f4eb9deab77 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 b84be8237fa9258ef60fdddf36fae27b20c11665811bf5ed12540da9a9a4414e \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 31925161
</span>
depends_build-append \
port:gettext \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,6 +36,10 @@ depends_lib port:curl \
</span>
patchfiles MAC_OS_X_VERSION.patch
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# https://github.com/csound/csound/pull/1732
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-Use-correct-clang-options-in-CMakeLists.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 0002-Altivec-code-is-broken-for-Darwin-so-disable-it-ther.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> cmake.out_of_source yes
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -43,16 +49,25 @@ configure.args-append -DFAIL_MISSING=ON \
</span> -DBUILD_LUA_INTERFACE=OFF \
-DBUILD_TESTS=OFF \
-DCS_FRAMEWORK_DEST=${frameworks_dir} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DCS_DEFAULT_PLUGINDIR=${prefix}/lib/csound/plugins64 \
</span> -DUSE_ALSA=OFF \
-DUSE_JACK=OFF \
-DUSE_PORTAUDIO=OFF \
-DUSE_PORTMIDI=OFF \
-DUSE_PULSEAUDIO=OFF
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# CMake Error at CMakeLists.txt:146 (message): BUILD_TESTS is enabled, but BUILD_STATIC_LIBRARY="OFF"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Building static lib does not hurt even without tests enabled, since dylib is still built as well.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.args-append -DBUILD_STATIC_LIBRARY=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant tests description "Build tests" {
depends_build-append port:cunit
configure.args-replace -DBUILD_TESTS=OFF \
-DBUILD_TESTS=ON
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Otherwise libraries are looked for in the prefix, which fails, if the port has not been installed earlier.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.env-append DYLD_LIBRARY_PATH=${cmake.build_dir}:${cmake.build_dir}/CsoundLib64.framework/Versions/6.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ test.run yes
</span> }
# Note: fltk functionality has moved to a separate 'plugins' repo upstream.
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/csound/files/0001-Use-correct-clang-options-in-CMakeLists.patch b/audio/csound/files/0001-Use-correct-clang-options-in-CMakeLists.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..e77da2373c4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/csound/files/0001-Use-correct-clang-options-in-CMakeLists.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,64 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 9b33b2ffdedcaf61e453ad41f09342af4e147ae7 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 26 Jul 2023 18:29:26 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Use correct clang options in CMakeLists
</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;'>+ CMakeLists.txt | 8 +++++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 5 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git CMakeLists.txt CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index c333e83aa..80213d700 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,7 +32,7 @@ project(Csound)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENABLE_TESTING()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_COMPILER_IS_CLANG 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -304,8 +304,10 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # MacOS/IOS c++11 flags
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_target_properties(${CSOUNDLIB} PROPERTIES CXX_COMPILE_FLAGS "-std=c++11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_target_properties(${CSOUNDLIB} PROPERTIES CXX_COMPILE_FLAGS "-std=c++11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From 97c6fe6315d1ac5ac7d3570a9dd23d5ed2fdad68 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 26 Jul 2023 19:26:35 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Opcodes/CMakeLists: also does not hardcode C++ runtime
</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;'>+ Opcodes/CMakeLists.txt | 8 ++++++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 6 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git Opcodes/CMakeLists.txt Opcodes/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 82327ed3d..1e2097676 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Opcodes/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Opcodes/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -61,8 +61,12 @@ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(BUILD_PADSYNTH_OPCODES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ make_plugin(padsynth padsynth_gen.cpp)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set_target_properties(padsynth PROPERTIES COMPILE_FLAGS "-std=gnu++11 -stdlib=libc++"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LINK_FLAGS "-std=gnu++11 -stdlib=libc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_target_properties(padsynth PROPERTIES COMPILE_FLAGS "-std=gnu++11 -stdlib=libc++"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LINK_FLAGS "-std=gnu++11 -stdlib=libc++")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set_target_properties(padsynth PROPERTIES COMPILE_FLAGS "-std=gnu++11")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(LINUX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ include(CheckCXXCompilerFlag)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHECK_CXX_COMPILER_FLAG("-std=gnu++11" COMPILER_SUPPORTS_CXX11)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/csound/files/0002-Altivec-code-is-broken-for-Darwin-so-disable-it-ther.patch b/audio/csound/files/0002-Altivec-code-is-broken-for-Darwin-so-disable-it-ther.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..58ec0e51bad
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/csound/files/0002-Altivec-code-is-broken-for-Darwin-so-disable-it-ther.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,25 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From e6b1d05d3c8791e83831f8587b4c54bf97a43f08 Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: barracuda156 <vital.had@gmail.com>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Wed, 26 Jul 2023 19:01:04 +0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] Altivec code is broken for Darwin, so disable it there
</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;'>+ OOps/pffft.c | 4 ++--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 2 insertions(+), 2 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git OOps/pffft.c OOps/pffft.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index e9696a77c..87862b531 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- OOps/pffft.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ OOps/pffft.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -100,9 +100,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ //#define PFFFT_SIMD_DISABLE
</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;'>+- Altivec support macros
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ Altivec support macros. (The code below is broken for Darwin, so disable it explicitly.)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__)) && !defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ typedef vector float v4sf;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define SIMD_SZ 4
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define VZERO() ((vector float) vec_splat_u8(0))
</span></pre><pre style='margin:0'>
</pre>