From 88f75067b0284372b9e711afeb9a504417e7e4ed Mon Sep 17 00:00:00 2001
From: Kevin Mihelich <kevin@archlinuxarm.org>
Date: Tue, 21 Mar 2023 13:07:29 +0000
Subject: [PATCH] extra/portmidi to 2.0.4-1

---
 extra/portmidi/PKGBUILD                     | 63 ++++++++++++---------
 extra/portmidi/pmdefaults.sh                |  5 --
 extra/portmidi/portmidi-217-build-fix.patch | 29 ----------
 3 files changed, 36 insertions(+), 61 deletions(-)
 delete mode 100644 extra/portmidi/pmdefaults.sh
 delete mode 100644 extra/portmidi/portmidi-217-build-fix.patch

diff --git a/extra/portmidi/PKGBUILD b/extra/portmidi/PKGBUILD
index 0cafbd543..901e764cc 100644
--- a/extra/portmidi/PKGBUILD
+++ b/extra/portmidi/PKGBUILD
@@ -5,42 +5,51 @@
 #  - set !makeflags - parallel builds fail
 
 pkgname=portmidi
-pkgver=236
+pkgver=2.0.4
 pkgrel=1
+epoch=1
 pkgdesc="Cross platform library for interfacing with OS MIDI I/O APIs"
-arch=('x86_64')
-url="https://github.com/mixxxdj/portmidi"
-license=('MIT')
-depends=('glibc')
-makedepends=('alsa-lib' 'cmake')
-provides=('libportmidi.so' 'libporttime.so')
-options=('!makeflags')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/mixxxdj/portmidi/archive/refs/tags/${pkgver}.tar.gz")
-sha512sums=('901729440c4b8c654ab17c4c4f1e3986813bf1e4ad1a874f46e7b1ee0c9ef4ee9f1ecfdf71012fb56b055a6185194dd22c520ae87b9f2259c18af5d189ca57da')
-b2sums=('618c3778b8b2170a145ec956cd4721e731cc135d0192e4b1c35b2c93b6b0f0e74085d044beafe2095b3d8e02e1776f442ae174d342c3f391d04a2aab378b547a')
+arch=(x86_64)
+url="https://github.com/portmidi/portmidi"
+license=(MIT)
+options=(!makeflags)
+depends=(
+  glibc
+)
+makedepends=(
+  alsa-lib
+  cmake
+)
+provides=(
+  libportmidi.so
+)
+source=($url/archive/v$pkgver/$pkgname-v$pkgver.tar.gz)
+sha512sums=('d9f22d161e1dd9a4bde1971bb2b6e5352da51545f4fe5ecad11c55e7a535f0d88efce18d1c8fd91e93b70a7926150f86a0f53972ad92370e86556a8dd72dc194')
+b2sums=('fd8b002880ccfcff9f233e2fa5021fe4cf9da2f91b3ceaa36fe70f96818e174578f9a14b69bdbb58fab777c9a9e4ff939b86814a403860c7ec264dddc6f26e85')
 
 build() {
-  cd "${pkgname}-${pkgver}"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE='None' \
-        -DBUILD_TESTING=ON \
-        -Wno-dev \
-        -B build \
-        -S .
-  make VERBOSE=1 -C build
+  local cmake_options=(
+    -B build
+    -D CMAKE_INSTALL_PREFIX=/usr
+    -D CMAKE_BUILD_TYPE=None
+    -S $pkgname-$pkgver
+    -W no-dev
+  )
+
+  cmake "${cmake_options[@]}"
+  cmake --build build --verbose
 }
 
 check() {
-  cd "${pkgname}-${pkgver}"
-  make VERBOSE=1 test -C build
+  ctest --test-dir build --output-on-failure
 }
 
 package() {
-  depends+=('libasound.so')
+  depends+=(
+    alsa-lib libasound.so
+  )
 
-  cd "${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install -C build
-  install -vDm 644 license.txt -t "${pkgdir}/usr/share/licenses/${pkgname}"
-  install -vDm 644 {CHANGELOG,README}.txt \
-    -t "${pkgdir}/usr/share/doc/${pkgname}"
+  DESTDIR="$pkgdir" cmake --install build
+  install -vDm 644 $pkgname-$pkgver/license.txt -t "$pkgdir/usr/share/licenses/$pkgname/"
+  install -vDm 644 $pkgname-$pkgver/{CHANGELOG,README}.txt -t "$pkgdir/usr/share/doc/$pkgname/"
 }
diff --git a/extra/portmidi/pmdefaults.sh b/extra/portmidi/pmdefaults.sh
deleted file mode 100644
index 10fe841ca..000000000
--- a/extra/portmidi/pmdefaults.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-
-export PATH="/usr/lib/jvm/java-13-openjdk/bin/:${PATH}"
-
-java -jar /usr/share/java/pmdefaults.jar > /dev/null
diff --git a/extra/portmidi/portmidi-217-build-fix.patch b/extra/portmidi/portmidi-217-build-fix.patch
deleted file mode 100644
index 3e2dfef29..000000000
--- a/extra/portmidi/portmidi-217-build-fix.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -rup portmidi.orig/pm_java/CMakeLists.txt portmidi/pm_java/CMakeLists.txt
---- portmidi.orig/pm_java/CMakeLists.txt	2009-11-04 16:20:44.000000000 +0100
-+++ portmidi/pm_java/CMakeLists.txt	2012-01-24 21:13:08.513182169 +0100
-@@ -15,13 +15,11 @@ if(UNIX)
-     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)
-+	DEPENDS pmdefaults/PmDefaults.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)
-+	DEPENDS pmdefaults/PmDefaultsFrame.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
-@@ -31,8 +29,7 @@ if(UNIX)
- 	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)
-+	DEPENDS ${PMDEFAULTS_ALL_CLASSES})
-     add_custom_target(pmdefaults_target ALL 
-         DEPENDS ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/pmdefaults.jar)
-     # message(STATUS "add_custom_target: pmdefaults.jar")