summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild2
-rw-r--r--media-sound/bpmdetect/files/bpmdetect-0.7.0_pre20170810-gcc-11.patch41
2 files changed, 43 insertions, 0 deletions
diff --git a/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
index a94e3a52f961..5e436f36d0e5 100644
--- a/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
+++ b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild
@@ -32,6 +32,8 @@ BDEPEND="
virtual/pkgconfig
"
+PATCHES=("${FILESDIR}"/${P}-gcc-11.patch)
+
src_install() {
einstalldocs
dobin "${BUILD_DIR}"/src/${PN}
diff --git a/media-sound/bpmdetect/files/bpmdetect-0.7.0_pre20170810-gcc-11.patch b/media-sound/bpmdetect/files/bpmdetect-0.7.0_pre20170810-gcc-11.patch
new file mode 100644
index 000000000000..9264d92f8602
--- /dev/null
+++ b/media-sound/bpmdetect/files/bpmdetect-0.7.0_pre20170810-gcc-11.patch
@@ -0,0 +1,41 @@
+https://bugs.gentoo.org/740328
+https://github.com/Tatsh/bpmdetect/pull/2
+
+From 4dbca9ede5126da8d6ce2949cd8db53096fb03fe Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sun, 9 May 2021 13:12:20 +0100
+Subject: [PATCH] src/trackmp3.cpp: fix build against gcc-11
+
+On gcc-11 build fails as:
+
+```
+../src/trackmp3.cpp: In member function 'int TrackMp3::findFrame(int)':
+../src/trackmp3.cpp:458:13: error:
+ ordered comparison of pointer with integer zero ('MadSeekFrameType*' and 'int')
+ 458 | if (temp>0) {
+ | ~~~~^~
+```
+
+The fix changes pointer-to-int comparison to NULL comparison.
+
+Reported-by: Agostino Sarubbo
+Bug: https://bugs.gentoo.org/740328
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ src/trackmp3.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/src/trackmp3.cpp
++++ b/src/trackmp3.cpp
+@@ -455,7 +455,7 @@ int TrackMp3::findFrame(int pos) {
+ temp = m_qSeekList.at(--frameIdx);
+ }
+
+- if (temp>0) {
++ if (temp) {
+ return temp->pos;
+ } else {
+ return 0;
+--
+2.31.1
+