<pre style='margin:0'>
Joshua Root (jmroot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/51ce8ffec65af2eb0b430557f6005f2c114de092">https://github.com/macports/macports-ports/commit/51ce8ffec65af2eb0b430557f6005f2c114de092</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 51ce8ffec65 portmidi: disable pmjni
</span>51ce8ffec65 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 51ce8ffec65af2eb0b430557f6005f2c114de092
</span>Author: Joshua Root <jmr@macports.org>
AuthorDate: Wed Jan 13 07:05:29 2021 +1100
<span style='display:block; white-space:pre;color:#404040;'> portmidi: disable pmjni
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> JavaVM.framework has been removed in macOS 11, so building the JNI lib
</span><span style='display:block; white-space:pre;color:#404040;'> would require a dependency on openjdk, which doesn't seem worthwhile
</span><span style='display:block; white-space:pre;color:#404040;'> for most users.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/41610
</span>---
audio/portmidi/Portfile | 4 ++++
.../files/patch-pm_common-CMakeLists.txt.diff | 23 ++++++++++++++++++----
2 files changed, 23 insertions(+), 4 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/portmidi/Portfile b/audio/portmidi/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 27d321e8cb3..1ed4ac74efb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/portmidi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/portmidi/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +25,10 @@ checksums sha1 f45bf4e247c0d7617deacd6a65d23d9fddae6117 \
</span>
worksrcdir ${name}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+# Building the Java interface and pmdefaults is disabled. They could be
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# added as separate ports, with a dependency on an appropriate openjdk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# port, if there is interest.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> patchfiles patch-CMakeLists.txt.diff \
patch-pm_common-CMakeLists.txt.diff \
patch-pm_dylib-CMakeLists.txt.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/portmidi/files/patch-pm_common-CMakeLists.txt.diff b/audio/portmidi/files/patch-pm_common-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 5e726dce9ba..a1928f15f1c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/portmidi/files/patch-pm_common-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/portmidi/files/patch-pm_common-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- pm_common/CMakeLists.txt.orig 2010-09-20 14:57:48.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ pm_common/CMakeLists.txt 2011-01-02 22:59:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- pm_common/CMakeLists.txt.orig 2010-09-21 05:57:48.000000000 +1000
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ pm_common/CMakeLists.txt 2021-01-13 07:01:36.000000000 +1100
</span> @@ -21,12 +21,6 @@
set(LINUX_FLAGS "-DPMALSA")
endif(APPLE OR WIN32)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -13,12 +13,27 @@
</span>
macro(prepend_path RESULT PATH)
set(${RESULT})
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -120,8 +114,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -110,18 +104,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # define the jni library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-include_directories(${JAVA_INCLUDE_PATHS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include_directories(${JAVA_INCLUDE_PATHS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_library(pmjni SHARED ${JNISRC})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#add_library(pmjni SHARED ${JNISRC})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> # install the libraries (Linux and Mac OS X command line)
if(UNIX)
<span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL(TARGETS portmidi-static pmjni
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- INSTALL(TARGETS portmidi-static pmjni
</span> - LIBRARY DESTINATION /usr/local/lib
- ARCHIVE DESTINATION /usr/local/lib)
<span style='display:block; white-space:pre;background:#e0ffe0;'>++ INSTALL(TARGETS portmidi-static
</span> + LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib
+ ARCHIVE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib)
# .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
</pre><pre style='margin:0'>
</pre>