git: 09052707e3a2 - main - audio/spectmorph: Remove 'register' keywords instead of having USE_STDCXX=c++17
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 12 Jul 2023 03:58:33 UTC
The branch main has been updated by yuri:
URL: https://cgit.FreeBSD.org/ports/commit/?id=09052707e3a262826072c2a1e31e2442c35a8d94
commit 09052707e3a262826072c2a1e31e2442c35a8d94
Author: Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-07-12 03:57:46 +0000
Commit: Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-07-12 03:57:46 +0000
audio/spectmorph: Remove 'register' keywords instead of having USE_STDCXX=c++17
Reported by: fallout
---
audio/spectmorph/Makefile | 1 -
audio/spectmorph/files/patch-lib_smmath.hh | 23 +++++++++++++++++++++++
2 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/audio/spectmorph/Makefile b/audio/spectmorph/Makefile
index 3ead26e0b97c..52864fa7dc7c 100644
--- a/audio/spectmorph/Makefile
+++ b/audio/spectmorph/Makefile
@@ -25,7 +25,6 @@ USE_GNOME= cairo glib20
USE_GL= gl
USE_XORG= x11
USE_LDCONFIG= yes
-USE_CXXSTD= c++14 # fix compilation failure on 14: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
SHEBANG_FILES= tools/sminstbuilder.in
diff --git a/audio/spectmorph/files/patch-lib_smmath.hh b/audio/spectmorph/files/patch-lib_smmath.hh
new file mode 100644
index 000000000000..964a0b94fdcb
--- /dev/null
+++ b/audio/spectmorph/files/patch-lib_smmath.hh
@@ -0,0 +1,23 @@
+- fix compilation failure on 14: error: ISO C++17 does not allow 'register' storage class specifier [-Wregister]
+- see https://github.com/swesterfeld/spectmorph/issues/23
+
+--- lib/smmath.hh.orig 2023-07-12 03:47:47 UTC
++++ lib/smmath.hh
+@@ -431,7 +431,7 @@ double db_from_factor (double factor, double min_dB);
+
+ #if defined (__i386__) && defined (__GNUC__)
+ static inline int G_GNUC_CONST
+-sm_ftoi (register float f)
++sm_ftoi (float f)
+ {
+ int r;
+
+@@ -441,7 +441,7 @@ sm_ftoi (register float f)
+ return r;
+ }
+ static inline int G_GNUC_CONST
+-sm_dtoi (register double f)
++sm_dtoi (double f)
+ {
+ int r;
+