<pre style='margin:0'>
Michael Dickens (michaelld) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f29c9b93d9edf57412100180bef09ef55f16c628">https://github.com/macports/macports-ports/commit/f29c9b93d9edf57412100180bef09ef55f16c628</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 f29c9b93d9e PothosAudio: add patch to fix the FindPortaudio.cmake script
</span>f29c9b93d9e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f29c9b93d9edf57412100180bef09ef55f16c628
</span>Author: Michael Dickens <michaelld@macports.org>
AuthorDate: Tue Sep 1 09:45:06 2020 -0400
<span style='display:block; white-space:pre;color:#404040;'> PothosAudio: add patch to fix the FindPortaudio.cmake script
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> For some reason, CMake was not reliably finding PortAudio; this way works reliably.
</span>---
science/PothosAudio/Portfile | 4 +
.../files/patch-fix-FindPortaudio.cmake.diff | 143 +++++++++++++++++++++
2 files changed, 147 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/PothosAudio/Portfile b/science/PothosAudio/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 33bb453b4ef..1f3f3275b92 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/PothosAudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/PothosAudio/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,3 +25,7 @@ depends_lib-append \
</span> port:poco \
port:nlohmann-json \
port:portaudio
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-FindPortaudio.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patch.pre_args -p1
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/PothosAudio/files/patch-fix-FindPortaudio.cmake.diff b/science/PothosAudio/files/patch-fix-FindPortaudio.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..1762ca744f4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/PothosAudio/files/patch-fix-FindPortaudio.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,143 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/FindPortaudio.cmake b/FindPortaudio.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 158e20e..67c43e9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/FindPortaudio.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/FindPortaudio.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,89 +19,72 @@ if (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PORTAUDIO_FOUND TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (NOT WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- include(FindPkgConfig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- pkg_check_modules(PORTAUDIO2 portaudio-2.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ include(FindPkgConfig)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ pkg_check_modules(PORTAUDIO2 portaudio-2.0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif (NOT WIN32)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (PORTAUDIO2_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PORTAUDIO_INCLUDE_DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${PORTAUDIO2_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PORTAUDIO_LIBRARIES "${PORTAUDIO2_LIBRARY_DIRS}/lib${PORTAUDIO2_LIBRARIES}.dylib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PORTAUDIO_LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${PORTAUDIO2_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PORTAUDIO_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- 19
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PORTAUDIO_FOUND TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else (PORTAUDIO2_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- find_path(PORTAUDIO_INCLUDE_DIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NAMES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- portaudio.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_path (PORTAUDIO_INCLUDE_DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NAMES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ portaudio.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PATHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${PORTAUDIO2_INCLUDEDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /usr/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /usr/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /opt/local/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /sw/include
</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;'>+- find_library(PORTAUDIO_LIBRARY
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NAMES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- portaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PATHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /opt/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /sw/lib
</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;'>+- find_path(PORTAUDIO_LIBRARY_DIR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- NAMES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- portaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PATHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /opt/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- /sw/lib
</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;'>+- set(PORTAUDIO_INCLUDE_DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${PORTAUDIO_INCLUDE_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (NOT PORTAUDIO_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set (PORTAUDIO_INCLUDE_DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${PORTAUDIO2_INCLUDE_DIRS}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PORTAUDIO_LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${PORTAUDIO_LIBRARY}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ list (APPEND PORTAUDIO_INCLUDE_DIRS ${PORTAUDIO2_INCLUDEDIR})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif (NOT PORTAUDIO_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ find_library (PORTAUDIO_LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ NAMES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ portaudio
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ PATHS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${PORTAUDIO2_LIBDIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /usr/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /usr/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /opt/local/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ /sw/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (NOT PORTAUDIO_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(PORTAUDIO_LIBRARIES "${PORTAUDIO2_LIBDIR}/lib${PORTAUDIO2_LIBRARIES}.dylib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(PORTAUDIO_LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${PORTAUDIO2_LIBRARIES}
</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;'>+- set(PORTAUDIO_LIBRARY_DIRS
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ${PORTAUDIO_LIBRARY_DIR}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif (NOT PORTAUDIO_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (PORTAUDIO2_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(PORTAUDIO_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ${PORTAUDIO2_VERSION}
</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;'>++ else (PORTAUDIO2_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(PORTAUDIO_VERSION
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 18
</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;'>+- if (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(PORTAUDIO_FOUND TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (PORTAUDIO_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (NOT Portaudio_FIND_QUIETLY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(STATUS "Found Portaudio: ${PORTAUDIO_LIBRARIES}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif (NOT Portaudio_FIND_QUIETLY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- else (PORTAUDIO_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (Portaudio_FIND_REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(FATAL_ERROR "Could not find Portaudio")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif (Portaudio_FIND_REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif (PORTAUDIO_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif (PORTAUDIO2_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif (PORTAUDIO2_VERSION)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(PORTAUDIO_FOUND TRUE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif (PORTAUDIO_INCLUDE_DIRS AND PORTAUDIO_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (PORTAUDIO_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (NOT Portaudio_FIND_QUIETLY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(STATUS "Found Portaudio: ${PORTAUDIO_LIBRARIES}")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif (NOT Portaudio_FIND_QUIETLY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ else (PORTAUDIO_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (Portaudio_FIND_REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ message(FATAL_ERROR "Could not find Portaudio")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif (Portaudio_FIND_REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ endif (PORTAUDIO_FOUND)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # show the PORTAUDIO_INCLUDE_DIRS and PORTAUDIO_LIBRARIES variables only in the advanced view
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mark_as_advanced(PORTAUDIO_INCLUDE_DIRS PORTAUDIO_LIBRARIES)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif (PORTAUDIO_LIBRARIES AND PORTAUDIO_INCLUDE_DIRS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span></pre><pre style='margin:0'>
</pre>