[vlc-commits] [Git][videolan/vlc][master] contrib: projectM: Apply a patch to add missing includes of <functional>

[Steve Lhomme (@robUx4)]

Steve Lhomme pushed to branch master at VideoLAN / VLC


Commits:
3c181d46 by Martin Storsjö at 2022-04-29T05:42:04+00:00
contrib: projectM: Apply a patch to add missing includes of <functional>

This source file in projectM uses std::bind2nd, which is declared
in the <functional> header. Previously it relied on this header
being included implicitly.

libc++ recently stopped including <functional> transitively in
<algorithm> in
https://github.com/llvm/llvm-project/commit/a83f4b9cda57c5b3d414ec3bcf9ac891b2ec27e1.

Upstream projectM stopped using std::bind2nd in this file in
https://github.com/projectM-visualizer/projectm/commit/10faca9abf4c879a63cdf426ddae338620baf238
- thus not trying to upstream the patch.

- - - - -


2 changed files:

- + contrib/src/projectM/missing-includes.patch
- contrib/src/projectM/rules.mak


Changes:

=====================================
contrib/src/projectM/missing-includes.patch
=====================================
@@ -0,0 +1,10 @@
+--- projectM/Renderer/Waveform.cpp.orig	2022-04-27 10:54:35.706616587 +0300
++++ projectM/Renderer/Waveform.cpp	2022-04-27 10:54:43.374663065 +0300
+@@ -17,6 +17,7 @@
+ 
+ #include "Waveform.hpp"
+ #include <algorithm>
++#include <functional>
+ #include "BeatDetect.hpp"
+ 
+ Waveform::Waveform(int samples)


=====================================
contrib/src/projectM/rules.mak
=====================================
@@ -30,6 +30,7 @@ ifdef HAVE_WIN32
 endif
 	$(APPLY) $(SRC)/projectM/gcc6.patch
 	$(APPLY) $(SRC)/projectM/clang6.patch
+	$(APPLY) $(SRC)/projectM/missing-includes.patch
 	$(MOVE)
 
 DEPS_projectM = glew $(DEPS_glew)



View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/3c181d46d74498f50fa0c18234010dda078ebe02

-- 
View it on GitLab: https://code.videolan.org/videolan/vlc/-/commit/3c181d46d74498f50fa0c18234010dda078ebe02
You're receiving this email because of your account on code.videolan.org.


VideoLAN code repository instance