git » portmidi.git » commit 9641533

Switching to current openjdk (13). Minor cleanups.

author David Runge
2019-12-08 19:35:40 UTC
committer David Runge
2019-12-08 19:35:40 UTC
parent c6f8e7af936bb3d7828b3a87742da2c6b5fe93c9

Switching to current openjdk (13). Minor cleanups.

PKGBUILD +8 -6
pmdefaults.sh +2 -2

diff --git a/PKGBUILD b/PKGBUILD
index ef1cccd..a379371 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,23 @@
-# Maintainer: David Runge <dave@sleepmap.de>
+# Maintainer: David Runge <dvzrv@archlinux.org>
 # Contributor: Eric BĂ©langer <eric@archlinux.org>
 
 pkgname=portmidi
 pkgver=217
-pkgrel=8
+pkgrel=9
 pkgdesc="Platform independent library for real-time MIDI input/output"
 arch=('x86_64')
 url="http://portmedia.sourceforge.net/"
 license=('MIT')
 depends=('alsa-lib')
-makedepends=('cmake' 'java-environment=12')
-optdepends=('java-runtime=12: for using pmdefaults'
+makedepends=('cmake' 'java-environment=13')
+optdepends=('java-runtime=13: for using pmdefaults'
             'sh: for using pmdefaults')
 provides=('libpmjni.so' 'libportmidi.so' 'libporttime.so')
 source=("https://downloads.sourceforge.net/project/portmedia/${pkgname}/${pkgver}/${pkgname}-src-${pkgver}.zip"
         'pmdefaults.sh'
         'portmidi-217-build-fix.patch')
 sha512sums=('d08d4d57429d26d292b5fe6868b7c7a32f2f1d2428f6695cd403a697e2d91629bd4380242ab2720e8f21c895bb75cb56b709fb663a20e8e623120e50bfc5d90b'
-            '83e2f93b084d2068980947f399b44efd02efd6d466b604b1f9ea3c0ba8e1abd90108efff3648992d63c0f710f816933c03953a4a2930050c8627cce14cbc7ad3'
+            '4f9bd7f2f3bc31f989c8981b6e32dab8371f6365fbc98f728bc0881a0433220529296ec364a7c5a53ee61dc3f09bb6ec057f7a6385d9fbc79bf1419bea87848d'
             '643d249d53780519c9773c88974a34127ba64982ed75d2d0f55e99faf3bb7c8c97ba185412e70794319c8253de659b8658de95a8eb6fbfa3648c1be384bafbc1')
 
 prepare() {
@@ -49,9 +49,11 @@ package() {
   install -vDm 755 ../pmdefaults.sh "${pkgdir}/usr/bin/pmdefaults"
 
   # Fix missing symlink for libporttime.so (FS#21528).
-  ln -s libportmidi.so "${pkgdir}/usr/lib/libporttime.so"
+  ln -sv libportmidi.so "${pkgdir}/usr/lib/libporttime.so"
 
   install -vDm 644 license.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
   install -vDm 644 {CHANGELOG,README}.txt \
     -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -vDm 644 pm_java/README.txt \
+    "${pkgdir}/usr/share/doc/${pkgname}/README_JAVA.txt"
 }
diff --git a/pmdefaults.sh b/pmdefaults.sh
index ba9a5b6..10fe841 100644
--- a/pmdefaults.sh
+++ b/pmdefaults.sh
@@ -1,5 +1,5 @@
-#!/bin/sh
+#!/usr/bin/env sh
 
-export PATH="/usr/lib/jvm/java-12-openjdk/bin/:${PATH}"
+export PATH="/usr/lib/jvm/java-13-openjdk/bin/:${PATH}"
 
 java -jar /usr/share/java/pmdefaults.jar > /dev/null