From b83e82c4d46297f4fbe56dc8b6e149637d5d90fd Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 29 Apr 2023 11:14:34 +0100 Subject: gentoo auto-resync : 29:04:2023 - 11:14:33 --- media-libs/Manifest.gz | Bin 68050 -> 68072 bytes media-libs/game-music-emu/Manifest | 2 +- .../game-music-emu/game-music-emu-0.6.3.ebuild | 2 +- media-libs/libvisual/Manifest | 2 +- media-libs/libvisual/libvisual-0.4.2-r1.ebuild | 2 +- media-libs/portmidi/Manifest | 9 +- .../portmidi/files/portmidi-0.234-cmake.patch | 332 +++++++++++++++++++++ .../portmidi/files/portmidi-2.0.4-cmake.patch | 11 + media-libs/portmidi/files/portmidi-234-cmake.patch | 332 --------------------- media-libs/portmidi/metadata.xml | 1 + media-libs/portmidi/portmidi-0.234.ebuild | 120 ++++++++ media-libs/portmidi/portmidi-2.0.4.ebuild | 62 ++++ media-libs/portmidi/portmidi-234-r2.ebuild | 120 -------- 13 files changed, 536 insertions(+), 459 deletions(-) create mode 100644 media-libs/portmidi/files/portmidi-0.234-cmake.patch create mode 100644 media-libs/portmidi/files/portmidi-2.0.4-cmake.patch delete mode 100644 media-libs/portmidi/files/portmidi-234-cmake.patch create mode 100644 media-libs/portmidi/portmidi-0.234.ebuild create mode 100644 media-libs/portmidi/portmidi-2.0.4.ebuild delete mode 100644 media-libs/portmidi/portmidi-234-r2.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index f5efa915252a..8bd78d2f7718 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/game-music-emu/Manifest b/media-libs/game-music-emu/Manifest index 88ea99e4e9b5..8e71edde032c 100644 --- a/media-libs/game-music-emu/Manifest +++ b/media-libs/game-music-emu/Manifest @@ -1,3 +1,3 @@ DIST game-music-emu-0.6.3.tar.xz 234412 BLAKE2B 21edd8f5e868231424c56dad6740a5c7cb8e7f503b707dc56ea71d7a75085566b2bd0c2060b0f9e919f858c13821b3810959cff96c41f9248bb3b98f12eb22f7 SHA512 4b20c69ced696bb879c34bcb7ce0f5f276642458d4cebca8ede673eed7d50664e527626e2077f85a3411a26660f1b3f01e43cccd72945e1edb2994421efeb552 -EBUILD game-music-emu-0.6.3.ebuild 939 BLAKE2B fb5206a47c782251d31a03271cccfd51a712e3700ac3de4d1e57c1d752f6cc616ec57289e114036e81ed96c924389561db1df2408abb4eaa9e2bad174ebb12d2 SHA512 d4127e3c80dfb90f0d1558e097693a0cea59115d9afd9d198006cdbee4c99e66f6897afef01b8afcc97bf898a89e45b5a1f239fed79f623c5492eef205624e69 +EBUILD game-music-emu-0.6.3.ebuild 945 BLAKE2B ffa2ac2ea1a63d85a5ea2abba8805a8863aab4947a88297c451bc4962d6fbdf7839fb617e78729986215197d4ef9ce26dfe69855aa025373a764e970f3722cb1 SHA512 cc51ddb7be4fea60e10a2b2d0e740e5540f01f83b877fa743c80d8bb1130356690af5c874c92b0a3c63e048aabe28a56631cf73fd8610c9a4896703fed73b339 MISC metadata.xml 401 BLAKE2B 55ad6fa2bd1c0cc363ea58e09c6b58d518782717b244a4bc50d902368b748f17f485e41ad5a81c1671edc4ef635544f5abae36f5978feb3980e7d1909f248907 SHA512 91fd65adf324ae718e5ad19446ddf9b884541358ec49be432108091f7651c73bcb3b33ee50063b9c23401877e9f1ba29e63b447f47668b862e64707a70d7c7f0 diff --git a/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild b/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild index 85f4ecdcf91a..4ad4e6163d4d 100644 --- a/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild +++ b/media-libs/game-music-emu/game-music-emu-0.6.3.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://bitbucket.org/mpyne/game-music-emu/downloads/${P}.tar.xz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv x86" IUSE="test" RESTRICT="!test? ( test )" diff --git a/media-libs/libvisual/Manifest b/media-libs/libvisual/Manifest index d78c931afa12..cb352118f914 100644 --- a/media-libs/libvisual/Manifest +++ b/media-libs/libvisual/Manifest @@ -2,5 +2,5 @@ AUX libvisual-0.4.0-better-altivec-detection.patch 1555 BLAKE2B 8516652c13c365ba DIST libvisual-0.4.1.tar.bz2 560877 BLAKE2B 5429493424cbf7d5d6e17ef6a5219ffb5491a6e0f7ea9d9563021beabfdc22aead0d80924c17904b96cc645ef0dc737fa61680abf152b421ca5f4ac834fc6a19 SHA512 a1417a54d4f0566121db5d08770e7f41559ef7f3704d0da74f1dc316c6b7f16197d843a96382b4122d01251764ccb6ed240fd4e99abc7b0f440c9f43afa9506a DIST libvisual-0.4.2.tar.bz2 563023 BLAKE2B b9480db0f168f6e7b398f773c6bbf4d1dab75dd2b711cc9b0b5fd1fb790e57cdd1e9ed3733fb4f911586b7ebb6e1cb9f3bbe74bfe4e67b9cb95e3e7b2eee950a SHA512 88634c27cd5de149d08141fb68d86a85320513208426f412541ab6aa985069683c17437fd0f49d6dafdd811a516f1f9268a2cf2146a3b55332280d7930f59b55 EBUILD libvisual-0.4.1.ebuild 1098 BLAKE2B 2053824d6e2a30049c9008898547f3fe720b2d011ddc204fd2defdbc74cec2aa80a1f25c76603155f855a14b57df6bfc01bf5c8eabd76f0525e6cadf2a6c976b SHA512 847574b94af1f236b654c1019b311dc2d7f9079f0a2504a7b440e92a0856db060702f91707d42a584477d2e65ab404a8a3f78636ad728e30f31ea79bdfb5c46c -EBUILD libvisual-0.4.2-r1.ebuild 1220 BLAKE2B 5d9f9f5d56a613f9987be4e08c21018f233112cba73e12e46a7d560ab2f4083e006b10cf351639c02497eb4a0e5c62d683f3148bd2afcbe07dc093edd1bf0a0c SHA512 29e4cb8eb6b991471294207ed5a073577d01a010bf3ed213328c271103141cc9fd0f8352b9276eb40ab84f7d4dc68ba15428446ffcc138f76285e2282f4b7157 +EBUILD libvisual-0.4.2-r1.ebuild 1219 BLAKE2B 5234c41354e7ef55d3f541b908124f25945934e28660ba411961f01d57e5650f80eb81e38a0fc54e49ef2e9535b420faaa22ccb873515b28608ac0585e144383 SHA512 d60d293d306227e5ed64d09542476b648df34bdc18e79333e7a64453db48589e84e4c475e7dc30e0a72a4fa6156b67a1059b4d02507af082bbfe80566f2d98aa MISC metadata.xml 502 BLAKE2B cdca87d3e30a985550bf0ae3d922a07670553d360128283d789adbf4584d0d3fa5ae339e52901a8e16c5e1650b6414e5f260aca841957f2ed124e7c437c29a14 SHA512 da4595d0e3dc330fabf03183ae7233323eea087b8e4daeb336d6d2e1ee84156d0639a74b41fe742147477442ab5fef2e51c1cf56e06cdba2647f97f0964bf2cd diff --git a/media-libs/libvisual/libvisual-0.4.2-r1.ebuild b/media-libs/libvisual/libvisual-0.4.2-r1.ebuild index 6102eb3acd91..0403b84fa57f 100644 --- a/media-libs/libvisual/libvisual-0.4.2-r1.ebuild +++ b/media-libs/libvisual/libvisual-0.4.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/Libvisual/libvisual/releases/download/${P}/${P}.tar. LICENSE="LGPL-2.1" SLOT="0.4" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" IUSE="debug nls threads" BDEPEND=" diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest index 983dad4faaf6..46db9ea4aa70 100644 --- a/media-libs/portmidi/Manifest +++ b/media-libs/portmidi/Manifest @@ -1,4 +1,7 @@ -AUX portmidi-234-cmake.patch 13979 BLAKE2B cc6b4193e9008899c89545e2e416c75779d08a6ef100e7a37c21a7c745ac3416c31b044664ba439368c8bb0f3a7fde119343a86d31efe3482c4a88718affdd6d SHA512 b07cd643699084f8e02ffc53d3721a53dd17b421d8ff5b2889a14ab99ff709c14f68b30adc2e7db818cbe7884f93cab8290ff9466ac8616d0db58b3e7aab1f75 +AUX portmidi-0.234-cmake.patch 13979 BLAKE2B cc6b4193e9008899c89545e2e416c75779d08a6ef100e7a37c21a7c745ac3416c31b044664ba439368c8bb0f3a7fde119343a86d31efe3482c4a88718affdd6d SHA512 b07cd643699084f8e02ffc53d3721a53dd17b421d8ff5b2889a14ab99ff709c14f68b30adc2e7db818cbe7884f93cab8290ff9466ac8616d0db58b3e7aab1f75 +AUX portmidi-2.0.4-cmake.patch 303 BLAKE2B e788d88f0ec46a9d326c2ffa3a0da6f828b826018007a0c5fa0c0bebc581dafbd6eeca4914bd24bd2fd30a8b61fda4fcee1e91dac792c5862972b08bddbf5c2f SHA512 103fcf619fcb188631b0b75bf77d9da7879b2d17491018be47d82beee4e5a54aaa86a02a4c0b0b044eba110e16dd08f8f20ca1aad716eb612686d9369cb50964 DIST portmedia-code-r234.zip 1342298 BLAKE2B 3c3686b79ca0c8cbfaa6c44ae8c4f294630e1c5940576709ff1ca5854bfcfba1af7b067471656f2b39ae28cecea9b6c4403f72d5a2552355760c795eff123243 SHA512 cbc332d89bc465450b38245a83cc300dfd2e1e6de7c62284edf754ff4d8a9aa3dc49a395dcee535ed9688befb019186fa87fd6d8a3698898c2acbf3e6b7a0794 -EBUILD portmidi-234-r2.ebuild 2677 BLAKE2B 977b4133be384e470dbd7168f0b26d6b3f167b3291e828eef42e8a09eafed3a2c1e93f46ca955aeaba10c395572792f3525bbe6c9607896af21eadc003392cd5 SHA512 e878a47664b2dcb85f55818303a6170c629d7cc8404322312404095e5d3beffa78acdd94e15c330e1b924681637803a5d5bd4e89f166b12720fee6bbb8ed829b -MISC metadata.xml 437 BLAKE2B 8560766f0e6d8f0484374ed827f14ffddc01cd7ee4df2b75ccf62f6b0f4b804eac1dad8f06931328aac3910b0382c0125ea1bd71aa786bcb674531d88ed85de1 SHA512 a932e03068f3971eb8e40c1f18646652f0fe04a898cb10e9b7156cfe2b712285cf83c247a19cb887aaa2e575bc95ffad58d5fcfbb44d9e8d39f3d7b2d0cadd76 +DIST portmidi-2.0.4.tar.gz 263225 BLAKE2B fd8b002880ccfcff9f233e2fa5021fe4cf9da2f91b3ceaa36fe70f96818e174578f9a14b69bdbb58fab777c9a9e4ff939b86814a403860c7ec264dddc6f26e85 SHA512 d9f22d161e1dd9a4bde1971bb2b6e5352da51545f4fe5ecad11c55e7a535f0d88efce18d1c8fd91e93b70a7926150f86a0f53972ad92370e86556a8dd72dc194 +EBUILD portmidi-0.234.ebuild 2684 BLAKE2B 49312ecab4cf951da2144d964519e888c9a559058472ba40131b8b3b352fa65097a4d86a732c3246be4367ed57c2ecfe20fec5348cf67866f102ce2596093d9d SHA512 d24a52792f1bd38f0eaa60193c4233fa6817a5c02bbd6453de5a446274960795b96d83bcde33f16d7152abad09117294a53bfd3382f926268432ae31a4cf6d7c +EBUILD portmidi-2.0.4.ebuild 1299 BLAKE2B bea7ad7e39c45dc579010c24077f49e031021cec71c8b32128b8e06f1f5cec9a56c5673097eb4c310e7f575e5e58b337cc9b62f7550c35565c80fc7ef8fb09fa SHA512 56f186aef01fed37e181a9aadb410f961ab177185e3dd4c64c774b8cceac9ce5828cfc0610d43cd62351c465e3d3c46f1e8df184c9dc61d1b70b34d687500ad9 +MISC metadata.xml 496 BLAKE2B 5890c7eb551287ad84661a78fbf8a3e3375a795c67aa8232cc69528c2247ef70e46e3cf12efeca8c5e01f02c07a2499250e8329b7bfd7ae56b8304a4a2af0328 SHA512 b879efddcd3197e07d28e51205819f7067ea9c4cec2900b5977c9fdc42510cb1e5edefc53e40152c529e008015943f8a9755a98b24685eead784284da8658e02 diff --git a/media-libs/portmidi/files/portmidi-0.234-cmake.patch b/media-libs/portmidi/files/portmidi-0.234-cmake.patch new file mode 100644 index 000000000000..f4f1101ccb40 --- /dev/null +++ b/media-libs/portmidi/files/portmidi-0.234-cmake.patch @@ -0,0 +1,332 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 4919b78..9dc6e58 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -9,12 +9,11 @@ if(UNIX) + set(CMAKE_BUILD_TYPE Release CACHE STRING + "Semicolon-separate list of supported configuration types") + # set default directories but don't override cached values... +- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} ++ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + CACHE STRING "libraries go here") +- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} ++ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + CACHE STRING "libraries go here") +- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY +- ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} ++ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + CACHE STRING "executables go here") + + else(UNIX) +@@ -68,10 +67,20 @@ endif(UNIX) + include_directories(pm_common porttime) + add_subdirectory(pm_common) + +-add_subdirectory(pm_test) ++option(PORTMIDI_ENABLE_JAVA "Enable Java bindings support" ON) ++option(PORTMIDI_ENABLE_STATIC "Build and install static libraries" OFF) ++option(PORTMIDI_ENABLE_TEST "Build test programs" ON) ++ ++if(PORTMIDI_ENABLE_TEST) ++ add_subdirectory(pm_test) ++endif(PORTMIDI_ENABLE_TEST) + + 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) + +diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt +index cbeeade..92cbe27 100644 +--- a/pm_common/CMakeLists.txt ++++ b/pm_common/CMakeLists.txt +@@ -44,9 +44,6 @@ set(CMAKE_C_FLAGS_RELEASE "${DEFAULT_RELEASE_FLAGS} ${LINUX_FLAGS}" + + # first include the appropriate system-dependent file: + if(UNIX) +- # add the -g switch for Linux and Mac OS X (not used in Win32) +- set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" +- CACHE STRING "enable extra checks for debugging" FORCE) + if(APPLE) + set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault) + prepend_path(LIBSRC ../pm_mac/ ${MACSRC}) +@@ -62,19 +59,23 @@ if(UNIX) + ${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 +89,12 @@ else(UNIX) + # /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 +102,43 @@ else(UNIX) + 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") +-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_STATIC) ++ add_library(portmidi-static ${LIBSRC}) ++ set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi") ++ target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) ++endif(PORTMIDI_ENABLE_STATIC) ++ ++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) ++ if(PORTMIDI_ENABLE_STATIC) ++ INSTALL(TARGETS portmidi-static ++ LIBRARY DESTINATION lib${LIB_SUFFIX} ++ ARCHIVE DESTINATION lib${LIB_SUFFIX}) ++ endif(PORTMIDI_ENABLE_STATIC) ++ 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) +diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt +index f693dd6..c0e1449 100644 +--- a/pm_dylib/CMakeLists.txt ++++ b/pm_dylib/CMakeLists.txt +@@ -39,9 +39,6 @@ set(CMAKE_C_FLAGS_RELEASE "${DEFAULT_RELEASE_FLAGS} ${LINUX_FLAGS}" + + # first include the appropriate system-dependent file: + if(UNIX) +- # add the -g switch for Linux and Mac OS X (not used in Win32) +- set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" +- CACHE STRING "enable extra checks for debugging" FORCE) + if(APPLE) + set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault) + prepend_path(LIBSRC ../pm_mac/ ${MACSRC}) +@@ -63,7 +60,8 @@ if(UNIX) + 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 +73,8 @@ if(UNIX) + # 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 +86,15 @@ else(UNIX) + 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 +103,10 @@ else(UNIX) + # 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 +120,8 @@ target_link_libraries(portmidi-dynamic ${PM_NEEDED_LIBS}) + # 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) +diff --git a/pm_java/CMakeLists.txt b/pm_java/CMakeLists.txt +index 9d79923..9ed2b09 100644 +--- a/pm_java/CMakeLists.txt ++++ b/pm_java/CMakeLists.txt +@@ -5,43 +5,25 @@ if(UNIX) + # java not dealt with in CMake -- see pm_mac/pm_mac.xcodeproj + else(APPLE) + # linux +- set(JPORTMIDICLASS JPortMidi.class JPortMidiException.class +- JPortMidiApi.class) +- set(PMDEFAULTSCLASS PmDefaultsFrame.class PmDefaults.class) +- prepend_path(JPORTMIDICLASS2 jportmidi/ ${JPORTMIDICLASS}) +- prepend_path(PMDEFAULTSCLASS2 pmdefaults/ ${PMDEFAULTSCLASS}) +- set(PMDEFAULTS_ALL_CLASSES ${JPORTMIDICLASS2} ${PMDEFAULTSCLASS2}) +- # message(STATUS "PMDEFAULTS_ALL_CLASSES is " ${PMDEFAULTS_ALL_CLASSES}) +- add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class +- COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java +- MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java +- DEPENDS pmdefaults/PmDefaults.java +- WORKING_DIRECTORY .) +- add_custom_command(OUTPUT pmdefaults/PmDefaults.class +- COMMAND javac -classpath . pmdefaults/PmDefaults.java +- MAIN_DEPENDENCY pmdefaults/PmDefaults.java +- DEPENDS pmdefaults/PmDefaultsFrame.java +- WORKING_DIRECTORY .) +- add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar +- COMMAND cp pmdefaults/portmusic_logo.png . +- COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar +- pmdefaults/*.class portmusic_logo.png jportmidi/*.class +- COMMAND chmod +x pmdefaults/pmdefaults +- COMMAND cp pmdefaults/pmdefaults ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} +- COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} +- COMMAND rm portmusic_logo.png +- MAIN_DEPENDENCY pmdefaults/PmDefaults.class +- DEPENDS ${PMDEFAULTS_ALL_CLASSES} +- WORKING_DIRECTORY .) +- add_custom_target(pmdefaults_target ALL +- DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar) ++ set(JAVA_CLASSES jportmidi pmdefaults) ++ add_custom_command(OUTPUT ${JAVA_CLASSES} ++ COMMAND javac -d ${CMAKE_CURRENT_BINARY_DIR} jportmidi/*.java pmdefaults/*.java ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) ++ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar ++ DEPENDS ${JAVA_CLASSES} ++ COMMAND jar cmf pmdefaults/manifest.txt ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar ++ -C pmdefaults portmusic_logo.png -C ${CMAKE_CURRENT_BINARY_DIR} jportmidi ++ -C ${CMAKE_CURRENT_BINARY_DIR} pmdefaults ++ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) ++ add_custom_target(pmdefaults.jar ALL ++ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar) + # message(STATUS "add_custom_target: pmdefaults.jar") + + # install the libraries (Linux only) +- INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar +- DESTINATION /usr/share/java) +- INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults +- DESTINATION /usr/local/bin) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar ++ DESTINATION ${JAR_INSTALL_DIR}) ++ INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/pmdefaults/pmdefaults ++ DESTINATION bin) + endif(APPLE) + endif(UNIX) + # In windows, use pm_java/make.bat +diff --git a/pm_test/CMakeLists.txt b/pm_test/CMakeLists.txt +index 4fda450..5d683d8 100644 +--- a/pm_test/CMakeLists.txt ++++ b/pm_test/CMakeLists.txt +@@ -10,10 +10,12 @@ if(WIN32) + include(../pm_win/static.cmake) + endif(WIN32) + ++set(CMAKE_SKIP_BUILD_RPATH TRUE) ++ + macro(make_a_test name) + add_executable(${name} ${name}.c) +- target_link_libraries(${name} portmidi-static ${PM_NEEDED_LIBS}) +- add_dependencies(${name} portmidi-static) ++ target_link_libraries(${name} portmidi-dynamic ${PM_NEEDED_LIBS}) ++ add_dependencies(${name} portmidi-dynamic) + endmacro(make_a_test) + + make_a_test(test) diff --git a/media-libs/portmidi/files/portmidi-2.0.4-cmake.patch b/media-libs/portmidi/files/portmidi-2.0.4-cmake.patch new file mode 100644 index 000000000000..ff0257ec64e5 --- /dev/null +++ b/media-libs/portmidi/files/portmidi-2.0.4-cmake.patch @@ -0,0 +1,11 @@ +--- a/pm_test/CMakeLists.txt ++++ b/pm_test/CMakeLists.txt +@@ -6,6 +6,8 @@ if(APPLE) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) + endif(APPLE) + ++set(CMAKE_SKIP_BUILD_RPATH TRUE) ++ + # if(WIN32) + # if(NOT BUILD_SHARED_LIBS) + # /MDd is multithread debug DLL, /MTd is multithread debug diff --git a/media-libs/portmidi/files/portmidi-234-cmake.patch b/media-libs/portmidi/files/portmidi-234-cmake.patch deleted file mode 100644 index f4f1101ccb40..000000000000 --- a/media-libs/portmidi/files/portmidi-234-cmake.patch +++ /dev/null @@ -1,332 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4919b78..9dc6e58 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -9,12 +9,11 @@ if(UNIX) - set(CMAKE_BUILD_TYPE Release CACHE STRING - "Semicolon-separate list of supported configuration types") - # set default directories but don't override cached values... -- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} -+ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - CACHE STRING "libraries go here") -- set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} -+ set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - CACHE STRING "libraries go here") -- set(CMAKE_RUNTIME_OUTPUT_DIRECTORY -- ${CMAKE_CACHEFILE_DIR}/${CMAKE_BUILD_TYPE} -+ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} - CACHE STRING "executables go here") - - else(UNIX) -@@ -68,10 +67,20 @@ endif(UNIX) - include_directories(pm_common porttime) - add_subdirectory(pm_common) - --add_subdirectory(pm_test) -+option(PORTMIDI_ENABLE_JAVA "Enable Java bindings support" ON) -+option(PORTMIDI_ENABLE_STATIC "Build and install static libraries" OFF) -+option(PORTMIDI_ENABLE_TEST "Build test programs" ON) -+ -+if(PORTMIDI_ENABLE_TEST) -+ add_subdirectory(pm_test) -+endif(PORTMIDI_ENABLE_TEST) - - 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) - -diff --git a/pm_common/CMakeLists.txt b/pm_common/CMakeLists.txt -index cbeeade..92cbe27 100644 ---- a/pm_common/CMakeLists.txt -+++ b/pm_common/CMakeLists.txt -@@ -44,9 +44,6 @@ set(CMAKE_C_FLAGS_RELEASE "${DEFAULT_RELEASE_FLAGS} ${LINUX_FLAGS}" - - # first include the appropriate system-dependent file: - if(UNIX) -- # add the -g switch for Linux and Mac OS X (not used in Win32) -- set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" -- CACHE STRING "enable extra checks for debugging" FORCE) - if(APPLE) - set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault) - prepend_path(LIBSRC ../pm_mac/ ${MACSRC}) -@@ -62,19 +59,23 @@ if(UNIX) - ${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 +89,12 @@ else(UNIX) - # /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 +102,43 @@ else(UNIX) - 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") --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_STATIC) -+ add_library(portmidi-static ${LIBSRC}) -+ set_target_properties(portmidi-static PROPERTIES OUTPUT_NAME "portmidi") -+ target_link_libraries(portmidi-static ${PM_NEEDED_LIBS}) -+endif(PORTMIDI_ENABLE_STATIC) -+ -+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) -+ if(PORTMIDI_ENABLE_STATIC) -+ INSTALL(TARGETS portmidi-static -+ LIBRARY DESTINATION lib${LIB_SUFFIX} -+ ARCHIVE DESTINATION lib${LIB_SUFFIX}) -+ endif(PORTMIDI_ENABLE_STATIC) -+ 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) -diff --git a/pm_dylib/CMakeLists.txt b/pm_dylib/CMakeLists.txt -index f693dd6..c0e1449 100644 ---- a/pm_dylib/CMakeLists.txt -+++ b/pm_dylib/CMakeLists.txt -@@ -39,9 +39,6 @@ set(CMAKE_C_FLAGS_RELEASE "${DEFAULT_RELEASE_FLAGS} ${LINUX_FLAGS}" - - # first include the appropriate system-dependent file: - if(UNIX) -- # add the -g switch for Linux and Mac OS X (not used in Win32) -- set (CMAKE_C_FLAGS_DEBUG "-g ${CMAKE_C_FLAGS_DEBUG}" -- CACHE STRING "enable extra checks for debugging" FORCE) - if(APPLE) - set(MACSRC pmmacosxcm pmmac readbinaryplist finddefault) - prepend_path(LIBSRC ../pm_mac/ ${MACSRC}) -@@ -63,7 +60,8 @@ if(UNIX) - 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 +73,8 @@ if(UNIX) - # 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 +86,15 @@ else(UNIX) - 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 +103,10 @@ else(UNIX) - # 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 +120,8 @@ target_link_libraries(portmidi-dynamic ${PM_NEEDED_LIBS}) - # 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) -diff --git a/pm_java/CMakeLists.txt b/pm_java/CMakeLists.txt -index 9d79923..9ed2b09 100644 ---- a/pm_java/CMakeLists.txt -+++ b/pm_java/CMakeLists.txt -@@ -5,43 +5,25 @@ if(UNIX) - # java not dealt with in CMake -- see pm_mac/pm_mac.xcodeproj - else(APPLE) - # linux -- set(JPORTMIDICLASS JPortMidi.class JPortMidiException.class -- JPortMidiApi.class) -- set(PMDEFAULTSCLASS PmDefaultsFrame.class PmDefaults.class) -- prepend_path(JPORTMIDICLASS2 jportmidi/ ${JPORTMIDICLASS}) -- prepend_path(PMDEFAULTSCLASS2 pmdefaults/ ${PMDEFAULTSCLASS}) -- set(PMDEFAULTS_ALL_CLASSES ${JPORTMIDICLASS2} ${PMDEFAULTSCLASS2}) -- # message(STATUS "PMDEFAULTS_ALL_CLASSES is " ${PMDEFAULTS_ALL_CLASSES}) -- add_custom_command(OUTPUT pmdefaults/PmDefaultsFrame.class -- COMMAND javac -classpath . pmdefaults/PmDefaultsFrame.java -- MAIN_DEPENDENCY pmdefaults/PmDefaultsFrame.java -- DEPENDS pmdefaults/PmDefaults.java -- WORKING_DIRECTORY .) -- add_custom_command(OUTPUT pmdefaults/PmDefaults.class -- COMMAND javac -classpath . pmdefaults/PmDefaults.java -- MAIN_DEPENDENCY pmdefaults/PmDefaults.java -- DEPENDS pmdefaults/PmDefaultsFrame.java -- WORKING_DIRECTORY .) -- add_custom_command(OUTPUT ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar -- COMMAND cp pmdefaults/portmusic_logo.png . -- COMMAND jar cmf pmdefaults/manifest.txt pmdefaults.jar -- pmdefaults/*.class portmusic_logo.png jportmidi/*.class -- COMMAND chmod +x pmdefaults/pmdefaults -- COMMAND cp pmdefaults/pmdefaults ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} -- COMMAND mv pmdefaults.jar ${CMAKE_LIBRARY_OUTPUT_DIRECTORY} -- COMMAND rm portmusic_logo.png -- MAIN_DEPENDENCY pmdefaults/PmDefaults.class -- DEPENDS ${PMDEFAULTS_ALL_CLASSES} -- WORKING_DIRECTORY .) -- add_custom_target(pmdefaults_target ALL -- DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar) -+ set(JAVA_CLASSES jportmidi pmdefaults) -+ add_custom_command(OUTPUT ${JAVA_CLASSES} -+ COMMAND javac -d ${CMAKE_CURRENT_BINARY_DIR} jportmidi/*.java pmdefaults/*.java -+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -+ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar -+ DEPENDS ${JAVA_CLASSES} -+ COMMAND jar cmf pmdefaults/manifest.txt ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar -+ -C pmdefaults portmusic_logo.png -C ${CMAKE_CURRENT_BINARY_DIR} jportmidi -+ -C ${CMAKE_CURRENT_BINARY_DIR} pmdefaults -+ WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -+ add_custom_target(pmdefaults.jar ALL -+ DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar) - # message(STATUS "add_custom_target: pmdefaults.jar") - - # install the libraries (Linux only) -- INSTALL(FILES ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar -- DESTINATION /usr/share/java) -- INSTALL(PROGRAMS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults -- DESTINATION /usr/local/bin) -+ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/pmdefaults.jar -+ DESTINATION ${JAR_INSTALL_DIR}) -+ INSTALL(PROGRAMS ${CMAKE_CURRENT_SOURCE_DIR}/pmdefaults/pmdefaults -+ DESTINATION bin) - endif(APPLE) - endif(UNIX) - # In windows, use pm_java/make.bat -diff --git a/pm_test/CMakeLists.txt b/pm_test/CMakeLists.txt -index 4fda450..5d683d8 100644 ---- a/pm_test/CMakeLists.txt -+++ b/pm_test/CMakeLists.txt -@@ -10,10 +10,12 @@ if(WIN32) - include(../pm_win/static.cmake) - endif(WIN32) - -+set(CMAKE_SKIP_BUILD_RPATH TRUE) -+ - macro(make_a_test name) - add_executable(${name} ${name}.c) -- target_link_libraries(${name} portmidi-static ${PM_NEEDED_LIBS}) -- add_dependencies(${name} portmidi-static) -+ target_link_libraries(${name} portmidi-dynamic ${PM_NEEDED_LIBS}) -+ add_dependencies(${name} portmidi-dynamic) - endmacro(make_a_test) - - make_a_test(test) diff --git a/media-libs/portmidi/metadata.xml b/media-libs/portmidi/metadata.xml index 9916b7c55e45..da77e965b00a 100644 --- a/media-libs/portmidi/metadata.xml +++ b/media-libs/portmidi/metadata.xml @@ -10,5 +10,6 @@ portmedia + PortMidi/portmidi diff --git a/media-libs/portmidi/portmidi-0.234.ebuild b/media-libs/portmidi/portmidi-0.234.ebuild new file mode 100644 index 000000000000..95a6697d9a83 --- /dev/null +++ b/media-libs/portmidi/portmidi-0.234.ebuild @@ -0,0 +1,120 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# ninja: error: build.ninja:521: multiple rules generate pm_java/pmdefaults.jar [-w dupbuild=err] +CMAKE_MAKEFILE_GENERATOR="emake" +# Python bindings dropped b/c of bug #855077 +inherit cmake desktop xdg java-pkg-opt-2 + +MY_P="portmedia-code-r$(ver_cut 2)" + +DESCRIPTION="Library for real time MIDI input and output" +HOMEPAGE="http://portmedia.sourceforge.net/" +SRC_URI="mirror://sourceforge/project/portmedia/${MY_P}.zip" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" +IUSE="debug doc java static-libs test-programs" + +BDEPEND=" + app-arch/unzip + doc? ( + app-doc/doxygen + dev-texlive/texlive-fontsrecommended + dev-texlive/texlive-latexextra + virtual/latex-base + ) +" +CDEPEND=" + media-libs/alsa-lib +" +RDEPEND="${CDEPEND} + java? ( >=virtual/jre-1.8:* ) +" +DEPEND=" + ${CDEPEND} + java? ( >=virtual/jdk-1.8:* ) +" + +S="${WORKDIR}/${MY_P}/${PN}/trunk" +MAKEOPTS+=" -j1" + +PATCHES=( + # fix parallel make failures, fix java support, and allow optional + # components like test programs and static libs to be skipped + "${FILESDIR}"/${P}-cmake.patch +) + +pkg_setup() { + use java && java-pkg-opt-2_pkg_setup +} + +src_prepare() { + cmake_src_prepare + + # install wrapper for pmdefaults + if use java ; then + cat > pm_java/pmdefaults/pmdefaults <<-EOF + #!/bin/sh + java -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/" \\ + -jar "${EPREFIX}/usr/share/${PN}/lib/pmdefaults.jar" + EOF + [[ $? -ne 0 ]] && die "cat pmdefaults failed" + fi +} + +src_configure() { + if use debug ; then + CMAKE_BUILD_TYPE=Debug + else + CMAKE_BUILD_TYPE=Release + fi + + local mycmakeargs=( + -DPORTMIDI_ENABLE_JAVA=$(usex java) + -DPORTMIDI_ENABLE_STATIC=$(usex static-libs) + -DPORTMIDI_ENABLE_TEST=$(usex test-programs) + ) + + if use java ; then + mycmakeargs+=(-DJAR_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/lib") + fi + + cmake_src_configure +} + +src_compile() { + cmake_src_compile + + if use doc ; then + doxygen || die "doxygen failed" + pushd latex > /dev/null + VARTEXFONTS="${T}"/fonts emake + popd > /dev/null + fi +} + +src_install() { + cmake_src_install + + dodoc CHANGELOG.txt README.txt pm_linux/README_LINUX.txt + + use doc && dodoc latex/refman.pdf + + if use java ; then + newdoc pm_java/README.txt README_JAVA.txt + newicon pm_java/pmdefaults/pmdefaults-icon.png pmdefaults.png + make_desktop_entry pmdefaults Pmdefaults pmdefaults "AudioVideo;Audio;Midi;" + fi + + if use test-programs ; then + exeinto /usr/$(get_libdir)/${PN} + local app + for app in latency midiclock midithread midithru mm qtest sysex test ; do + doexe "${BUILD_DIR}"/${app} + done + fi +} diff --git a/media-libs/portmidi/portmidi-2.0.4.ebuild b/media-libs/portmidi/portmidi-2.0.4.ebuild new file mode 100644 index 000000000000..65e2026cec65 --- /dev/null +++ b/media-libs/portmidi/portmidi-2.0.4.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="Library for real time MIDI input and output" +HOMEPAGE="https://github.com/PortMidi/portmidi" +SRC_URI="https://github.com/PortMidi/portmidi/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="debug test-programs" +# Per pm-test/README: +# "Because device numbers depend on the system, there is no automated +# script to run all tests on PortMidi." +RESTRICT="test" + +RDEPEND=" + media-libs/alsa-lib +" +DEPEND=" + ${DEPEND} +" +BDEPEND=" + app-arch/unzip +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.0.4-cmake.patch +) + +src_configure() { + if use debug ; then + CMAKE_BUILD_TYPE=Debug + else + CMAKE_BUILD_TYPE=Release + fi + + # Python bindings dropped b/c of bug #855077 + local mycmakeargs=( + -DBUILD_PORTMIDI_TESTS=$(usex test-programs) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + dodoc CHANGELOG.txt README.txt pm_linux/README_LINUX.txt + + if use test-programs ; then + exeinto /usr/$(get_libdir)/${PN} + local app + for app in latency midiclock midithread midithru mm qtest sysex ; do + doexe "${BUILD_DIR}"/pm_test/${app} + done + fi +} diff --git a/media-libs/portmidi/portmidi-234-r2.ebuild b/media-libs/portmidi/portmidi-234-r2.ebuild deleted file mode 100644 index b3506eb45aa3..000000000000 --- a/media-libs/portmidi/portmidi-234-r2.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -# ninja: error: build.ninja:521: multiple rules generate pm_java/pmdefaults.jar [-w dupbuild=err] -CMAKE_MAKEFILE_GENERATOR="emake" -# Python bindings dropped b/c of bug #855077 -inherit cmake desktop xdg java-pkg-opt-2 - -MY_P="portmedia-code-r${PV}" - -DESCRIPTION="Library for real time MIDI input and output" -HOMEPAGE="http://portmedia.sourceforge.net/" -SRC_URI="mirror://sourceforge/project/portmedia/${MY_P}.zip" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86" -IUSE="debug doc java static-libs test-programs" - -BDEPEND=" - app-arch/unzip - doc? ( - app-doc/doxygen - dev-texlive/texlive-fontsrecommended - dev-texlive/texlive-latexextra - virtual/latex-base - ) -" -CDEPEND=" - media-libs/alsa-lib -" -RDEPEND="${CDEPEND} - java? ( >=virtual/jre-1.8:* ) -" -DEPEND=" - ${CDEPEND} - java? ( >=virtual/jdk-1.8:* ) -" - -S="${WORKDIR}/${MY_P}/${PN}/trunk" -MAKEOPTS+=" -j1" - -PATCHES=( - # fix parallel make failures, fix java support, and allow optional - # components like test programs and static libs to be skipped - "${FILESDIR}"/${P}-cmake.patch -) - -pkg_setup() { - use java && java-pkg-opt-2_pkg_setup -} - -src_prepare() { - cmake_src_prepare - - # install wrapper for pmdefaults - if use java ; then - cat > pm_java/pmdefaults/pmdefaults <<-EOF - #!/bin/sh - java -Djava.library.path="${EPREFIX}/usr/$(get_libdir)/" \\ - -jar "${EPREFIX}/usr/share/${PN}/lib/pmdefaults.jar" - EOF - [[ $? -ne 0 ]] && die "cat pmdefaults failed" - fi -} - -src_configure() { - if use debug ; then - CMAKE_BUILD_TYPE=Debug - else - CMAKE_BUILD_TYPE=Release - fi - - local mycmakeargs=( - -DPORTMIDI_ENABLE_JAVA=$(usex java) - -DPORTMIDI_ENABLE_STATIC=$(usex static-libs) - -DPORTMIDI_ENABLE_TEST=$(usex test-programs) - ) - - if use java ; then - mycmakeargs+=(-DJAR_INSTALL_DIR="${EPREFIX}/usr/share/${PN}/lib") - fi - - cmake_src_configure -} - -src_compile() { - cmake_src_compile - - if use doc ; then - doxygen || die "doxygen failed" - pushd latex > /dev/null - VARTEXFONTS="${T}"/fonts emake - popd > /dev/null - fi -} - -src_install() { - cmake_src_install - - dodoc CHANGELOG.txt README.txt pm_linux/README_LINUX.txt - - use doc && dodoc latex/refman.pdf - - if use java ; then - newdoc pm_java/README.txt README_JAVA.txt - newicon pm_java/pmdefaults/pmdefaults-icon.png pmdefaults.png - make_desktop_entry pmdefaults Pmdefaults pmdefaults "AudioVideo;Audio;Midi;" - fi - - if use test-programs ; then - exeinto /usr/$(get_libdir)/${PN} - local app - for app in latency midiclock midithread midithru mm qtest sysex test ; do - doexe "${BUILD_DIR}"/${app} - done - fi -} -- cgit v1.2.3