From f7a7c5579fdf7bca0905162c3ef664857814b410 Mon Sep 17 00:00:00 2001 From: Andreas Grapentin Date: Sun, 21 Jan 2018 13:30:55 +0100 Subject: pcr/rtmidi: updated to 3.0.0 --- pcr/rtmidi/0001-fix-tests-with-prefix.diff | 20 ++++++++++++ pcr/rtmidi/PKGBUILD | 52 +++++++++++++----------------- 2 files changed, 43 insertions(+), 29 deletions(-) create mode 100644 pcr/rtmidi/0001-fix-tests-with-prefix.diff diff --git a/pcr/rtmidi/0001-fix-tests-with-prefix.diff b/pcr/rtmidi/0001-fix-tests-with-prefix.diff new file mode 100644 index 000000000..973043e4c --- /dev/null +++ b/pcr/rtmidi/0001-fix-tests-with-prefix.diff @@ -0,0 +1,20 @@ +--- a/rtmidi-3.0.0/configure 2017-08-31 18:53:21.000000000 -0700 ++++ b/rtmidi-3.0.0/configure 2017-09-28 19:18:37.512786478 -0700 +@@ -16625,7 +16625,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 +--- 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 diff --git a/pcr/rtmidi/PKGBUILD b/pcr/rtmidi/PKGBUILD index a61afa20a..8607ddc57 100644 --- a/pcr/rtmidi/PKGBUILD +++ b/pcr/rtmidi/PKGBUILD @@ -1,48 +1,42 @@ -# Maintainer (Arch): Llewelyn Trahaearn -# Contributor (Arch): rtfreedman -# Contributor (Arch): speps +# Maintainer (AUR): Llewelyn Trahaearn +# Contributor (AUR): rtfreedman +# Contributor (AUR): speps + +# parabola changes and rationale: +# no changes. pkgname=rtmidi -pkgver=2.1.0 -pkgrel=3 +pkgver=3.0.0 +pkgrel=1 pkgdesc="A set of C++ classes that provides a common API for realtime MIDI input/output." -arch=('i686' 'x86_64') +arch=('i686' 'x86_64' 'armv7h') url="http://www.music.mcgill.ca/~gary/rtmidi/" license=('MIT') -depends=('alsa-lib' 'jack') -source=("${url}release/${pkgname}-${pkgver}.tar.gz") -sha512sums=('3bb58a7bcdbd0a6c716060d57eb856f4557a460fd24a533e956ee93523aafe058a4b3cf3133fe1f21d517b1bc7519822f3466a88e3b2c3042a8b09d171143877') +depends=('jack') +source=("${url}release/${pkgname}-${pkgver}.tar.gz" + '0001-fix-tests-with-prefix.diff') +sha512sums=('b5cba769e4641ac453493e2e6ca6f947d7ef5fe71870dd10aa19c93ad18dd62ed01358c468c0e1e326dbc29bd00ecc32b9d8895276d9f46e9e0aa20ed6e0b70f' + 'b45156fd1fca578a0952f3819ffe5721b57e8e8237ba3b532bad0349e201bcfc75460d4d393b3233dacbc994be71186e72f2ae475ac97053ef51716e9f7ba99a') + +prepare() { + # Link the tests against build output and not the system library when using --prefix. + # [https://github.com/thestk/rtmidi/pull/127] + patch -Np1 -i 0001-fix-tests-with-prefix.diff +} build() { cd "${pkgname}-${pkgver}" ./configure --prefix=/usr --with-alsa --with-jack make - cd tests && make } package() { cd "${pkgname}-${pkgver}" - - # Install library files. - install -Dm755 librtmidi.so.${pkgver} "${pkgdir}/usr/lib/librtmidi.so.${pkgver}" - ln -s librtmidi.so.${pkgver} "${pkgdir}/usr/lib/librtmidi.so.2" - ln -s librtmidi.so.${pkgver} "${pkgdir}/usr/lib/librtmidi.so" - - # Install header file. - install -Dm644 RtMidi.h "${pkgdir}/usr/include/RtMidi.h" - - # Install RtMIDI configuration utility. - install -Dm644 librtmidi.pc "${pkgdir}/usr/lib/pkgconfig/librtmidi.pc" - install -Dm755 rtmidi-config "${pkgdir}/usr/bin/rtmidi-config" - - # Install test utilities with prefix 'rtmidi-' - for _bin in `find tests -type f -perm 755`; do - install -Dm755 $_bin "${pkgdir}/usr/bin/${pkgname}-"`basename $_bin` - done + make DESTDIR="${pkgdir}" install # Text documentation. install -d "${pkgdir}/usr/share/doc/${pkgname}" - install -Dm644 readme doc/release.txt "${pkgdir}/usr/share/doc/${pkgname}" + install -Dm644 README.md doc/release.txt "${pkgdir}/usr/share/doc/${pkgname}" # HTML documentation. install -d "${pkgdir}/usr/share/doc/${pkgname}/"{html,images} @@ -50,6 +44,6 @@ package() { install -Dm644 doc/images/* "${pkgdir}/usr/share/doc/${pkgname}/images" # License. - csplit -s readme "%LEGAL AND%" + csplit -s README.md "%Legal and%" install -Dm644 xx00 "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } -- cgit v1.2.3