diff --git a/common/shlibs b/common/shlibs index d5ddac1f253..61e97fcf6d6 100644 --- a/common/shlibs +++ b/common/shlibs @@ -1756,7 +1756,7 @@ libjq.so.1 jq-1.6_2 libcrypto.so.3 libcrypto3-3.1.2_1 libssl.so.3 libssl3-3.1.2_1 libvamp-hostsdk.so.3 libvamp-plugin-sdk-2.2_6 -libportmidi.so portmidi-217_1 +libportmidi.so.2 portmidi-2.0.6_1 libWildMidi.so.2 libwildmidi-0.4.3_1 libsox.so.3 sox-14.4.2_1 libsoxr.so.0 libsoxr-0.1.2_1 diff --git a/srcpkgs/portmidi/patches/portmidi-217-cmake-libdir-java-opts.patch b/srcpkgs/portmidi/patches/portmidi-217-cmake-libdir-java-opts.patch deleted file mode 100644 index dee61c628d2..00000000000 --- a/srcpkgs/portmidi/patches/portmidi-217-cmake-libdir-java-opts.patch +++ /dev/null @@ -1,211 +0,0 @@ ---- a/CMakeLists.txt.old 2010-08-03 21:46:45.000000000 +0100 -+++ b/CMakeLists.txt 2010-08-03 21:50:17.000000000 +0100 -@@ -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.old 2010-10-01 13:33:52.000000000 +0100 -+++ b/pm_common/CMakeLists.txt 2010-10-01 14:02:55.000000000 +0100 -@@ -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 2010-10-01 13:33:56.000000000 +0100 -+++ b/pm_dylib/CMakeLists.txt 2010-10-11 15:13:47.000000000 +0100 -@@ -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.old 2010-08-03 21:47:24.000000000 +0100 -+++ b/pm_java/CMakeLists.txt 2010-08-03 22:03:54.000000000 +0100 -@@ -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 diff --git a/srcpkgs/portmidi/patches/portmidi-217-python-setup.py.patch b/srcpkgs/portmidi/patches/portmidi-217-python-setup.py.patch deleted file mode 100644 index 5ae4add89d5..00000000000 --- a/srcpkgs/portmidi/patches/portmidi-217-python-setup.py.patch +++ /dev/null @@ -1,12 +0,0 @@ ---- a/pm_python/setup.py.old 2010-11-05 14:43:04.000000000 +0000 -+++ b/pm_python/setup.py 2010-11-05 17:40:26.000000000 +0000 -@@ -173,7 +173,8 @@ - EXTENSION = dict( - ext_modules=[ - Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")], -- library_dirs=["./linux"], -+ library_dirs=["../build/Release", "../build/Debug"], -+ include_dirs=["../pm_common", "../porttime"], - libraries = ["portmidi", "asound", "pthread"] - ) - ] diff --git a/srcpkgs/portmidi/template b/srcpkgs/portmidi/template index 8f9bd3afeb4..e4e0e89e1d3 100644 --- a/srcpkgs/portmidi/template +++ b/srcpkgs/portmidi/template @@ -1,25 +1,20 @@ # Template file for 'portmidi' pkgname=portmidi -version=217 -revision=3 +reverts="217_1 217_2 217_3" +version=2.0.6 +revision=1 build_style=cmake -configure_args="-DCMAKE_INSTALL_PREFIX=/usr \ - -DPORTMIDI_ENABLE_JAVA=OFF \ - -DCMAKE_ARCHIVE_OUTPUT_DIRECTORY=Release \ - -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=Release \ - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release" +configure_args="-DCMAKE_INSTALL_PREFIX=/usr -DBUILD_JAVA_NATIVE_INTERFACE=OFF" hostmakedepends="unzip" makedepends="alsa-lib-devel" short_desc="Real-time input and output of MIDI data" maintainer="Enno Boland " license="MIT" -homepage="http://portmedia.sourceforge.net/" -distfiles="${SOURCEFORGE_SITE}/portmedia/${pkgname}/${version}/${pkgname}-src-${version}.zip" -checksum=08e9a892bd80bdb1115213fb72dc29a7bf2ff108b378180586aa65f3cfd42e0f +homepage="https://github.com/PortMidi/portmidi/" +distfiles="https://github.com/PortMidi/portmidi/archive/refs/tags/v${version}.tar.gz" +checksum=81d22b34051621cd56c8d5ef12908ef2a59764c9cdfba6dae47aabddb71ac914 post_install() { - ln -s libportmidi.so ${DESTDIR}/usr/lib/libporttime.so - ln -s libportmidi.a ${DESTDIR}/usr/lib/libporttime.a vlicense license.txt } @@ -28,6 +23,8 @@ portmidi-devel_package() { short_desc+=" - development files" pkg_install() { vmove usr/include - vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + vmove usr/lib/cmake + vmove usr/lib/pkgconfig } }