<pre style='margin:0'>
ra1nb0w (ra1nb0w) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/d3a3fb9668d20fb9b6a744fadff0195c59791bec">https://github.com/macports/macports-ports/commit/d3a3fb9668d20fb9b6a744fadff0195c59791bec</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 d3a3fb9668d dsd: fix portaudio linking issue
</span>d3a3fb9668d is described below
<span style='display:block; white-space:pre;color:#808000;'>commit d3a3fb9668d20fb9b6a744fadff0195c59791bec
</span>Author: Davide Gerhard <ra1nb0w@macports.org>
AuthorDate: Wed Dec 2 09:08:52 2020 +0100
<span style='display:block; white-space:pre;color:#404040;'> dsd: fix portaudio linking issue
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The change in the FindLibPortAudio fix the following error:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> :info:build make[2]: *** No rule to make target `/opt/local/lib/libportaudio', needed by `dsd'. Stop.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/61674
</span>---
science/dsd/Portfile | 3 +
.../files/patch-fix-FindLibPortAudio.cmake.diff | 140 +++++++++++++++++++++
2 files changed, 143 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/dsd/Portfile b/science/dsd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 967159ca68e..8b25fcf9ebc 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/dsd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/dsd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -21,6 +21,9 @@ revision 0
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fix-FindLibPortAudio.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> depends_build-append \
port:pkgconfig \
port:help2man
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/dsd/files/patch-fix-FindLibPortAudio.cmake.diff b/science/dsd/files/patch-fix-FindLibPortAudio.cmake.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3bb9614e117
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/dsd/files/patch-fix-FindLibPortAudio.cmake.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,140 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git cmake/FindLibPortAudio.cmake cmake/FindLibPortAudio.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 11e4055..67c43e9 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- cmake/FindLibPortAudio.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ cmake/FindLibPortAudio.cmake
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,88 +19,70 @@ 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;'>++ 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;'>++ 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;'>+- 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;'>+- )
</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;'>++ 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;'>++ 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;'>+- 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;'>++ 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;'>++ 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;'>+- else (Portaudio_FIND_REQUIRED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- message(STATUS "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;'>+-
</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></pre><pre style='margin:0'>
</pre>