[PR PATCH] a2jmidid: update to 9

[PR PATCH] a2jmidid: update to 9

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 351 bytes --]

There is a new pull request by newbluemoon against master on the void-packages repository

https://github.com/newbluemoon/void-packages a2jmidid
https://github.com/void-linux/void-packages/pull/15643

a2jmidid: update to 9
Tested on x86_64, works as expected.

A patch file from https://github.com/void-linux/void-packages/pull/15643.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-a2jmidid-15643.patch --]
[-- Type: text/x-diff, Size: 4864 bytes --]

From 5b78915ad139b51276a4dc028b32034beb9f0869 Mon Sep 17 00:00:00 2001
From: newbluemoon <blaumolch@mailbox.org>
Date: Sun, 20 Oct 2019 15:34:52 +0200
Subject: [PATCH] a2jmidid: update to 9

---
 .../patches/a2jmidid-dso-pthread.patch        | 19 -----------------
 srcpkgs/a2jmidid/patches/aarch64.patch        | 11 ----------
 srcpkgs/a2jmidid/patches/ppc64.patch          | 18 ----------------
 srcpkgs/a2jmidid/template                     | 21 +++++++------------
 4 files changed, 8 insertions(+), 61 deletions(-)
 delete mode 100644 srcpkgs/a2jmidid/patches/a2jmidid-dso-pthread.patch
 delete mode 100644 srcpkgs/a2jmidid/patches/aarch64.patch
 delete mode 100644 srcpkgs/a2jmidid/patches/ppc64.patch

diff --git a/srcpkgs/a2jmidid/patches/a2jmidid-dso-pthread.patch b/srcpkgs/a2jmidid/patches/a2jmidid-dso-pthread.patch
deleted file mode 100644
index eee2d6c4971..00000000000
--- a/srcpkgs/a2jmidid/patches/a2jmidid-dso-pthread.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- wscript	2012-07-05 03:14:23.000000000 +0200
-+++ wscript	2012-07-10 17:48:30.710109306 +0200
-@@ -67,6 +67,7 @@
-         conf.env['DBUS_ENABLED'] = False
- 
-     conf.env['LIB_DL'] = ['dl']
-+    conf.env['LIB_PTHREAD'] = ['pthread']
- 
-     #conf.check_header('expat.h', mandatory=True)
-     #conf.env['LIB_EXPAT'] = ['expat']
-@@ -152,7 +153,7 @@
- 
-     prog.includes = '.' # make waf dependency tracking work
-     prog.target = 'a2jmidid'
--    prog.uselib = 'ALSA JACK DL'
-+    prog.uselib = 'ALSA JACK DL PTHREAD'
-     if bld.env()['DBUS_ENABLED']:
-         prog.uselib += " DBUS-1"
-     prog = bld.create_obj('cc', 'program')
diff --git a/srcpkgs/a2jmidid/patches/aarch64.patch b/srcpkgs/a2jmidid/patches/aarch64.patch
deleted file mode 100644
index 3ea53246893..00000000000
--- a/srcpkgs/a2jmidid/patches/aarch64.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sigsegv.c.bak       2017-10-21 17:18:59.382041554 +0200
-+++ sigsegv.c   2017-10-21 17:19:03.662041717 +0200
-@@ -93,7 +93,7 @@
-     a2j_error("info.si_errno = %d", info->si_errno);
-     a2j_error("info.si_code  = %d (%s)", info->si_code, si_codes[info->si_code]);
-     a2j_error("info.si_addr  = %p", info->si_addr);
--#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__)
-+#if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__) && !defined(__aarch64__)
-     for(i = 0; i < NGREG; i++)
-         a2j_error("reg[%02d]       = 0x" REGFORMAT, i,
- #if defined(__powerpc__)
diff --git a/srcpkgs/a2jmidid/patches/ppc64.patch b/srcpkgs/a2jmidid/patches/ppc64.patch
deleted file mode 100644
index fea5fdcc3f4..00000000000
--- a/srcpkgs/a2jmidid/patches/ppc64.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Following the same variable and struct usage within sys header
- file ucontext.h to cover powerpc 64 bit archs.
-Author: Fernando Seiti Furusato <ferseiti@br.ibm.com>
---- sigsegv.c
-+++ sigsegv.c
-@@ -94,8 +94,11 @@ static void signal_segv(int signum, sigi
- #if !defined(__alpha__) && !defined(__ia64__) && !defined(__FreeBSD_kernel__) && !defined(__arm__) && !defined(__hppa__) && !defined(__sh__)
-     for(i = 0; i < NGREG; i++)
-         a2j_error("reg[%02d]       = 0x" REGFORMAT, i,
--#if defined(__powerpc__)
-+#if defined(__powerpc__) && !defined(__powerpc64__)
-                 ucontext->uc_mcontext.uc_regs[i]
-+/* just following the variable type and member logic as the ones used here to cover ppc64*/
-+#elif defined(__powerpc64__)
-+                ucontext->uc_mcontext.gp_regs[i]
- #elif defined(__sparc__) && defined(__arch64__)
-                 ucontext->uc_mcontext.mc_gregs[i]
- #else
diff --git a/srcpkgs/a2jmidid/template b/srcpkgs/a2jmidid/template
index 0f5e7a72fd2..b39aa31eef1 100644
--- a/srcpkgs/a2jmidid/template
+++ b/srcpkgs/a2jmidid/template
@@ -1,18 +1,13 @@
 # Template file for 'a2jmidid'
 pkgname=a2jmidid
-version=8
-revision=8
-wrksrc="a2jmidid-8~dfsg0"
-build_style=waf
+version=9
+revision=1
+build_style=meson
 hostmakedepends="pkg-config"
 makedepends="alsa-lib-devel jack-devel dbus-devel"
-short_desc="Daemon for exposing legacy ALSA sequencer apps to JACK MIDI"
+short_desc="ALSA sequencer to JACK MIDI bridging (for jack2)"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2"
-homepage="http://home.gna.org/a2jmidid/"
-distfiles="${DEBIAN_SITE}/main/a/a2jmidid/a2jmidid_${version}~dfsg0.orig.tar.bz2"
-checksum=32379bd4ee73e3d4896f82f4477d3d4a340eff92558d2d0c85b5b5026675ff42
-
-do_configure() {
-	python2 waf configure --prefix=/usr
-}
+license="GPL-2.0-or-later"
+homepage="https://github.com/linuxaudio/a2jmidid/"
+distfiles="https://github.com/linuxaudio/a2jmidid/archive/${version}.tar.gz"
+checksum=2828d283e0c9a65f0683881f09676c8c35c45c97a8a56cf77b43b4ef0231df06

Re: [PR PATCH] [Merged]: a2jmidid: update to 9

[voidlinux-github]

[-- Attachment #1: Type: text/plain, Size: 257 bytes --]

There's a merged pull request on the void-packages repository

a2jmidid: update to 9
https://github.com/void-linux/void-packages/pull/15643

Description:
Tested on x86_64, works as expected.

P.S.: Patches for aarch64 and powerpc64 were applied upstream.