[arch-commits] Commit in guitarix/trunk (2 files)

[Evangelos Foutras]

    Date: Tuesday, June 8, 2021 @ 20:38:16
  Author: foutrelis
Revision: 959892

Fix build with GCC 11 (patch from Fedora)

Added:
  guitarix/trunk/gcc11-compat-volatile-atomic-variables.patch
Modified:
  guitarix/trunk/PKGBUILD

----------------------------------------------+
 PKGBUILD                                     |   14 +++++++++++---
 gcc11-compat-volatile-atomic-variables.patch |   13 +++++++++++++
 2 files changed, 24 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-08 20:29:18 UTC (rev 959891)
+++ PKGBUILD	2021-06-08 20:38:16 UTC (rev 959892)
@@ -17,10 +17,18 @@
 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=('66a71b4d66e0cbcff7feeceae6317c016e497626c9fde3ca44e1f06e42d9021b2857151660c1c49832cc8e6f2aa27de68dfea67d4e896c7e89f84865f8ba1eb0')
-b2sums=('06b2a19d68e77c622eea222e3f0658d9f89c6c8377e9b0442d581e14342f82f97948ca0ebb7ff40f4abd6cab0c9ba582fa6f43f74cad5e112d2e762445f2ab43')
+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')
 
+prepare() {
+  cd "${pkgname}-${pkgver}"
+  patch -Np1 -i ../gcc11-compat-volatile-atomic-variables.patch
+}
+
 build() {
   cd "${pkgname}-${pkgver}"
   waf configure --prefix=/usr \

Added: gcc11-compat-volatile-atomic-variables.patch
===================================================================
--- gcc11-compat-volatile-atomic-variables.patch	                        (rev 0)
+++ gcc11-compat-volatile-atomic-variables.patch	2021-06-08 20:38:16 UTC (rev 959892)
@@ -0,0 +1,13 @@
+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);
+ }
+ 
+