[packages/guitarix] define "always_inline" after including system headers

atler atler at pld-linux.org
Wed Jul 5 03:17:32 CEST 2023


commit 5bd73f33cbb24b69b3367b9efab26c302ab3a983
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Jul 5 01:23:46 2023 +0200

    define "always_inline" after including system headers
    
    fixes build with glib2 >= 2.76.0 since its header uses "always_inline"
    attribute

 always_inline.patch | 20 ++++++++++++++++++++
 guitarix.spec       |  2 ++
 2 files changed, 22 insertions(+)
---
diff --git a/guitarix.spec b/guitarix.spec
index 3e90bcb..317f782 100644
--- a/guitarix.spec
+++ b/guitarix.spec
@@ -8,6 +8,7 @@ Source0:	http://downloads.sourceforge.net/guitarix/%{name}2-%{version}.tar.xz
 # Source0-md5:	d1757e08ddc54c4ec07defea6a30ac5b
 Patch0:		zita-resampler-1.10.patch
 Patch1:		gcc13.patch
+Patch2:		always_inline.patch
 URL:		https://guitarix.org/
 BuildRequires:	avahi-gobject-devel
 BuildRequires:	bluez-libs-devel
@@ -56,6 +57,7 @@ use the feedback and feedforward sliders.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 CC="%{__cc}" \
diff --git a/always_inline.patch b/always_inline.patch
new file mode 100644
index 0000000..2b84c45
--- /dev/null
+++ b/always_inline.patch
@@ -0,0 +1,20 @@
+diff -ur guitarix-0.44.1.orig/src/ladspa/ladspa_guitarix.cpp guitarix-0.44.1/src/ladspa/ladspa_guitarix.cpp
+--- guitarix-0.44.1.orig/src/ladspa/ladspa_guitarix.cpp	2022-05-02 20:38:03.000000000 +0200
++++ guitarix-0.44.1/src/ladspa/ladspa_guitarix.cpp	2023-07-05 00:25:36.613058650 +0200
+@@ -16,7 +16,6 @@
+  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+  */
+ 
+-#define always_inline inline __attribute__((always_inline))
+ 
+ #include <stdlib.h>
+ #include <string.h>
+@@ -29,6 +28,8 @@
+ #include <jack/jack.h>
+ #include <jack/thread.h>
+ 
++#define always_inline inline __attribute__((always_inline))
++
+ #include "engine.h"
+ 
+ #include "gx_faust_plugins.h"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/guitarix.git/commitdiff/d370ea15ee527b35b47f66a3e1ef8b4ac1ca9457



More information about the pld-cvs-commit mailing list