* [gentoo-commits] repo/gentoo:master commit in: media-libs/portmidi/files/, media-libs/portmidi/
@ 2021-05-27 19:45 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2021-05-27 19:45 UTC (permalink / raw
To: gentoo-commits
commit: b1c7eb887f1ce331c21a9f069a94148b85aba8cc
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu May 27 19:45:30 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu May 27 19:45:30 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1c7eb88
media-libs/portmidi: removed obsolete 217
Package-Manager: Portage-3.0.19, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-libs/portmidi/Manifest | 1 -
media-libs/portmidi/files/portmidi-217-cmake.patch | 332 ---------------------
media-libs/portmidi/portmidi-217-r3.ebuild | 139 ---------
3 files changed, 472 deletions(-)
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index a00ab02c54e..8bf9b5aa574 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,2 +1 @@
DIST portmedia-code-r234.zip 1342298 BLAKE2B 3c3686b79ca0c8cbfaa6c44ae8c4f294630e1c5940576709ff1ca5854bfcfba1af7b067471656f2b39ae28cecea9b6c4403f72d5a2552355760c795eff123243 SHA512 cbc332d89bc465450b38245a83cc300dfd2e1e6de7c62284edf754ff4d8a9aa3dc49a395dcee535ed9688befb019186fa87fd6d8a3698898c2acbf3e6b7a0794
-DIST portmidi-src-217.zip 1030830 BLAKE2B ab197c7f9a5c2b4d2740d56841459fbac97d510e4d12e5d0cd7cecc0ba6035929b6596140d42c575a9513862a66127d19253dbee1d3a7b7b84b69c88fec7fcae SHA512 d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b
diff --git a/media-libs/portmidi/files/portmidi-217-cmake.patch b/media-libs/portmidi/files/portmidi-217-cmake.patch
deleted file mode 100644
index 7618ee5af95..00000000000
--- a/media-libs/portmidi/files/portmidi-217-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 e171047..d23442d 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 a350620..9cbee1c 100644
---- a/pm_java/CMakeLists.txt
-+++ b/pm_java/CMakeLists.txt
-@@ -5,43 +5,24 @@ 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 pm_java)
-- add_custom_command(OUTPUT pmdefaults/PmDefaults.class
-- COMMAND javac -classpath . pmdefaults/PmDefaults.java
-- MAIN_DEPENDENCY pmdefaults/PmDefaults.java
-- DEPENDS pmdefaults/PmDefaultsFrame.java
-- WORKING_DIRECTORY pm_java)
-- 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 pm_java)
-- add_custom_target(pmdefaults_target ALL
-- DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar)
-- # message(STATUS "add_custom_target: 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)
-
- # 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 b89074b..236ff49 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-217-r3.ebuild b/media-libs/portmidi/portmidi-217-r3.ebuild
deleted file mode 100644
index 403557873b8..00000000000
--- a/media-libs/portmidi/portmidi-217-r3.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-DISTUTILS_OPTIONAL=1
-# ninja: error: build.ninja:521: multiple rules generate pm_java/pmdefaults.jar [-w dupbuild=err]
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake desktop xdg distutils-r1 java-pkg-opt-2 flag-o-matic
-
-DESCRIPTION="Library for real time MIDI input and output"
-HOMEPAGE="http://portmedia.sourceforge.net/"
-SRC_URI="mirror://sourceforge/portmedia/${PN}-src-${PV}.zip"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-IUSE="debug doc java python static-libs test-programs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
- app-arch/unzip
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-latexextra
- virtual/latex-base
- )
- python? ( >=dev-python/cython-0.12.1[${PYTHON_USEDEP}] )
-"
-CDEPEND="
- media-libs/alsa-lib
- python? ( ${PYTHON_DEPS} )
-"
-RDEPEND="${CDEPEND}
- java? ( >=virtual/jre-1.8 )
-"
-DEPEND="
- ${CDEPEND}
- java? ( >=virtual/jdk-1.8 )
-"
-
-S="${WORKDIR}/${PN}"
-
-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
-
- # add include directories and remove references to missing files
- "${FILESDIR}"/${P}-r4-python.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 python ; then
- sed -i -e "/library_dirs=.*linux/s#./linux#${CMAKE_BUILD_DIR}#" pm_python/setup.py || die
- pushd pm_python > /dev/null
- append-ldflags -L"${BUILD_DIR}"
- distutils-r1_src_compile
- popd > /dev/null
- fi
-
- 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 python ; then
- pushd pm_python > /dev/null
- distutils-r1_src_install
- popd > /dev/null
- fi
-
- 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/portmidi/files/, media-libs/portmidi/
@ 2022-07-04 3:29 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2022-07-04 3:29 UTC (permalink / raw
To: gentoo-commits
commit: 157db268985226cf610cc4a7f1de29dfb3463616
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 4 03:28:50 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jul 4 03:28:50 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=157db268
media-libs/portmidi: removed obsolete 234-r1
Bug: https://bugs.gentoo.org/855881
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../portmidi/files/portmidi-217-r4-python.patch | 49 -------
media-libs/portmidi/portmidi-234-r1.ebuild | 142 ---------------------
2 files changed, 191 deletions(-)
diff --git a/media-libs/portmidi/files/portmidi-217-r4-python.patch b/media-libs/portmidi/files/portmidi-217-r4-python.patch
deleted file mode 100644
index 23ef6c3add1e..000000000000
--- a/media-libs/portmidi/files/portmidi-217-r4-python.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-diff -Naur portmidi-a/pm_python/setup.py portmidi-b/pm_python/setup.py
---- portmidi-a/pm_python/setup.py 2010-09-26 15:32:44.000000000 -0400
-+++ portmidi-b/pm_python/setup.py 2020-03-19 12:34:34.398365103 -0400
-@@ -15,12 +15,10 @@
-
-
- DESCRIPTION = open('README_PYTHON.txt').read()
--CHANGES = open('CHANGES.txt').read()
--TODO = open('TODO.txt').read()
-
- EXTRAS = {}
-
--long_description = DESCRIPTION + CHANGES + TODO
-+long_description = DESCRIPTION
- #import sys
- #if "checkdocs" in sys.argv:
- # print long_description
-@@ -142,7 +140,7 @@
-
-
- if sys.platform == 'win32':
-- print "Found Win32 platform"
-+ print("Found Win32 platform")
- EXTENSION = dict(
- ext_modules=[
- Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")],
-@@ -154,7 +152,7 @@
- ]
- )
- elif sys.platform == 'darwin':
-- print "Found darwin (OS X) platform"
-+ print("Found darwin (OS X) platform")
- library_dirs = ["/usr/local/lib"]
- include_dirs = ["/usr/local/include"]
- EXTENSION = dict(
-@@ -169,11 +167,11 @@
- ]
- )
- else:
-- print "Assuming Linux platform"
-+ print("Assuming Linux platform")
- EXTENSION = dict(
- ext_modules=[
- Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")],
-- library_dirs=["./linux"],
-+ include_dirs=["../pm_common", "../porttime"],
- libraries = ["portmidi", "asound", "pthread"]
- )
- ]
diff --git a/media-libs/portmidi/portmidi-234-r1.ebuild b/media-libs/portmidi/portmidi-234-r1.ebuild
deleted file mode 100644
index 61a6c99948e0..000000000000
--- a/media-libs/portmidi/portmidi-234-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..9} )
-DISTUTILS_OPTIONAL=1
-# ninja: error: build.ninja:521: multiple rules generate pm_java/pmdefaults.jar [-w dupbuild=err]
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake desktop xdg distutils-r1 java-pkg-opt-2 flag-o-matic
-
-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 ~mips ppc ppc64 ~riscv sparc x86"
-IUSE="debug doc java python static-libs test-programs"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-BDEPEND="
- app-arch/unzip
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-fontsrecommended
- dev-texlive/texlive-latexextra
- virtual/latex-base
- )
- python? ( dev-python/cython[${PYTHON_USEDEP}] )
-"
-CDEPEND="
- media-libs/alsa-lib
- python? ( ${PYTHON_DEPS} )
-"
-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
-
- # add include directories and remove references to missing files
- "${FILESDIR}"/${PN}-217-r4-python.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 python ; then
- sed -i -e "/library_dirs=.*linux/s#./linux#${CMAKE_BUILD_DIR}#" pm_python/setup.py || die
- pushd pm_python > /dev/null
- append-ldflags -L"${BUILD_DIR}"
- distutils-r1_src_compile
- popd > /dev/null
- fi
-
- 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 python ; then
- pushd pm_python > /dev/null
- distutils-r1_src_install
- popd > /dev/null
- fi
-
- 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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/portmidi/files/, media-libs/portmidi/
@ 2023-04-29 5:46 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-04-29 5:46 UTC (permalink / raw
To: gentoo-commits
commit: 37094a7b51677114b379a524ce9f1c60c7cbba1e
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 29 05:43:19 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 29 05:45:46 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=37094a7b
media-libs/portmidi: reversion old 234 -> 0.234
This is needed because the new upstream version is called 2.0.4. It's unclear
if really we should've called 234 that anyway as it was a subversion revision
I think.
Anyway, it's unfortunate as this will look like a downgrade to users, but it's
not really.
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../files/{portmidi-234-cmake.patch => portmidi-0.234-cmake.patch} | 0
media-libs/portmidi/{portmidi-234-r2.ebuild => portmidi-0.234.ebuild} | 2 +-
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/media-libs/portmidi/files/portmidi-234-cmake.patch b/media-libs/portmidi/files/portmidi-0.234-cmake.patch
similarity index 100%
rename from media-libs/portmidi/files/portmidi-234-cmake.patch
rename to media-libs/portmidi/files/portmidi-0.234-cmake.patch
diff --git a/media-libs/portmidi/portmidi-234-r2.ebuild b/media-libs/portmidi/portmidi-0.234.ebuild
similarity index 98%
rename from media-libs/portmidi/portmidi-234-r2.ebuild
rename to media-libs/portmidi/portmidi-0.234.ebuild
index b3506eb45aa3..95a6697d9a83 100644
--- a/media-libs/portmidi/portmidi-234-r2.ebuild
+++ b/media-libs/portmidi/portmidi-0.234.ebuild
@@ -8,7 +8,7 @@ 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}"
+MY_P="portmedia-code-r$(ver_cut 2)"
DESCRIPTION="Library for real time MIDI input and output"
HOMEPAGE="http://portmedia.sourceforge.net/"
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-libs/portmidi/files/, media-libs/portmidi/
@ 2023-05-30 5:46 Miroslav Šulc
0 siblings, 0 replies; 4+ messages in thread
From: Miroslav Šulc @ 2023-05-30 5:46 UTC (permalink / raw
To: gentoo-commits
commit: a32751f102676c0802e0907909af74c053257caf
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue May 30 05:46:02 2023 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue May 30 05:46:10 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a32751f1
media-libs/portmidi: dropped obsolete 0.234
Bug: https://bugs.gentoo.org/907346
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-libs/portmidi/Manifest | 1 -
.../portmidi/files/portmidi-0.234-cmake.patch | 332 ---------------------
media-libs/portmidi/portmidi-0.234.ebuild | 120 --------
3 files changed, 453 deletions(-)
diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest
index a6b2822dfb2c..f9a7ed3fa46b 100644
--- a/media-libs/portmidi/Manifest
+++ b/media-libs/portmidi/Manifest
@@ -1,2 +1 @@
-DIST portmedia-code-r234.zip 1342298 BLAKE2B 3c3686b79ca0c8cbfaa6c44ae8c4f294630e1c5940576709ff1ca5854bfcfba1af7b067471656f2b39ae28cecea9b6c4403f72d5a2552355760c795eff123243 SHA512 cbc332d89bc465450b38245a83cc300dfd2e1e6de7c62284edf754ff4d8a9aa3dc49a395dcee535ed9688befb019186fa87fd6d8a3698898c2acbf3e6b7a0794
DIST portmidi-2.0.4.tar.gz 263225 BLAKE2B fd8b002880ccfcff9f233e2fa5021fe4cf9da2f91b3ceaa36fe70f96818e174578f9a14b69bdbb58fab777c9a9e4ff939b86814a403860c7ec264dddc6f26e85 SHA512 d9f22d161e1dd9a4bde1971bb2b6e5352da51545f4fe5ecad11c55e7a535f0d88efce18d1c8fd91e93b70a7926150f86a0f53972ad92370e86556a8dd72dc194
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
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-05-30 5:46 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-07-04 3:29 [gentoo-commits] repo/gentoo:master commit in: media-libs/portmidi/files/, media-libs/portmidi/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2023-05-30 5:46 Miroslav Šulc
2023-04-29 5:46 Sam James
2021-05-27 19:45 Miroslav Šulc
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox