[arch-commits] Commit in guitarix/repos/community-x86_64 (3 files)

[David Runge]

    Date: Thursday, April 28, 2022 @ 09:59:19
  Author: dvzrv
Revision: 1191530

archrelease: copy trunk to community-x86_64

Added:
  guitarix/repos/community-x86_64/PKGBUILD
    (from rev 1191529, guitarix/trunk/PKGBUILD)
  guitarix/repos/community-x86_64/guitarix-0.43.1-glib2.patch
    (from rev 1191529, guitarix/trunk/guitarix-0.43.1-glib2.patch)
Deleted:
  guitarix/repos/community-x86_64/PKGBUILD

-----------------------------+
 PKGBUILD                    |  108 +++++++++++++++++++++++-------------------
 guitarix-0.43.1-glib2.patch |   15 +++++
 2 files changed, 75 insertions(+), 48 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2022-04-28 09:59:07 UTC (rev 1191529)
+++ PKGBUILD	2022-04-28 09:59:19 UTC (rev 1191530)
@@ -1,48 +0,0 @@
-# Maintainer: David Runge <dvzrv at archlinux.org
-
-pkgname=guitarix
-pkgver=0.43.1
-pkgrel=2
-pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust"
-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)
-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")
-sha512sums=('30e56d863308cea18bb4af6f71d3e8d852662b4252c998507a1c3de9a2d97fe1c4ecb525bd35ef8e176b5cb5138806553cba157c1aa6cb14e48fe0bbea8a7def')
-b2sums=('bfa72a20f5fe1bdd08162e283f7074f6bcd6b4d6ccb1771f0351e60802ebf030f8f6627d2480ccd2e5972215847edd62bff38c338723fd0bf2504b9b2cee5101')
-
-build() {
-  cd "${pkgname}-${pkgver}"
-  export LINKFLAGS="$LDFLAGS"
-  waf configure --prefix=/usr \
-                --enable-nls \
-                --ladspa \
-                --new-ladspa \
-                --shared-lib \
-                --lib-dev \
-                --ldflags="${LDFLAGS}"
-  waf build -vv
-}
-
-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)
-
-  cd "${pkgname}-${pkgver}"
-  waf install --destdir="${pkgdir}"
-  # docs
-  install -vDm 644 {changelog,README} -t "${pkgdir}/usr/share/doc/${pkgname}/"
-}

Copied: guitarix/repos/community-x86_64/PKGBUILD (from rev 1191529, guitarix/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2022-04-28 09:59:19 UTC (rev 1191530)
@@ -0,0 +1,60 @@
+# Maintainer: David Runge <dvzrv at archlinux.org
+
+pkgname=guitarix
+pkgver=0.43.1
+pkgrel=3
+pkgdesc="A simple mono guitar amplifier and FX for JACK using Faust"
+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)
+optdepends=('new-session-manager: for session management')
+provides=(guitarix2 libgxw.so libgxwmm.so ladspa-host lv2-host)
+conflicts=(guitarix2)
+replaces=(guitarix2)
+# LTO builds currently broken: https://sourceforge.net/p/guitarix/bugs/133/
+options=(debug !lto)
+source=(
+  $pkgname-$pkgver.tar.xz::https://download.sourceforge.net/project/guitarix/guitarix/${pkgname}2-$pkgver.tar.xz
+  $pkgname-0.43.1-glib2.patch
+)
+sha512sums=('30e56d863308cea18bb4af6f71d3e8d852662b4252c998507a1c3de9a2d97fe1c4ecb525bd35ef8e176b5cb5138806553cba157c1aa6cb14e48fe0bbea8a7def'
+            '268e23d53441147a6e7959af2b1a45fd3f0f453f1fd3c40af7b3c002e801a42880ecb9ab7042c324c3099740f0151c24eafc6afb0b990de3b9fcb6ee8f1b3950')
+b2sums=('bfa72a20f5fe1bdd08162e283f7074f6bcd6b4d6ccb1771f0351e60802ebf030f8f6627d2480ccd2e5972215847edd62bff38c338723fd0bf2504b9b2cee5101'
+        'c0963ac7ec531707f30038744c1159bebb1544ebb02771f37cebfba5df7ab0e77c2c6230b46fc6ac8f34512b73840f8cbf1b82726c09a35cc097380242f65aa8')
+
+prepare() {
+  # fix issue with recent glib2, backport of https://github.com/brummer10/guitarix/commit/89b944c7c47b565cebfb1ac368fcb5ede82fd5d3
+  patch -Np1 -d $pkgname-$pkgver -i ../$pkgname-0.43.1-glib2.patch
+}
+
+build() {
+  cd $pkgname-$pkgver
+  export LINKFLAGS="$LDFLAGS"
+  waf configure --prefix=/usr \
+                --enable-nls \
+                --ladspa \
+                --new-ladspa \
+                --shared-lib \
+                --lib-dev \
+                --ldflags="$LDFLAGS"
+  waf build -vv
+}
+
+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)
+
+  cd $pkgname-$pkgver
+  waf install --destdir="$pkgdir"
+  # docs
+  install -vDm 644 {changelog,README} -t "$pkgdir/usr/share/doc/$pkgname/"
+}

Copied: guitarix/repos/community-x86_64/guitarix-0.43.1-glib2.patch (from rev 1191529, guitarix/trunk/guitarix-0.43.1-glib2.patch)
===================================================================
--- guitarix-0.43.1-glib2.patch	                        (rev 0)
+++ guitarix-0.43.1-glib2.patch	2022-04-28 09:59:19 UTC (rev 1191530)
@@ -0,0 +1,15 @@
+diff -ruN a/src/headers/gx_system.h b/src/headers/gx_system.h
+--- a/src/headers/gx_system.h	2021-12-10 18:53:33.000000000 +0100
++++ b/src/headers/gx_system.h	2022-04-28 11:23:16.176694581 +0200
+@@ -112,7 +112,11 @@
+ }
+ 
+ inline bool atomic_compare_and_exchange(volatile int *p, int oldv, int newv) {
++#if (GLIB_MAJOR_VERSION == 2 && GLIB_MINOR_VERSION < 68 && GLIB_MICRO_VERSION < 1)
+     return g_atomic_int_compare_and_exchange(p, oldv, newv);
++#else
++    return g_atomic_int_compare_and_exchange(const_cast<int*>(p), oldv, newv);
++#endif
+ }
+ 
+ template <class T>