[arch-commits] Commit in aeolus/trunk (PKGBUILD aeolus-0.10.1-makefile.patch)

[David Runge]

    Date: Thursday, May 5, 2022 @ 09:39:29
  Author: dvzrv
Revision: 1195490

upgpkg: aeolus 0.10.1-1: Upgrade to 0.10.1.

Replace sed call for Makefile manipulation in prepare() with a patch.
Remove unneeded quotes and curly braces.
Simplify calls to make.

Added:
  aeolus/trunk/aeolus-0.10.1-makefile.patch
Modified:
  aeolus/trunk/PKGBUILD

------------------------------+
 PKGBUILD                     |   68 ++++++++++++++++++++---------------------
 aeolus-0.10.1-makefile.patch |   20 ++++++++++++
 2 files changed, 54 insertions(+), 34 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2022-05-05 09:17:32 UTC (rev 1195489)
+++ PKGBUILD	2022-05-05 09:39:29 UTC (rev 1195490)
@@ -5,55 +5,55 @@
 # Contributor: Christoph Zeiler <arch at moonblade dot org>
 # Contributor: Philipp Überbacher <murks at lavabit dot com>
 
-_stopver=0.3.0
+_stopver=0.4.0
 pkgname=aeolus
-pkgver=0.9.9
+pkgver=0.10.1
 pkgrel=1
 pkgdesc="Synthesised pipe organ emulator"
-arch=('x86_64')
+arch=(x86_64)
 url="https://kokkinizita.linuxaudio.org/linuxaudio/aeolus/"
-license=('GPL3')
-groups=('pro-audio')
-depends=('gcc-libs' 'glibc' 'libx11')
-makedepends=('alsa-lib' 'clthreads' 'clxclient' 'jack' 'readline' 'zita-alsa-pcmi')
-provides=('aeolus_txt.so' 'aeolus_x11.so')
-source=("https://kokkinizita.linuxaudio.org/linuxaudio/downloads/$pkgname-$pkgver.tar.bz2"
-        "https://kokkinizita.linuxaudio.org/linuxaudio/downloads/stops-$_stopver.tar.bz2"
-        "$pkgname.conf")
-sha512sums=('423278564e83b00e90b91a408a098de8feb3c03809b2b96cf0b320522206ca1afea1d7f3f5cccad80fc4f03e0f31bb2d19f7256e30e6fbd25d25eb777c669ea2'
-            'a6572a42c6796aa08b9085bfc4cb9e252091310224a0b8867eaf5d41f399b2649744c357506ae5fb64a82018f0da702bacbdc7e96965a1116f08d0a248d28ad3'
-            'b04689673aec928e2594a86b595a6f6d5d70408467c99379f6282f98dd9fbc1cab42b196927193a708e26229e665a121a22edf42e8ab49bb24d68d45bde3181c')
+license=(GPL3)
+groups=(pro-audio)
+depends=(gcc-libs glibc libx11)
+makedepends=(alsa-lib clthreads clxclient jack readline zita-alsa-pcmi)
+provides=(aeolus_txt.so aeolus_x11.so)
+source=(
+  https://kokkinizita.linuxaudio.org/linuxaudio/downloads/$pkgname-$pkgver.tar.bz2
+  https://kokkinizita.linuxaudio.org/linuxaudio/downloads/stops-$_stopver.tar.bz2
+  $pkgname.conf
+  $pkgname-0.10.1-makefile.patch
+)
+sha512sums=('fcc85cbcc8accbbd0e06d7bff3eb3007ca848b4150c036952485ab234e4b58a20fadf2d44133a0632f6fe0b58a67392e3747b474a301c46ae9b2de07bf314467'
+            'b465d8bcb89f60727d022a0c88ece24e37e7a3f8e19723f635adbb26e48f0eda042ae956a70cd7ece22f30e583331ff8d0b33eb8b2e61bf180360af4af562a67'
+            'b04689673aec928e2594a86b595a6f6d5d70408467c99379f6282f98dd9fbc1cab42b196927193a708e26229e665a121a22edf42e8ab49bb24d68d45bde3181c'
+            '58052400e26923b0244597a4139f129c92288468cfb9c9fc3d0c78e4d4c82f24534cca1f84c1c12b2c75ea66b79833bf204f6a017d9166f377f10d5f1d077313')
+b2sums=('fa246ee865990b65328ea7a17b7bb29c205ec9b2bdbe4f66f394e2eb3bcf20bfefbd193e684f8e4dbd18a600ab3b445cf4422223bfcbe593ae7357c246cc46ab'
+        '952568f4d5981dabc210bc3cdfd40dd8947fd6c0fb8959ff030b6dc7b2a9c6de68b28b6a3239a7c4233b1faa782a689007a723afbf1fd8cc236a8421561c3bcc'
+        '9e78a3e01bdd3a6ca0db65f37b0d17c39007752526079eac57607e7cd314fca41255c536e5a1dfb5233f81064f9e65f641c04613809749b0e7a62081c6f8a462'
+        '6fafd6f68a2b2cd919c70381a2791d6f61b47c465ae89a18f5b92020e5ecee2a278c6be5dd8c7ae27aba427efbe79fd729a00d156b224ad73c0c423e10e48b04')
 
 prepare() {
-  cd "${pkgname}-${pkgver}"
   # strip -march=native
   # call ldconfig in local context
-  sed -e '/native/d' \
-      -e 's/ldconfig/& -N $(DESTDIR)\/$(LIBDIR)/' \
-      -i source/Makefile
+  patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.10.1-makefile.patch
 }
 
 build() {
-  cd "${pkgname}-${pkgver}"
-  make PREFIX=/usr SUFFIX='' -C source
+  make PREFIX=/usr SUFFIX='' -C $pkgname-$pkgver/source
 }
 
 package(){
-  depends+=('libasound.so' 'libclthreads.so' 'libclxclient.so' 'libjack.so'
-  'libreadline.so' 'libzita-alsa-pcmi.so')
-  cd "${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}/" PREFIX=/usr SUFFIX='' -C source install
+  depends+=(libasound.so libclthreads.so libclxclient.so libjack.so
+  libreadline.so libzita-alsa-pcmi.so)
+
+  make DESTDIR="$pkgdir" PREFIX=/usr SUFFIX='' install -C $pkgname-$pkgver/source
   # docs
-  install -vDm 644 {AUTHORS,README} \
-    -t "${pkgdir}/usr/share/doc/${pkgname}"
+  install -vDm 644 $pkgname-$pkgver/{AUTHORS,README} -t "$pkgdir/usr/share/doc/$pkgname/"
   # system config file
-  install -vDm 644 "${srcdir}/${pkgname}.conf" -t "${pkgdir}/etc/"
+  install -vDm 644 $pkgname.conf -t "$pkgdir/etc/"
   # stops
-  cd "${srcdir}/stops-${_stopver}"
-  find . -name definition -exec install -vDm 644 {} \
-    "${pkgdir}/usr/share/${pkgname}/stops/"{} \;
-  find . -name presets -exec install -vDm 644 {} \
-    "${pkgdir}/usr/share/${pkgname}/stops/"{} \;
-  find . -name '*.ae0' -exec install -vDm 644 {} \
-    "${pkgdir}/usr/share/${pkgname}/stops" \;
+  cd stops-$_stopver
+  find . -name definition -exec install -vDm 644 {} "$pkgdir/usr/share/$pkgname/stops/"{} \;
+  find . -name presets -exec install -vDm 644 {} "$pkgdir/usr/share/$pkgname/stops/"{} \;
+  find . -name '*.ae0' -exec install -vDm 644 {} -t "$pkgdir/usr/share/$pkgname/stops/" \;
 }

Added: aeolus-0.10.1-makefile.patch
===================================================================
--- aeolus-0.10.1-makefile.patch	                        (rev 0)
+++ aeolus-0.10.1-makefile.patch	2022-05-05 09:39:29 UTC (rev 1195490)
@@ -0,0 +1,20 @@
+diff -ruN a/source/Makefile b/source/Makefile
+--- a/source/Makefile	2022-05-04 10:22:40.000000000 +0200
++++ b/source/Makefile	2022-05-05 11:34:28.881814839 +0200
+@@ -26,7 +26,6 @@
+ VERSION = 0.10.3
+ CPPFLAGS += -MMD -MP -DVERSION=\"$(VERSION)\" -DLIBDIR=\"$(LIBDIR)\"
+ CXXFLAGS += -O2 -Wall
+-CXXFLAGS += -march=native
+ 
+ 
+ all:	aeolus aeolus_x11.so aeolus_txt.so
+@@ -75,7 +74,7 @@
+ 	install -m 755 aeolus $(DESTDIR)$(BINDIR)
+ 	install -m 755 aeolus_x11.so $(DESTDIR)$(LIBDIR)
+ 	install -m 755 aeolus_txt.so $(DESTDIR)$(LIBDIR)
+-	ldconfig $(PREFIX)/$(LIBDIR)
++	ldconfig -N $(DESTDIR)/$(LIBDIR)
+ 
+ 
+ clean: