commit: 375a8ed1d425433c2be91e70652e43639358bdd4 Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> AuthorDate: Sun May 9 12:16:51 2021 +0000 Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> CommitDate: Sun May 9 12:17:01 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=375a8ed1
media-sound/bpmdetect: tweak for gcc-11 Reported-by: Agostino Sarubbo Closes: https://bugs.gentoo.org/740328 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> .../bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild | 2 ++ .../files/bpmdetect-0.7.0_pre20170810-gcc-11.patch | 41 ++++++++++++++++++++++ 2 files changed, 43 insertions(+) diff --git a/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild b/media-sound/bpmdetect/bpmdetect-0.7.0_pre20170810.ebuild index a94e3a52f96..5e436f36d0e 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 00000000000..9264d92f860 --- /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 <sly...@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 <sly...@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 +
