Date: Monday, December 6, 2021 @ 18:28:36 Author: dvzrv Revision: 1065302
upgpkg: guitarix 0.43.0-1: Upgrade to 0.43.0. Remove now included patch for gcc >= 11 compatibility. Export LDFLAGS as LINKFLAGS to prevent waf from overlinking everything. Simplify quoting in file. Modified: guitarix/trunk/PKGBUILD Deleted: guitarix/trunk/gcc11-compat-volatile-atomic-variables.patch ----------------------------------------------+ PKGBUILD | 53 ++++++++++--------------- gcc11-compat-volatile-atomic-variables.patch | 13 ------ 2 files changed, 23 insertions(+), 43 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-12-06 18:09:45 UTC (rev 1065301) +++ PKGBUILD 2021-12-06 18:28:36 UTC (rev 1065302) @@ -1,36 +1,29 @@ # Maintainer: David Runge <dv...@archlinux.org pkgname=guitarix -pkgver=0.42.1 -pkgrel=2 +pkgver=0.43.0 +pkgrel=1 pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust" -arch=('x86_64') +arch=(x86_64) url="https://guitarix.org" -license=('GPL3') -groups=('ladspa-plugins' 'lv2-plugins' 'pro-audio') -depends=('atkmm' 'bluez-libs' 'cairo' 'cairomm' 'gcc-libs' 'glibc' 'glibmm' -'gtkmm3' 'libsigc++' 'libx11' 'pangomm' 'ttf-roboto') -makedepends=('avahi' 'boost' 'curl' 'gdk-pixbuf2' 'eigen' 'faust' 'fftw' -'glib2' 'gperf' 'gtk3' 'intltool' 'jack' 'ladspa' 'liblo' 'liblrdf' 'lilv' -'lv2' 'pango' 'sassc' 'waf' 'zita-convolver' 'zita-resampler') +license=(GPL3) +groups=(ladspa-plugins lv2-plugins pro-audio) +depends=(atkmm bluez-libs cairo cairomm gcc-libs glibc glibmm +gtkmm3 libsigc++ libx11 pangomm ttf-roboto) +makedepends=(avahi boost curl gdk-pixbuf2 eigen faust fftw +glib2 gperf gtk3 intltool jack ladspa liblo liblrdf lilv +lv2 pango sassc waf zita-convolver zita-resampler) optdepends=('new-session-manager: for session management') -provides=('guitarix2' 'libgxw.so' 'libgxwmm.so' 'ladspa-host' 'lv2-host') -conflicts=('guitarix2') -replaces=('guitarix2') -source=("${pkgname}-${pkgver}.tar.xz::https://download.sourceforge.net/project/guitarix/guitarix/${pkgname}2-${pkgver}.tar.xz" - gcc11-compat-volatile-atomic-variables.patch) -sha512sums=('66a71b4d66e0cbcff7feeceae6317c016e497626c9fde3ca44e1f06e42d9021b2857151660c1c49832cc8e6f2aa27de68dfea67d4e896c7e89f84865f8ba1eb0' - '05d66714c72e1c2a647d3d769f4d81f6a48d653f9bd3094a5306343b3838fe34d137d6c34b0955a3889a6feb7f1b2a9ac237ca2ec42190dffff0822b3ac706b2') -b2sums=('06b2a19d68e77c622eea222e3f0658d9f89c6c8377e9b0442d581e14342f82f97948ca0ebb7ff40f4abd6cab0c9ba582fa6f43f74cad5e112d2e762445f2ab43' - '0281b89eca6dc32051226c09ddb6255e5c8bfd4a278aced69f995954d2dcc5c7d7ad9299d6827afa37cdb857f8b236976663fa63165b94fb5029a473ae07bb09') +provides=(guitarix2 libgxw.so libgxwmm.so ladspa-host lv2-host) +conflicts=(guitarix2) +replaces=(guitarix2) +source=("${pkgname}-${pkgver}.tar.xz::https://download.sourceforge.net/project/guitarix/guitarix/${pkgname}2-${pkgver}.tar.xz") +sha512sums=('20dec12a3bfa689c254817e73718da6306404499f95202b2721f72bdea04281a3ab76bb91d38d48a28cc7e7c2d4173f1972a53e0875ffe2ac24c4cd508672563') +b2sums=('84d98e1033922986e42f2897cb28d33e142699e9c7b46e8e636e6a549f92ead5579a37d0e17bd7475866ea3c4569c60b4100718c224c1407cce7ed26f5fb09c9') -prepare() { - cd "${pkgname}-${pkgver}" - patch -Np1 -i ../gcc11-compat-volatile-atomic-variables.patch -} - build() { cd "${pkgname}-${pkgver}" + export LINKFLAGS="$LDFLAGS" waf configure --prefix=/usr \ --enable-nls \ --ladspa \ @@ -42,12 +35,12 @@ } package() { - depends+=('libavahi-common.so' 'libavahi-gobject.so' 'libboost_iostreams.so' - 'libcurl.so' 'libfftw3f.so' 'libgdk-3.so' 'libgdk_pixbuf-2.0.so' - 'libgio-2.0.so' 'libglib-2.0.so' 'libgobject-2.0.so' 'libjack.so' - 'liblilv-0.so' 'liblo.so' 'liblrdf.so' 'libpangocairo-1.0.so' - 'libpango-1.0.so' 'libsndfile.so' 'libzita-convolver.so' - 'libzita-resampler.so') + depends+=(libavahi-common.so libavahi-gobject.so libboost_iostreams.so + libcurl.so libfftw3f.so libgdk-3.so libgdk_pixbuf-2.0.so libgio-2.0.so + libglib-2.0.so libgobject-2.0.so libjack.so liblilv-0.so liblo.so liblrdf.so + libpangocairo-1.0.so libpango-1.0.so libsndfile.so libzita-convolver.so + libzita-resampler.so) + cd "${pkgname}-${pkgver}" waf install --destdir="${pkgdir}" # docs Deleted: gcc11-compat-volatile-atomic-variables.patch =================================================================== --- gcc11-compat-volatile-atomic-variables.patch 2021-12-06 18:09:45 UTC (rev 1065301) +++ gcc11-compat-volatile-atomic-variables.patch 2021-12-06 18:28:36 UTC (rev 1065302) @@ -1,13 +0,0 @@ -diff --git a/src/headers/gx_system.h b/src/headers/gx_system.h -index d334ecfc..88d97567 100644 ---- a/src/headers/gx_system.h -+++ b/src/headers/gx_system.h -@@ -132,7 +132,7 @@ inline T *atomic_get(T*& p) { - - template <class T> - inline bool atomic_compare_and_exchange(T **p, T *oldv, T *newv) { -- return g_atomic_pointer_compare_and_exchange(reinterpret_cast<void* volatile*>(p), static_cast<void*>(oldv), newv); -+ return g_atomic_pointer_compare_and_exchange(reinterpret_cast<void**>(p), static_cast<void*>(oldv), newv); - } - -