[arch-commits] Commit in rtmidi/trunk (3 files)

[David Runge]

    Date: Thursday, April 18, 2019 @ 16:53:36
  Author: dvzrv
Revision: 451992

upgpkg: rtmidi 4.0.0-1

Upgrading to 4.0.0. Removing now unneeded patches.

Modified:
  rtmidi/trunk/PKGBUILD
Deleted:
  rtmidi/trunk/0001-fix-tests-with-prefix.diff
  rtmidi/trunk/0002-fix-jack-requirement.diff

---------------------------------+
 0001-fix-tests-with-prefix.diff |   10 ----------
 0002-fix-jack-requirement.diff  |   14 --------------
 PKGBUILD                        |   38 +++++++++++++++-----------------------
 3 files changed, 15 insertions(+), 47 deletions(-)

Deleted: 0001-fix-tests-with-prefix.diff
===================================================================
--- 0001-fix-tests-with-prefix.diff	2019-04-18 14:56:01 UTC (rev 451991)
+++ 0001-fix-tests-with-prefix.diff	2019-04-18 16:53:36 UTC (rev 451992)
@@ -1,10 +0,0 @@
---- a/rtmidi-3.0.0/configure.ac	2017-08-31 17:10:07.000000000 -0700
-+++ b/rtmidi-3.0.0/configure.ac	2017-09-28 19:19:37.515888982 -0700
-@@ -77,7 +77,6 @@
- # Set paths if prefix is defined
- if test "x$prefix" != "x" && test "x$prefix" != "xNONE"; then
-   LIBS="$LIBS -L$prefix/lib"
--  CPPFLAGS="$CPPFLAGS -I$prefix/include/rtmidi"
- fi
- 
- # For -I and -D flags

Deleted: 0002-fix-jack-requirement.diff
===================================================================
--- 0002-fix-jack-requirement.diff	2019-04-18 14:56:01 UTC (rev 451991)
+++ 0002-fix-jack-requirement.diff	2019-04-18 16:53:36 UTC (rev 451992)
@@ -1,14 +0,0 @@
-diff -ruN rtmidi-3.0.0-a/configure.ac rtmidi-3.0.0-b/configure.ac
---- rtmidi-3.0.0-a/configure.ac	2017-09-01 02:10:07.000000000 +0200
-+++ rtmidi-3.0.0-b/configure.ac	2018-01-31 21:51:28.870760324 +0100
-@@ -116,7 +116,9 @@
- AS_IF([test "x$with_jack" == "xyes"], [
- api="$api -D__UNIX_JACK__"
- AC_MSG_RESULT(using JACK)
--AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))])
-+AC_CHECK_LIB(jack, jack_client_open, , AC_MSG_ERROR(JACK support requires the jack library!))
-+req="$req jack"
-+])
- 
- case $host in
-   *-*-linux*)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-18 14:56:01 UTC (rev 451991)
+++ PKGBUILD	2019-04-18 16:53:36 UTC (rev 451992)
@@ -4,8 +4,8 @@
 # Contributor: speps <speps at aur dot archlinux dot org> 
 
 pkgname=rtmidi
-pkgver=3.0.0
-pkgrel=6
+pkgver=4.0.0
+pkgrel=1
 pkgdesc="A set of C++ classes that provides a common API for realtime MIDI input/output."
 arch=('x86_64')
 url="https://www.music.mcgill.ca/~gary/rtmidi/"
@@ -12,25 +12,19 @@
 license=('custom:MIT')
 depends=('jack')
 makedepends=('doxygen')
-source=("${pkgname}-${pkgver}.tar.gz::https://github.com/thestk/${pkgname}/archive/v${pkgver}.tar.gz"
-        '0001-fix-tests-with-prefix.diff'
-        '0002-fix-jack-requirement.diff')
-sha512sums=('8975a63e7be9102af70401cef48c702597b87efe2d8fa30a978fe280e26da1dfa90d6f30cfbd3df587462f0dd085d0f29e1c014e67d7fcd3a36960b6bcfb3e55'
-            'cab71dd641eaa3c7fa3c83b81fb4517bcf455a6037e103c29edbc2d540feed1b4fc0e5e3f9ea5f03845c98c8246cbb9bd12d1cf1f16c4bcbb2c0e874bd66674a'
-            '4cd4f49a639688736fef3ebea84f5ca05aef54c85b83713e9aa9ae5467c871e7edda7272279e8f2e131e3e70cc9aa394bab4e157be9521f41d1811c90a66b357')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/thestk/${pkgname}/archive/${pkgver}.tar.gz")
+sha512sums=('39383f121320c9471b31f8b9d283167bfadf4c7328b6664d1d54a4c52e3dd9b76362875258d90363c6044e87fcee31ccce80e19435dc620c88e6d60fc82d0f9d')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
-  # https://github.com/thestk/rtmidi/pull/127
-  patch -Np2 -i "${srcdir}/0001-fix-tests-with-prefix.diff"
-  # https://github.com/thestk/rtmidi/issues/154
-  patch -Np1 -i "${srcdir}/0002-fix-jack-requirement.diff"
   autoreconf -fi
 }
 
 build() {
   cd "${pkgname}-${pkgver}"
-  ./configure --prefix=/usr --with-alsa --with-jack
+  ./configure --prefix=/usr \
+              --with-alsa \
+              --with-jack
   make
 }
 
@@ -37,19 +31,17 @@
 package() {
   cd "${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
-
   # docs
   install -t "${pkgdir}/usr/share/doc/${pkgname}" \
-    -vDm644 {README.md,doc/release.txt}
-
+    -vDm 644 {README.md,doc/release.txt}
   # html
-  install -t "${pkgdir}/usr/share/doc/${pkgname}/html" \
-    -vDm644 doc/html/*
-  install -t "${pkgdir}/usr/share/doc/${pkgname}/images" \
-    -vDm644 doc/images/*
-
-  # license
+  install -vDm 644 doc/html/* \
+    -t "${pkgdir}/usr/share/doc/${pkgname}/html"
+  install -vDm 644 doc/images/* \
+    -t "${pkgdir}/usr/share/doc/${pkgname}/images"
+  # license in README.md:
+  # https://github.com/thestk/rtmidi/issues/198
   csplit -s README.md "%Legal and%"
-  install -vDm644 xx00 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -vDm 644 xx00 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }