[packages/ffmpeg/ffmpeg-4.4] - adjusted glslang patch for glslang 12
qboosh
qboosh at pld-linux.org
Sun Apr 9 11:24:32 CEST 2023
commit 7f67bf779fae96d79dd0841f85c08933f0f99fd7
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sun Apr 9 11:26:39 2023 +0200
- adjusted glslang patch for glslang 12
ffmpeg-glslang.patch | 2 +-
ffmpeg.spec | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 8abc020..b79f3bc 100644
--- 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}
diff --git a/ffmpeg-glslang.patch b/ffmpeg-glslang.patch
index 9fe8b00..cea8b18 100644
--- 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
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ffmpeg.git/commitdiff/aaca28252289ff113172d45549de5146d6dec0d0
More information about the pld-cvs-commit
mailing list