36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
|
From: Jan Engelhardt <jengelh@inai.de>
|
||
|
|
Date: 2023-10-30 12:10:03.273303565 +0100
|
||
|
|
|
||
|
|
glslang 13 needs C++17.
|
||
|
|
|
||
|
|
---
|
||
|
|
configure | 2 +-
|
||
|
|
libavfilter/glslang.cpp | 1 +
|
||
|
|
2 files changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
Index: ffmpeg-4.4.4/configure
|
||
|
|
===================================================================
|
||
|
|
--- ffmpeg-4.4.4.orig/configure
|
||
|
|
+++ ffmpeg-4.4.4/configure
|
||
|
|
@@ -5267,7 +5267,7 @@ fi
|
||
|
|
|
||
|
|
add_cppflags -D_ISOC99_SOURCE
|
||
|
|
add_cxxflags -D__STDC_CONSTANT_MACROS
|
||
|
|
-check_cxxflags -std=c++11 || check_cxxflags -std=c++0x
|
||
|
|
+check_cxxflags -std=c++17
|
||
|
|
|
||
|
|
# some compilers silently accept -std=c11, so we also need to check that the
|
||
|
|
# version macro is defined properly
|
||
|
|
Index: ffmpeg-4.4.4/libavfilter/glslang.cpp
|
||
|
|
===================================================================
|
||
|
|
--- ffmpeg-4.4.4.orig/libavfilter/glslang.cpp
|
||
|
|
+++ ffmpeg-4.4.4/libavfilter/glslang.cpp
|
||
|
|
@@ -16,6 +16,7 @@
|
||
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
||
|
|
*/
|
||
|
|
|
||
|
|
+#include <cassert>
|
||
|
|
#include <pthread.h>
|
||
|
|
|
||
|
|
extern "C" {
|