[gentoo-commits] repo/gentoo:master commit in: media-libs/portmidi/, media-libs/portmidi/files/
commit: 7f9196dacbbfcfbfcb3744d13f0ff41e2a9b32c1 Author: Sam James gentoo org> AuthorDate: Sat Apr 29 05:38:49 2023 + Commit: Sam James gentoo org> CommitDate: Sat Apr 29 05:45:45 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f9196da media-libs/portmidi: add 2.0.4 Switch to new repo on github (linked to from sourceforge). This is _not_ the Tenacity fork. Drop Java support as it's deprecated upstream. Note that this compares lower than 236 (2.0.4 < 236) but this is a newer version; 234 will be renamed to 0.234 to reflect this. Bug: https://bugs.gentoo.org/810577 Closes: https://bugs.gentoo.org/735170 Closes: https://bugs.gentoo.org/874084 Signed-off-by: Sam James gentoo.org> media-libs/portmidi/Manifest | 1 + .../portmidi/files/portmidi-2.0.4-cmake.patch | 11 +++ media-libs/portmidi/portmidi-2.0.4.ebuild | 82 ++ 3 files changed, 94 insertions(+) diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest index 8bf9b5aa5743..a6b2822dfb2c 100644 --- a/media-libs/portmidi/Manifest +++ b/media-libs/portmidi/Manifest @@ -1 +1,2 @@ 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-2.0.4-cmake.patch b/media-libs/portmidi/files/portmidi-2.0.4-cmake.patch new file mode 100644 index ..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/portmidi-2.0.4.ebuild b/media-libs/portmidi/portmidi-2.0.4.ebuild new file mode 100644 index ..215e567b9bf8 --- /dev/null +++ b/media-libs/portmidi/portmidi-2.0.4.ebuild @@ -0,0 +1,82 @@ +# 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 doc 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 + doc? ( + app-doc/doxygen + dev-texlive/texlive-fontsrecommended + dev-texlive/texlive-latexextra + virtual/latex-base + ) +" + +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_compile() { + cmake_src_compile + + if use doc ; then + doxygen || die "doxygen failed" + + pushd latex > /dev/null || die + VARTEXFONTS="${T}"/fonts emake + popd > /dev/null || die + fi +} + +src_install() { + cmake_src_install + + dodoc CHANGELOG.txt README.txt pm_linux/README_LINUX.txt + + use doc && dodoc latex/refman.pdf + + 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 +}
[gentoo-commits] repo/gentoo:master commit in: media-libs/portmidi/, media-libs/portmidi/files/
commit: 4e793237726619ac042e3b4fb3b417d0e634114f Author: Miroslav Šulc gentoo org> AuthorDate: Fri Apr 30 21:35:30 2021 + Commit: Miroslav Šulc gentoo org> CommitDate: Fri Apr 30 21:35:59 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e793237 media-libs/portmidi: bump to 234 Closes: https://bugs.gentoo.org/785826 Closes: https://bugs.gentoo.org/785823 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Miroslav Šulc gentoo.org> media-libs/portmidi/Manifest | 1 + media-libs/portmidi/files/portmidi-234-cmake.patch | 332 + media-libs/portmidi/portmidi-234.ebuild| 143 + 3 files changed, 476 insertions(+) diff --git a/media-libs/portmidi/Manifest b/media-libs/portmidi/Manifest index 3d588ba18fd..a00ab02c54e 100644 --- a/media-libs/portmidi/Manifest +++ b/media-libs/portmidi/Manifest @@ -1 +1,2 @@ +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-234-cmake.patch b/media-libs/portmidi/files/portmidi-234-cmake.patch new file mode 100644 index 000..f4f1101ccb4 --- /dev/null +++ b/media-libs/portmidi/files/portmidi-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}
[gentoo-commits] repo/gentoo:master commit in: media-libs/portmidi/, media-libs/portmidi/files/
commit: 7f49b9978387b34586265986466bfd48cdc3b26d Author: Rick Farina gentoo org> AuthorDate: Thu Mar 19 16:38:25 2020 + Commit: Rick Farina gentoo org> CommitDate: Thu Mar 19 16:38:33 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7f49b997 media-libs/portmidi: fix bug #706272 Package-Manager: Portage-2.3.94, Repoman-2.3.21 Signed-off-by: Rick Farina gentoo.org> .../portmidi/files/portmidi-217-python.patch | 25 -- ...3-python.patch => portmidi-217-r4-python.patch} | 16 ++ media-libs/portmidi/portmidi-217-r3.ebuild | 5 +++-- 3 files changed, 10 insertions(+), 36 deletions(-) diff --git a/media-libs/portmidi/files/portmidi-217-python.patch b/media-libs/portmidi/files/portmidi-217-python.patch deleted file mode 100644 index 5682c334435..000 --- a/media-libs/portmidi/files/portmidi-217-python.patch +++ /dev/null @@ -1,25 +0,0 @@ portmidi/pm_python/setup.py -+++ portmidi/pm_python/setup.py -@@ -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 -@@ -173,7 +171,8 @@ - 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/files/portmidi-217-r3-python.patch b/media-libs/portmidi/files/portmidi-217-r4-python.patch similarity index 76% rename from media-libs/portmidi/files/portmidi-217-r3-python.patch rename to media-libs/portmidi/files/portmidi-217-r4-python.patch index d4024710fa3..23ef6c3add1 100644 --- a/media-libs/portmidi/files/portmidi-217-r3-python.patch +++ b/media-libs/portmidi/files/portmidi-217-r4-python.patch @@ -1,8 +1,7 @@ -diff --git a/pm_python/setup.py b/pm_python/setup.py -index 14ab1c7..5b1e7c0 100644 a/pm_python/setup.py -+++ b/pm_python/setup.py -@@ -15,12 +15,10 @@ except ImportError: +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.0 -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() @@ -16,7 +15,7 @@ index 14ab1c7..5b1e7c0 100644 #import sys #if "checkdocs" in sys.argv: #print long_description -@@ -142,7 +140,7 @@ PACKAGEDATA.update(EXTRAS) +@@ -142,7 +140,7 @@ if sys.platform == 'win32': @@ -25,7 +24,7 @@ index 14ab1c7..5b1e7c0 100644 EXTENSION = dict( ext_modules=[ Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")], -@@ -154,7 +152,7 @@ if sys.platform == 'win32': +@@ -154,7 +152,7 @@ ] ) elif sys.platform == 'darwin': @@ -34,7 +33,7 @@ index 14ab1c7..5b1e7c0 100644 library_dirs = ["/usr/local/lib"] include_dirs = ["/usr/local/include"] EXTENSION = dict( -@@ -169,11 +167,12 @@ elif sys.platform == 'darwin': +@@ -169,11 +167,11 @@ ] ) else: @@ -44,7 +43,6 @@ index 14ab1c7..5b1e7c0 100644 ext_modules=[ Extension("pyportmidi._pyportmidi", [os.path.join("pyportmidi", "_pyportmidi.pyx")], - library_dirs=["./linux"], -+ library_dirs=["../../portmidi*build"], + include_dirs=["../pm_common", "../porttime"], libraries = ["portmidi", "asound", "pthread"] ) diff --git a/media-libs/portmidi/portmidi-217-r3.ebuild b/media-libs/portmidi/portmidi-217-r3.ebuild index 00f5c069115..eb76338eb2f 100644 --- a/media-libs/portmidi/portmidi-217-r3.ebuild +++ b/media-libs/portmidi/portmidi-217-r3.ebuild @@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{6,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 +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/; @@ -50,7 +50,7 @@ PATCHES=( "${FILESDIR}"/${P}-cmake.patch # add include directories and remove references to missing files - "${FILESDIR}"/${PF}-python.patch + "${FILESDIR}"/${P}-r4-python.patch ) pkg_setup() { @@ -97,6 +97,7 @@ src_compile() { if use python ; then sed -i -e "/library_dirs=.*linux/s#./linux#${CMAKE_BUILD_DIR}#"
[gentoo-commits] repo/gentoo:master commit in: media-libs/portmidi/, media-libs/portmidi/files/
commit: 641331e41b136dfb1d8506a159c2ea45fbd33fc8 Author: Miroslav Šulc gentoo org> AuthorDate: Tue Dec 17 21:05:50 2019 + Commit: Miroslav Šulc gentoo org> CommitDate: Tue Dec 17 21:06:24 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=641331e4 media-libs/portmidi: -r3 python3 1) eapi7 2) dropped python2, added python3 3) organized deps, lifted min java up to 1.8 Closes: https://bugs.gentoo.org/550820 Package-Manager: Portage-2.3.82, Repoman-2.3.20 Signed-off-by: Miroslav Šulc gentoo.org> .../portmidi/files/portmidi-217-r3-python.patch| 50 media-libs/portmidi/portmidi-217-r3.ebuild | 134 + 2 files changed, 184 insertions(+) diff --git a/media-libs/portmidi/files/portmidi-217-r3-python.patch b/media-libs/portmidi/files/portmidi-217-r3-python.patch new file mode 100644 index 000..cfc6b24e948 --- /dev/null +++ b/media-libs/portmidi/files/portmidi-217-r3-python.patch @@ -0,0 +1,50 @@ +diff --git a/pm_python/setup.py b/pm_python/setup.py +index 14ab1c7..5b1e7c0 100644 +--- a/pm_python/setup.py b/pm_python/setup.py +@@ -15,12 +15,10 @@ except ImportError: + + + 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 @@ PACKAGEDATA.update(EXTRAS) + + + 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 @@ if sys.platform == 'win32': + ] + ) + 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,12 @@ elif sys.platform == 'darwin': + ] + ) + 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-217-r3.ebuild b/media-libs/portmidi/portmidi-217-r3.ebuild new file mode 100644 index 000..5205ea8fbf3 --- /dev/null +++ b/media-libs/portmidi/portmidi-217-r3.ebuild @@ -0,0 +1,134 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{6,7,8} ) +DISTUTILS_OPTIONAL=1 +inherit cmake-utils desktop xdg distutils-r1 java-pkg-opt-2 + +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 ~hppa ~ia64 ~mips ~ppc ~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 + ) + java? ( >=virtual/jdk-1.8 ) + 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}" + +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}"/${PF}-python.patch +) + +pkg_setup() { + use java && java-pkg-opt-2_pkg_setup +} + +src_prepare() { + cmake-utils_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 + +