- adjusted glslang patch for glslang 12

diff --git a/ffmpeg-glslang.patch b/ffmpeg-glslang.patch
index 9fe8b002e9292ffeacacac8199e1b25caad2f24c..cea8b18b15f3179332f7219e85f8b51f8c0ce387 100644 (file)
--- a/ffmpeg-glslang.patch
+++ b/ffmpeg-glslang.patch
@@ -5,7 +5,7 @@
  enabled libfreetype       && require_pkg_config libfreetype freetype2 "ft2build.h FT_FREETYPE_H" FT_Init_FreeType
  enabled libfribidi        && require_pkg_config libfribidi fribidi fribidi.h fribidi_version_info
 -enabled libglslang        && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
-+enabled libglslang        && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
++enabled libglslang        && require_cpp libglslang glslang/SPIRV/GlslangToSpv.h "glslang::TIntermediate*" -lglslang -lHLSL -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++
  enabled libgme            && { check_pkg_config libgme libgme gme/gme.h gme_new_emu ||
                                 require libgme gme/gme.h gme_new_emu -lgme -lstdc++; }
  enabled libgsm            && { for gsm_hdr in "gsm.h" "gsm/gsm.h"; do

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 8abc020e7b137ab8a97b82f765db4255a5403e8f..b79f3bc4664bbed94282fab6f69006451b1c551a 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -163,7 +163,7 @@ BuildRequires:      freetype-devel
 # require version with altivec support fixed
 BuildRequires: gcc >= 5:3.3.2-3
 %endif
-%{?with_glslang:BuildRequires: glslang-devel >= 11}
+%{?with_glslang:BuildRequires: glslang-devel >= 12}
 BuildRequires: gmp-devel
 BuildRequires: gnutls-devel
 BuildRequires: jack-audio-connection-kit-devel
@@ -400,7 +400,7 @@ Requires:   fontconfig-devel
 Requires:      freetype-devel
 %{?with_fribidi:Requires:      fribidi-devel}
 %{?with_gme:Requires:  game-music-emu-devel}
-%{?with_glslang:Requires:      glslang-devel}
+%{?with_glslang:Requires:      glslang-devel >= 12}
 Requires:      gnutls-devel
 Requires:      jack-audio-connection-kit-devel
 %{?with_kvazaar:Requires:      kvazaar-devel >= 0.8.1}