forked from pool/ffmpeg-4
- Add ffmpeg-glslang-cxx17.patch
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=200
This commit is contained in:
parent
2d71342eca
commit
f5d866b756
@ -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>
|
Wed Oct 4 15:15:56 UTC 2023 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
@ -122,6 +122,7 @@ Patch10: ffmpeg-chromium.patch
|
|||||||
Patch11: ffmpeg-libglslang-detection.patch
|
Patch11: ffmpeg-libglslang-detection.patch
|
||||||
Patch12: 0001-avcodec-libsvtav1-remove-compressed_ten_bit_format-a.patch
|
Patch12: 0001-avcodec-libsvtav1-remove-compressed_ten_bit_format-a.patch
|
||||||
Patch13: 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
|
Patch13: 0001-avcodec-x86-mathops-clip-constants-used-with-shift-i.patch
|
||||||
|
Patch14: ffmpeg-glslang-cxx17.patch
|
||||||
BuildRequires: ladspa-devel
|
BuildRequires: ladspa-devel
|
||||||
BuildRequires: libgsm-devel
|
BuildRequires: libgsm-devel
|
||||||
BuildRequires: libmp3lame-devel
|
BuildRequires: libmp3lame-devel
|
||||||
@ -603,7 +604,7 @@ break compatibility without any notice.
|
|||||||
%if "%_lto_cflags" != ""
|
%if "%_lto_cflags" != ""
|
||||||
%global _lto_cflags %_lto_cflags -ffat-lto-objects
|
%global _lto_cflags %_lto_cflags -ffat-lto-objects
|
||||||
%endif
|
%endif
|
||||||
CFLAGS="%optflags" \
|
CFLAGS="%optflags" CXXFLAGS="%optflags" \
|
||||||
%if %suse_version > 1500
|
%if %suse_version > 1500
|
||||||
%ifarch %ix86
|
%ifarch %ix86
|
||||||
%else
|
%else
|
||||||
|
22
ffmpeg-glslang-cxx17.patch
Normal file
22
ffmpeg-glslang-cxx17.patch
Normal file
@ -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
|
Loading…
Reference in New Issue
Block a user