sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (244391a4f6713832d6ae4b604b61b2bb3c487554)
- From: Thomas Orgis <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org, sm-commit AT lists.sourcemage.org
- Subject: [[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (244391a4f6713832d6ae4b604b61b2bb3c487554)
- Date: Sat, 5 Apr 2025 08:30:54 +0000
GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:
audio-creation/audacity/DEPENDS | 5
audio-creation/audacity/HISTORY | 3
audio-libs/portmidi/DEPENDS | 3
audio-libs/portmidi/DETAILS | 10
audio-libs/portmidi/HISTORY | 5
audio-libs/portmidi/PRE_BUILD | 3
audio-libs/portmidi/patches/portmidi-217-cmake-libdir-java-opts.patch | 213
----------
7 files changed, 18 insertions(+), 224 deletions(-)
New commits:
commit 244391a4f6713832d6ae4b604b61b2bb3c487554
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
audacity: build fixery
commit 0d933fb76a3dd3a2e57445b4eb1f26f8730ead49
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>
portmidi: version 2.0.2 and it builds again
There's newer stuff on github, but this works for now.
diff --git a/audio-creation/audacity/DEPENDS b/audio-creation/audacity/DEPENDS
index d0980b1..2d29702 100755
--- a/audio-creation/audacity/DEPENDS
+++ b/audio-creation/audacity/DEPENDS
@@ -4,7 +4,8 @@ vdepends <<! &&
# FIXME catch2 flags: -Daudacity_use_catch2=system
expat flags: -Daudacity_use_expat=system
lame flags: -Daudacity_use_libmp3lame=system
- portaudio19 flags: -Daudacity_use_portaudio=system
-Daudacity_use_midi=system
+ portaudio19 flags: -Daudacity_use_portaudio=system
+ portmidi flags: -Daudacity_use_midi=system
python3
rapidjson flags: -Daudacity_use_rapidjson=system
soxr flags: -Daudacity_use_soxr=system
@@ -58,7 +59,7 @@ optional_depends libsndfile \
-Daudacity_use_libsndfile=off \
"for raw PCM container formats support" &&
-optional_depends opus \
+optional_depends opusfile \
-Daudacity_use_libopus=system \
-Daudacity_use_libopus=off \
"for Opus codec support" &&
diff --git a/audio-creation/audacity/HISTORY b/audio-creation/audacity/HISTORY
index 5c95e68..5193dc0 100644
--- a/audio-creation/audacity/HISTORY
+++ b/audio-creation/audacity/HISTORY
@@ -1,3 +1,6 @@
+2025-04-04 Thomas Orgis <sobukus AT sourcemage.org>
+ * DEPENDS: depends on opusfile, actually, also portmidi separately
+
2025-04-02 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: updated spell to 3.7.3
diff --git a/audio-libs/portmidi/DEPENDS b/audio-libs/portmidi/DEPENDS
index 17216e9..763bd07 100755
--- a/audio-libs/portmidi/DEPENDS
+++ b/audio-libs/portmidi/DEPENDS
@@ -1,5 +1,6 @@
depends cmake &&
depends alsa-lib &&
optional_depends JAVA \
- -DPORTMIDI_ENABLE_JAVA={on,off} \
+ -DBUILD_JAVA_NATIVE_INTERFACE=on \
+ -DBUILD_JAVA_NATIVE_INTERFACE=off \
'for Java bindings'
diff --git a/audio-libs/portmidi/DETAILS b/audio-libs/portmidi/DETAILS
index 96e941b..85f9f92 100755
--- a/audio-libs/portmidi/DETAILS
+++ b/audio-libs/portmidi/DETAILS
@@ -1,9 +1,9 @@
SPELL=portmidi
- VERSION=217
- SOURCE="$SPELL-src-$VERSION.zip"
- SOURCE_URL[0]=http://denemo.org/downloads/gub/$SOURCE
-
SOURCE_URL[1]=https://downloads.sourceforge.net/project/portmedia/$SPELL/$VERSION/$SOURCE
-
SOURCE_HASH=sha512:d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
+ VERSION=2.0.2
+ SOURCE="$SPELL-v$VERSION.zip"
+# TODO: newer stuff on github, small update first
+
SOURCE_URL[0]=https://downloads.sourceforge.net/project/portmedia/$SPELL/v$VERSION/$SOURCE
+
SOURCE_HASH=sha512:8d6df1cf9a6e807716137d6333897fc5c55f5323a77aea62cae884b5a9bb23a5a9dea60b2ef31c6f41aea9a993eb18eabc78289d61e2198c5311c7876a02e515
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL"
WEB_SITE="http://portmedia.sourceforge.net/portmidi/"
LICENSE[0]="MIT"
diff --git a/audio-libs/portmidi/HISTORY b/audio-libs/portmidi/HISTORY
index 9dd7785..ca61c25 100644
--- a/audio-libs/portmidi/HISTORY
+++ b/audio-libs/portmidi/HISTORY
@@ -1,3 +1,8 @@
+2025-04-04 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: version 2.0.2, fixing build with CMake 4
+ * patches/portmidi-217-cmake-libdir-java-opts.patch,
+ DEPENDS: upstream java choice
+
2020-01-01 Florian Franzmann <bwlf AT bandrate.org>
* DETAILS: fix SOURCE_URL, add mirror
* DEPENDS: depend on cmake
diff --git a/audio-libs/portmidi/PRE_BUILD b/audio-libs/portmidi/PRE_BUILD
deleted file mode 100755
index c230ad1..0000000
--- a/audio-libs/portmidi/PRE_BUILD
+++ /dev/null
@@ -1,3 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-apply_patch_dir patches
diff --git
a/audio-libs/portmidi/patches/portmidi-217-cmake-libdir-java-opts.patch
b/audio-libs/portmidi/patches/portmidi-217-cmake-libdir-java-opts.patch
deleted file mode 100644
index ae6f7e8..0000000
--- a/audio-libs/portmidi/patches/portmidi-217-cmake-libdir-java-opts.patch
+++ /dev/null
@@ -1,213 +0,0 @@
-Source: Void-Linux
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -65,6 +65,8 @@
- endif(CMAKE_LIBRARY_OUTPUT_DIRECTORY MATCHES ${BAD_DIR})
- endif(UNIX)
-
-+option(PORTMIDI_ENABLE_JAVA "Enable Java bindings support" ON)
-+
- include_directories(pm_common porttime)
- add_subdirectory(pm_common)
-
-@@ -73,5 +77,9 @@
- add_subdirectory(pm_dylib)
-
- # Cannot figure out how to make an xcode Java application with CMake
--add_subdirectory(pm_java)
-+if(PORTMIDI_ENABLE_JAVA)
-+ set(JAR_INSTALL_DIR share/java
-+ CACHE STRING "Define directory name for jar installation")
-+ add_subdirectory(pm_java)
-+endif(PORTMIDI_ENABLE_JAVA)
-
---- a/pm_common/CMakeLists.txt
-+++ b/pm_common/CMakeLists.txt
-@@ -62,19 +62,23 @@
- ${COREMIDI_LIB} ${CORESERVICES_LIB}
- CACHE INTERNAL "")
-
-- set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
-- set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
-+ if(PORTMIDI_ENABLE_JAVA)
-+ set(JAVAVM_LIB "${FRAMEWORK_PATH}/JavaVM.framework")
-+ set(JAVA_INCLUDE_PATHS ${JAVAVM_LIB}/Headers)
-+ endif(PORTMIDI_ENABLE_JAVA)
- message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
- else(APPLE)
- # LINUX settings...
-- include(FindJNI)
-- message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
-- message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
-- message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
-- message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
-- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-- # libjvm.so is found relative to JAVA_INCLUDE_PATH:
-- set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
-+ if(PORTMIDI_ENABLE_JAVA)
-+ include(FindJNI)
-+ message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
-+ message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
-+ message(STATUS "JAVA_INCLUDE_PATH2 is " ${JAVA_INCLUDE_PATH2})
-+ message(STATUS "JAVA_JVM_LIBRARY is " ${JAVA_JVM_LIBRARY})
-+ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-+ # libjvm.so is found relative to JAVA_INCLUDE_PATH:
-+ set(JAVAVM_LIB ${JAVA_JVM_LIBRARY}/libjvm.so)
-+ endif(PORTMIDI_ENABLE_JAVA)
-
- set(LINUXSRC pmlinuxalsa pmlinux finddefault)
- prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
-@@ -88,10 +92,12 @@
- # /MD is multithread DLL, /MT is multithread. Change to static:
- include(../pm_win/static.cmake)
-
-- include(FindJNI)
-+ if(PORTMIDI_ENABLE_JAVA)
-+ include(FindJNI)
-
-- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-- # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-+ # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+ endif(PORTMIDI_ENABLE_JAVA)
-
- set(WINSRC pmwin pmwinmm)
- prepend_path(LIBSRC ../pm_win/ ${WINSRC})
-@@ -99,29 +105,39 @@
- set(PM_NEEDED_LIBS winmm.lib)
- endif(WIN32)
- endif(UNIX)
--set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})
-+
-+if(PORTMIDI_ENABLE_JAVA)
-+ set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVA_JVM_LIBRARY})
-+endif(PORTMIDI_ENABLE_JAVA)
-
- # this completes the list of library sources by adding shared code
- list(APPEND LIBSRC pmutil portmidi)
-
- # now add the shared files to make the complete list of library sources
- add_library(portmidi-static ${LIBSRC})
--set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi_s")
-+set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi")
- target_link_libraries(portmidi-static ${PM_NEEDED_LIBS})
-
--# define the jni library
--include_directories(${JAVA_INCLUDE_PATHS})
--
--set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
--add_library(pmjni SHARED ${JNISRC})
--target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
--set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
-+if(PORTMIDI_ENABLE_JAVA)
-+ # define the jni library
-+ include_directories(${JAVA_INCLUDE_PATHS})
-+
-+ set(JNISRC ${LIBSRC} ../pm_java/pmjni/pmjni.c)
-+ add_library(pmjni SHARED ${JNISRC})
-+ target_link_libraries(pmjni ${JNI_EXTRA_LIBS})
-+ set_target_properties(pmjni PROPERTIES EXECUTABLE_EXTENSION "jnilib")
-+endif(PORTMIDI_ENABLE_JAVA)
-
- # install the libraries (Linux and Mac OS X command line)
- if(UNIX)
-- INSTALL(TARGETS portmidi-static pmjni
-- LIBRARY DESTINATION /usr/local/lib
-- ARCHIVE DESTINATION /usr/local/lib)
-+ INSTALL(TARGETS portmidi-static
-+ LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
-+ if(PORTMIDI_ENABLE_JAVA)
-+ INSTALL(TARGETS pmjni
-+ LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
-+ endif(PORTMIDI_ENABLE_JAVA)
- # .h files installed by pm_dylib/CMakeLists.txt, so don't need them here
- # INSTALL(FILES portmidi.h ../porttime/porttime.h
- # DESTINATION /usr/local/include)
---- a/pm_dylib/CMakeLists.txt
-+++ b/pm_dylib/CMakeLists.txt
-@@ -63,7 +63,8 @@
- message(STATUS "SYSROOT: " ${CMAKE_OSX_SYSROOT})
- else(APPLE)
- # LINUX settings...
-- include(FindJNI)
-+ if(PORTMIDI_ENABLE_JAVA)
-+ include(FindJNI)
- # message(STATUS "JAVA_JVM_LIB_PATH is " ${JAVA_JVM_LIB_PATH})
- # message(STATUS "JAVA_INCLUDE_PATH is " ${JAVA_INCLUDE_PATH})
- # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
-@@ -75,11 +76,8 @@
- # JAVA_INCLUDE_PATH2; if no, then we need to make both JAVA_INCLUDE_PATH
- # and JAVA_INCLUDE_PATH2 set by user (will need clear documentation
- # because JAVA_INCLUDE_PATH2 is pretty obscure)
-- set(JAVA_INCLUDE_PATH ${JAVA_INCLUDE_PATH-UNKNOWN}
-- CACHE STRING "where to find Java SDK include directory")
-- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH}/linux)
-- # libjvm.so is found relative to JAVA_INCLUDE_PATH:
-- set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../jre/lib/i386/client/libjvm.so)
-+ set(JAVAVM_LIB ${JAVA_JVM_LIBRARY})
-+ endif(PORTMIDI_ENABLE_JAVA)
-
- set(LINUXSRC pmlinuxalsa pmlinux finddefault)
- prepend_path(LIBSRC ../pm_linux/ ${LINUXSRC})
-@@ -91,13 +89,15 @@
- if(WIN32)
- # /MDd is multithread debug DLL, /MTd is multithread debug
- # /MD is multithread DLL, /MT is multithread
--
-- include(FindJNI)
-- # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
-- set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib)
-
-- set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-- # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+ if(PORTMIDI_ENABLE_JAVA)
-+ include(FindJNI)
-+ # note: should use JAVA_JVM_LIB_PATH, but it is not set properly
-+ set(JAVAVM_LIB ${JAVA_INCLUDE_PATH}/../lib/jvm.lib)
-+
-+ set(JAVA_INCLUDE_PATHS ${JAVA_INCLUDE_PATH} ${JAVA_INCLUDE_PATH2})
-+ # message(STATUS "JAVA_INCLUDE_PATHS: " ${JAVA_INCLUDE_PATHS})
-+ endif(PORTMIDI_ENABLE_JAVA)
-
- set(WINSRC pmwin pmwinmm)
- prepend_path(LIBSRC ../pm_win/ ${WINSRC})
-@@ -106,7 +106,10 @@
- # message(STATUS "JAVAVM_LIB: " ${JAVAVM_LIB})
- endif(WIN32)
- endif(UNIX)
-+
-+if(PORTMIDI_ENABLE_JAVA)
- set(JNI_EXTRA_LIBS ${PM_NEEDED_LIBS} ${JAVAVM_LIB})
-+endif(PORTMIDI_ENABLE_JAVA)
-
- # this completes the list of library sources by adding shared code
- set(SHARED_FILES pmutil portmidi)
-@@ -120,8 +123,8 @@
- # install the libraries (Linux and Mac OS X command line)
- if(UNIX)
- INSTALL(TARGETS portmidi-dynamic
-- LIBRARY DESTINATION /usr/local/lib
-- ARCHIVE DESTINATION /usr/local/lib)
-+ LIBRARY DESTINATION lib${LIB_SUFFIX}
-+ ARCHIVE DESTINATION lib${LIB_SUFFIX})
- INSTALL(FILES ../pm_common/portmidi.h ../porttime/porttime.h
-- DESTINATION /usr/local/include)
-+ DESTINATION include)
- endif(UNIX)
---- a/pm_java/CMakeLists.txt
-+++ b/pm_java/CMakeLists.txt
-@@ -39,9 +39,9 @@
-
- # install the libraries (Linux only)
- INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar
-- DESTINATION /usr/share/java)
-+ DESTINATION ${JAR_INSTALL_DIR})
- INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults
-- DESTINATION /usr/local/bin)
-+ DESTINATION bin)
- endif(APPLE)
- endif(UNIX)
- # In windows, use pm_java/make.bat
- [[SM-Commit] ] GIT changes to master grimoire by Thomas Orgis (244391a4f6713832d6ae4b604b61b2bb3c487554), Thomas Orgis, 04/05/2025
Archive powered by MHonArc 2.6.24.