diff --git a/media-libs/portmidi/portmidi-2.0.4.recipe b/media-libs/portmidi/portmidi-2.0.4.recipe index 15c7ed12e..8a0745e61 100644 --- a/media-libs/portmidi/portmidi-2.0.4.recipe +++ b/media-libs/portmidi/portmidi-2.0.4.recipe @@ -4,7 +4,7 @@ HOMEPAGE="https://github.com/PortMidi/portmidi" COPYRIGHT="1999-2000 Ross Bencina and Phil Burk 2001-2009 Roger B. Dannenberg" LICENSE="MIT" -REVISION="1" +REVISION="2" SOURCE_URI="https://github.com/PortMidi/portmidi/archive/refs/tags/v$portVersion.tar.gz" CHECKSUM_SHA256="64893e823ae146cabd3ad7f9a9a9c5332746abe7847c557b99b2577afa8a607c" SOURCE_DIR="portmidi-$portVersion" @@ -13,11 +13,13 @@ ADDITIONAL_FILES="pmdefaults.rdef.in" ARCHITECTURES="all" SECONDARY_ARCHITECTURES="x86" -portVersionCompat="$portVersion compat >= ${portVersion%%.*}" +# This uses the wrong libVersion from upstream - change this back to $portVersion when fixed +libVersion="2.0.3" +libVersionCompat="$libVersion compat >= ${libVersion%%.*}" PROVIDES=" portmidi$secondaryArchSuffix = $portVersion - lib:libportmidi$secondaryArchSuffix = $portVersionCompat + lib:libportmidi$secondaryArchSuffix = $libVersionCompat " REQUIRES=" haiku${secondaryArchSuffix} @@ -25,7 +27,7 @@ REQUIRES=" PROVIDES_devel=" portmidi${secondaryArchSuffix}_devel = $portVersion - devel:libportmidi$secondaryArchSuffix = $portVersionCompat + devel:libportmidi$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel=" portmidi$secondaryArchSuffix == $portVersion base @@ -70,7 +72,7 @@ BUILD_PREREQUIRES=" # (it would build but fail at runtime with an "UnsatisfiedLinkError: missing library") if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then PROVIDES_devel+=" - devel:libpmjni$secondaryArchSuffix = $portVersionCompat + devel:libpmjni$secondaryArchSuffix = $libVersionCompat " REQUIRES_devel+=" portmidi${secondaryArchSuffix}_java == $portVersion @@ -79,20 +81,20 @@ if [ "$effectiveTargetArchitecture" != x86_gcc2 ]; then SUMMARY_java="Cross-Platform MIDI IO (Java bindings)" PROVIDES_java=" portmidi${secondaryArchSuffix}_java = $portVersion - lib:libpmjni$secondaryArchSuffix = $portVersionCompat + lib:libpmjni$secondaryArchSuffix = $libVersionCompat " REQUIRES_java=" haiku$secondaryArchSuffix portmidi$secondaryArchSuffix == $portVersion base - java:runtime == 11 + java:runtime >= 17 " BUILD_REQUIRES+=" - java:environment == 11 + java:environment >= 17 " BUILD_PREREQUIRES+=" - cmd:javac >= 11 + cmd:javac >= 17 " fi