qzhao/ffmpeg-4
SHA256
1
0
Fork 0
forked from jengelh/ffmpeg-4
Code Pull Requests Activity

Accepting request 962537 from home:iDesmI:Wayland

Browse Source 
- Add ffmpeg-libglslang-detection.patch: detects libglslang
- Enable build with libglslang, needed for Vulkan filters

OBS-URL: https://build.opensuse.org/request/show/962537
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=178
This commit is contained in:
Jan Engelhardt 2022-03-18 11:38:38 +00:00 committed by Git OBS Bridge
parent 320e84ebe2
commit 914c0a5c10
3 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ffmpeg-4.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Mar 17 21:44:30 UTC 2022 - Enrico Belleri <idesmi@protonmail.com>
- Add ffmpeg-libglslang-detection.patch: detects libglslang
- Enable Vulkan filters
-------------------------------------------------------------------
Sun Mar 13 15:20:53 UTC 2022 - Predrag Ivanović <predivan@mts.rs>

5
ffmpeg-4.spec
View File

@ -119,6 +119,7 @@ Patch5: soversion.patch
Patch8: vmaf-trim-usr-local.patch
Patch9: ffmpeg-4.4-CVE-2020-22046.patch
Patch10: ffmpeg-chromium.patch
Patch11: ffmpeg-libglslang-detection.patch
BuildRequires: ladspa-devel
BuildRequires: libgsm-devel
BuildRequires: libmp3lame-devel
@ -206,6 +207,9 @@ BuildRequires: pkgconfig(vidstab) >= 0.98
%endif
%if %{with vulkan}
BuildRequires: pkgconfig(vulkan)
BuildRequires: pkgconfig(SPIRV-Tools)
BuildRequires: glslang-devel
BuildRequires: c++_compiler
%endif
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(vpx) >= 1.4.0
@ -627,6 +631,7 @@ LDFLAGS="%_lto_cflags" \
--enable-ladspa \
%if %{with vulkan}
--enable-vulkan \
--enable-libglslang \
%endif
%if ! %{with cuda_sdk}
--disable-cuda-sdk \

18
ffmpeg-libglslang-detection.patch Normal file
View File

@ -0,0 +1,18 @@
Index: ffmpeg-4.4.1/configure
===================================================================
--- ffmpeg-4.4.1.orig/configure
+++ ffmpeg-4.4.1/configure
@@ -6370,7 +6370,12 @@ enabled fontconfig && enable libf
enabled libfontconfig && require_pkg_config libfontconfig fontconfig "fontconfig/fontconfig.h" FcInit
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 && { check_lib libglslang glslang/Include/glslang_c_interface.h glslang_initialize_process \
+ -lglslang -lMachineIndependent -lOSDependent -lHLSL -lOGLCompiler -lGenericCodeGen \
+ -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm ||
+ require libglslang glslang/Include/glslang_c_interface.h glslang_initialize_process \
+ -lglslang -lOSDependent -lHLSL -lOGLCompiler \
+ -lSPVRemapper -lSPIRV -lSPIRV-Tools-opt -lSPIRV-Tools -lpthread -lstdc++ -lm; }
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