summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2023-05-30 09:20:33 +0100
committerV3n3RiX <venerix@koprulu.sector>2023-05-30 09:20:33 +0100
commit70e4bd5c8f26b1f2baeb5146a841273b2cb15179 (patch)
tree82c39dda2ba79ec0993746bf42651c18a4beb137 /media-libs
parent37c470b10802509995e7ae6a6886506f79540dd8 (diff)
gentoo auto-resync : 30:05:2023 - 09:20:33
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin68281 -> 68282 bytes
-rw-r--r--media-libs/libmtp/Manifest2
-rw-r--r--media-libs/libmtp/libmtp-1.1.20.ebuild91
-rw-r--r--media-libs/portmidi/Manifest3
-rw-r--r--media-libs/portmidi/files/portmidi-0.234-cmake.patch332
-rw-r--r--media-libs/portmidi/portmidi-0.234.ebuild120
6 files changed, 0 insertions, 548 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index bddd0c6f12e6..f7999599268c 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest
index 91af9c67b5d9..1798d21de256 100644
--- a/media-libs/libmtp/Manifest
+++ b/media-libs/libmtp/Manifest
@@ -1,7 +1,5 @@
AUX libmtp-1.1.19-fix-docdir.patch 462 BLAKE2B 5c23a2b98a138fb6bc51d49c07d556cff17357ce604cc7e11bf652e180d560cfc1befb2957629a5bb9e46876721fa62d186dd7e0a4dc0e95b74f41a3d5620f9c SHA512 50e15c26fe110d551c350ec11e9fc2309f8dfb26039e824e7d59aa1e5b5250e012397ed30278578524eb579132b0206fae8d5c40f387dd71b93ac7fc261ac2e7
-DIST libmtp-1.1.20.tar.gz 860941 BLAKE2B f30dddf6fb2b4c17e7792412787f65d369f811741e64a77b781a50e70161f0047e53c7e9d9e70621f98482d6fd430c71bd46188df894ef76109c9cb3d9c02f19 SHA512 d0892909eb9b001b727690b991c7effd8c4b78054ba07d06e060979ff2fd78d0d6303d46906d3bc86e4edba6f8a8d3c970eb875372f572ed84019bc717f74018
DIST libmtp-1.1.21.tar.gz 862703 BLAKE2B c6067d0e9c7e2410b950715d1f02243c835afacfb3eef2f250361d4075d378b2754dceadf5120c9a646413ea826f42291c530590861420f56140458558dccc8e SHA512 510f01f75de37a07c8ce54957a8fb74724538a7cfbdf1a86c201fda68573ef23fa578ff7baf2d9df938703b5776ded4ab1057c617125f3539e594bb5a1f3146f
-EBUILD libmtp-1.1.20.ebuild 1919 BLAKE2B 987f14665aeed026a6b06a4e59f39327b6dab5ff47122281d5c6cf7c4d03e24874b54154612c0b86727553441605a78ad1c392baadaa96c9423b4dc23350ece9 SHA512 6befe7987890738fb24b8c0846bb5243e73ef3159f5446765cd08216186fe1fa7ec00fed18c2dc1679a8eb0ab2905ba74694cf64d020e81a13ff4817d2975204
EBUILD libmtp-1.1.21.ebuild 1919 BLAKE2B bb1995aae20277ff527d22420911901e09cc3b4899777b027ddbaa5fa6e41148f7f674f3f67119bd265b61f767dd0654a80d78c2ce426634b9d24b94a2f10640 SHA512 d1f145278cdfc26e6b1f79cb9580558d0267d24acffa53951173e9481fbaa9544b26c754dcdfdb9d611b8eb07446c5632d5d2bbc5190fe79cb913325777c6965
EBUILD libmtp-9999.ebuild 1859 BLAKE2B d6c4d0516b3028951494178b3823090a56e03b1777871134a3b6152709ebf6c00e0e6caee12d38a00453245402ce5499ee7b568880195f6cf45256bd76255e3c SHA512 f102aba2ae7d1b10997dd3dc2676f1463b5dd14890fe74796c4490524acd6d706a2cb3709f876c2ffb3e035a9599a027ca2b76519c61663185bef663f00a6f0f
MISC metadata.xml 448 BLAKE2B 4470bd44e384c19a8b2d1f75adfabecb196c26de90006c0929ac3598a8589759749b9f976a55b97ff124f65c405709c6dc83de9fbedfd3de73ff1a0f7ff9f4df SHA512 578112f8279c9b2497323891dbed49f025905004ca24f53f5cc2e62503861add2f0322886ba0762742939388dce7015825f3a69bcd48a41f96c0e7cfbc7e90be
diff --git a/media-libs/libmtp/libmtp-1.1.20.ebuild b/media-libs/libmtp/libmtp-1.1.20.ebuild
deleted file mode 100644
index 8649a60fd3f0..000000000000
--- a/media-libs/libmtp/libmtp-1.1.20.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit udev
-
-if [[ ${PV} == 9999* ]]; then
- EGIT_REPO_URI="https://git.code.sf.net/p/${PN}/code"
- inherit autotools git-r3
-else
- inherit libtool
- SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
- KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv x86"
-fi
-
-DESCRIPTION="Implementation of Microsoft's Media Transfer Protocol (MTP)"
-HOMEPAGE="http://libmtp.sourceforge.net/"
-
-LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ?
-SLOT="0/9" # Based on SONAME of libmtp shared library
-IUSE="+crypt doc examples static-libs"
-
-RDEPEND="
- acct-group/plugdev
- virtual/libiconv
- virtual/libusb:1
- crypt? ( dev-libs/libgcrypt:0= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-DOCS=( AUTHORS README TODO )
-
-PATCHES=(
- "${FILESDIR}/${PN}-1.1.19-fix-docdir.patch"
-)
-
-src_prepare() {
- default
-
- # ChangeLog says "RETIRING THIS FILE ..pause.. GIT" (Last entry from start of 2011)
- rm ChangeLog || die
-
- if [[ ${PV} == 9999* ]]; then
- if [[ -e /usr/share/gettext/config.rpath ]]; then
- cp /usr/share/gettext/config.rpath . || die
- else
- touch config.rpath || die # This is from upstream autogen.sh
- fi
- eautoreconf
- else
- # Needed to fix -fuse-ld=* filtering (e.g. lld)
- # Can drop this once copyright year in libtool file included
- # says >= 2021 (was 2014 at time of writing).
- elibtoolize
- fi
-}
-
-src_configure() {
- local myeconfargs=(
- $(use_enable crypt mtpz)
- $(use_enable doc doxygen)
- $(use_enable static-libs static)
- --with-udev="$(get_udevdir)"
- --with-udev-group=plugdev
- --with-udev-mode=0660
- )
-
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${ED}" -name "*.la" -delete || die
-
- if use examples; then
- docinto examples
- dodoc examples/*.{c,h,sh}
- fi
-}
-
-pkg_postinst() {
- udev_reload
-}
-
-pkg_postrm() {
- udev_reload
-}
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index 57d63002cd66..f969d8e08fe9 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,7 +1,4 @@
-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
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 1292 BLAKE2B 9dcd13148524ad34c57ba6aad827efb0db788d81b4a9f94f2fae485dbc7cc626bf2367c182fac4d47e765ffa28c75644b9bb4a62c699a87c09297755cfb371b8 SHA512 fda48db2cd1360e13d67c32cbee8519d8712b7412d21d357eec83311ad5cf4957d627784414d8e6d618d159b0144b21032faaf5fa79fb78c565b7eb19daf8191
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
deleted file mode 100644
index f4f1101ccb40..000000000000
--- a/media-libs/portmidi/files/portmidi-0.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/portmidi-0.234.ebuild b/media-libs/portmidi/portmidi-0.234.ebuild
deleted file mode 100644
index 95a6697d9a83..000000000000
--- a/media-libs/portmidi/portmidi-0.234.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$(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
-}