[arch-commits] Commit in ambix/trunk (PKGBUILD)

[David Runge]

    Date: Monday, November 23, 2020 @ 19:35:34
  Author: dvzrv
Revision: 760132

upgpkg: ambix 0.2.10-3: Rebuild to build against current gcc.

Remove gcc8 from makedepends by applying upstreamed patch.
Add lv2-host and vst-host to optdepends.
Apply latest cmake packaging guidelines.

Modified:
  ambix/trunk/PKGBUILD

----------+
 PKGBUILD |   30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-11-23 19:20:49 UTC (rev 760131)
+++ PKGBUILD	2020-11-23 19:35:34 UTC (rev 760132)
@@ -2,7 +2,7 @@
 
 pkgname=ambix
 pkgver=0.2.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Ambisonic VST, LV2 plug-ins with variable order for use in Digital Audio Workstations"
 arch=('x86_64')
 url="https://github.com/kronihias/ambix"
@@ -9,14 +9,21 @@
 license=('GPL2')
 groups=('lv2-plugins' 'pro-audio' 'vst-plugins')
 depends=('gcc-libs' 'glibc' 'libglvnd' 'libsoxr' 'libx11' 'libxext')
-makedepends=('alsa-lib' 'cmake' 'eigen' 'fftw' 'freetype2' 'freeglut' 'gcc8'
-'gendesk' 'glu' 'libxcursor' 'libxinerama' 'jack' 'liblo' 'zita-convolver')
+makedepends=('alsa-lib' 'cmake' 'eigen' 'fftw' 'freetype2' 'freeglut' 'gendesk'
+'glu' 'libxcursor' 'libxinerama' 'jack' 'liblo' 'zita-convolver')
 checkdepends=('lv2lint')
-optdepends=('jack: for standalone applications')
+optdepends=('jack: for standalone applications'
+            'lv2-host: for LV2 plugins'
+            'vst-host: for VST plugins')
 source=("$pkgname-$pkgver.tar.gz::https://github.com/kronihias/${pkgname}/archive/v${pkgver}.tar.gz"
-        "${pkgname}-0.2.10-lv2_plugin_uri.patch::https://github.com/kronihias/ambix/pull/28/commits/fa5849377b0eeddbedd1d99768cfc9ad9933d751.patch")
+        "${pkgname}-0.2.10-lv2_plugin_uri.patch::https://github.com/kronihias/ambix/pull/28/commits/fa5849377b0eeddbedd1d99768cfc9ad9933d751.patch"
+        "${pkgname}-0.2.10-gcc9.1.0.patch::https://github.com/kronihias/ambix/pull/32/commits/30d9e8df4501d2dd5c35a09a14dd705413de44e7.patch")
 sha512sums=('6e53129bb258a7fd767fb60097354ead28cf05fd5e15017530518b5f0bc9f6350326a58ca81ab7250e70ae25b50900cb00092b489ae33974b258cb200f1c43f5'
-            'f7d12a2983979b6545e9a03713e2088b30ec774a97d5abad7609ca2c2e9737635a30aad467b574a72eb02d2079007ebf281c3ed701f9e34864e0a865c12581ac')
+            'f7d12a2983979b6545e9a03713e2088b30ec774a97d5abad7609ca2c2e9737635a30aad467b574a72eb02d2079007ebf281c3ed701f9e34864e0a865c12581ac'
+            '35a9229bf6719952f49dd6cca5624c636a501877bd12c98724143f16cfd94514c3ed89e5c01ab08380c40c94cfc4506c6fe8dfdeed71bcbd1b152c3d0febd729')
+b2sums=('957eef4181547cbfb25c74eaa262d837d904f0b77b026f78c94e9c479f489648a55c5c8d4952b1314fd5e1c0e57009f7b2e7e4e7f827275aed385ac60d554260'
+        '633d38f8c5d94723a641cecd684fcff03eb0bdd26b9ea0b24566efa6ad788043a6deabfa18e7346ec304fb5fd6915cadc5952249ce49b0f8784e5afdb5f81c74'
+        '4fea3e02c5a0c943afb82b69860b1baa3aa5afd94a474a5abfd781591705e4a4cc78a5425ee82b2b78e0fcfdd24599bc463c3ef1f8adf6b38e9999f9a65fe95a')
 
 _plugin_names=('ambix_binaural' 'ambix_converter' 'ambix_decoder'
 'ambix_directional_loudness' 'ambix_encoder_i2' 'ambix_encoder_i4'
@@ -33,6 +40,10 @@
   # setting proper LV2 URIs:
   # https://github.com/kronihias/ambix/issues/27
   patch -Np1 -i "../${pkgname}-0.2.10-lv2_plugin_uri.patch"
+  # fix for gcc >= 9.1.0
+  # https://github.com/kronihias/ambix/issues/26
+  patch -Np1 -i "../${pkgname}-0.2.10-gcc9.1.0.patch"
+
   declare -A _descriptions=(
     ['ambix_binaural']="Listen to Ambisonics with Headphones"
     ['ambix_converter']="Convert between Ambisonics Formats"
@@ -65,15 +76,12 @@
 
 build() {
   cd "$pkgname-$pkgver"
-  # building with gcc > 9.1 is currently broken
-  # https://github.com/kronihias/ambix/issues/26
-  export CC="gcc-8"
-  export CXX="g++-8"
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
-        -DCMAKE_BUILD_TYPE='Release' \
+        -DCMAKE_BUILD_TYPE='None' \
         -DBUILD_LV2=ON \
         -DWITH_ZITA_CONVOLVER=ON \
         -DOpenGL_GL_PREFERENCE=GLVND \
+        -W no-dev \
         -B build \
         -S .
   make VERBOSE=1 -C build