From f5d866b756aa647665745eca5cda34d2663a9ebd75a66ef3c2b7a9940d327267 Mon Sep 17 00:00:00 2001
From: Jan Engelhardt <jengelh@inai.de>
Date: Mon, 30 Oct 2023 11:17:44 +0000
Subject: [PATCH] - Add ffmpeg-glslang-cxx17.patch

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=200
---
 ffmpeg-4.changes           |  5 +++++
 ffmpeg-4.spec              |  3 ++-
 ffmpeg-glslang-cxx17.patch | 22 ++++++++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 ffmpeg-glslang-cxx17.patch

diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes
index d1004a1..3bb6797 100644
--- a/ffmpeg-4.changes
+++ b/ffmpeg-4.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Oct 30 11:16:43 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
+
+- Add ffmpeg-glslang-cxx17.patch
+
 -------------------------------------------------------------------
 Wed Oct  4 15:15:56 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
 
diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec
index cabdf7c..14a5438 100644
--- a/ffmpeg-4.spec
+++ b/ffmpeg-4.spec
@@ -122,6 +122,7 @@ Patch10:        ffmpeg-chromium.patch
 Patch11:        ffmpeg-libglslang-detection.patch
 Patch12:        0001-avcodec-libsvtav1-remove-compressed_ten_bit_format-a.patch
 Patch13:        0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
+Patch14:        ffmpeg-glslang-cxx17.patch
 BuildRequires:  ladspa-devel
 BuildRequires:  libgsm-devel
 BuildRequires:  libmp3lame-devel
@@ -603,7 +604,7 @@ break compatibility without any notice.
 %if "%_lto_cflags" != ""
 %global _lto_cflags %_lto_cflags -ffat-lto-objects
 %endif
-CFLAGS="%optflags" \
+CFLAGS="%optflags" CXXFLAGS="%optflags" \
 %if %suse_version > 1500
 %ifarch %ix86
 %else
diff --git a/ffmpeg-glslang-cxx17.patch b/ffmpeg-glslang-cxx17.patch
new file mode 100644
index 0000000..3b1923b
--- /dev/null
+++ b/ffmpeg-glslang-cxx17.patch
@@ -0,0 +1,22 @@
+From: Jan Engelhardt <jengelh@inai.de>
+Date: 2023-10-30 12:10:03.273303565 +0100
+
+glslang 13 needs C++17.
+
+---
+ configure |    2 +-
+ 1 file changed, 1 insertion(+), 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