gentoo resync : 11.05.2021

3 files changed, 45 insertions, 1 deletions

diff --git a/media-sound/bpmdetect/Manifest b/media-sound/bpmdetect/Manifest
index 918945a6c57c..1c99b2ab5188 100644
--- a/media-sound/bpmdetect/Manifest
+++ b/media-sound/bpmdetect/Manifest
@@ -1,3 +1,4 @@
+AUX bpmdetect-0.7.0_pre20170810-gcc-11.patch 1088 BLAKE2B d904b707ab056ce4aed215746111793b066e00805dd3ed112987427f0b19cd418f2e95977ea6f8b3abe1fd22fb0d8c53dddf69677ef0de3f06da4ae09340dd04 SHA512 69fe2da55b51ef3d2f6b8e9f2b969e931ced80967db880b270fc6e27a02ed5c26ae13062fc6889574b59687ee1c4ae852df641d6cc29cc0537c8ec198ddce852
 DIST bpmdetect-0.7.0_pre20170810.tar.gz 257777 BLAKE2B 8a6cfa43b70883d3bf03328c9e52a642140c5a25cd72ea5a9515394551e2ae108135b284b788e12a53e79cb0e2fd916d35a27d743558abb996ad5eb5db7beb45 SHA512 a2bbb67c2e5c46b08396e85fd4b91a5fa8622222929a4a67abdcb4587f04f1d8f40414800cb476f7aaa66d95571dd2d65332e48ed639b621a4351f70ab545779
-EBUILD bpmdetect-0.7.0_pre20170810.ebuild 741 BLAKE2B aa0352300404f18fdd9dc91844decb78a1d539d64f075563b07f897a550eff5e18faf409024c6db8e6216cf97a062c2b5fd408123f7c25c0dc185ad3cb092dca SHA512 7cbc6820b5e3ba523d25b59824a45111ca1211de5529a4bdddcf337e8e2a3021c5204c185e72174fc3ea6edd979a62be55fa349be6c812fecb565e0d128914af
+EBUILD bpmdetect-0.7.0_pre20170810.ebuild 784 BLAKE2B 431f5d70df8580ec226aebf70cc7839490b98a0d65e7609ed22979d206ecc342db9926b10805d6f405f35989a3bdaeecb1169cf4145b0d2e55f64c706515ac23 SHA512 5ab4a6d74b62fa3dc738e400dbfef51d7c02d3baba2ac1a15b186aeee68930aefd32accc05dc2cc2e10f607c18f324443807dad2aa8375ac746700831b178d95
 MISC metadata.xml 332 BLAKE2B 85eb37ef9ed0b6efcb8611d66b7d8087424e848bd60b819dc3b095480066de0d64d98fc95de3324542e160bdfd9007c80c6391327681df383c03bac26c83754c SHA512 7a6f93e001d436f33d8ee55b467eb2e398b65193ee0c77c0d087916372cba7a5b9693d15aec27e738ea05d54901c1f4f855722384bb9f86d59e10b7d6b6b17d7
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
+