From 1e224d15c443b7aa8b80b5cb9928ff2fd416fe19 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Tue, 19 Apr 2022 08:01:38 -0400 Subject: [PATCH] Use shaderc for Vulkan support --- ffmpeg.spec | 9 ++++++--- ffmpeg_free_sources | 1 + sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ffmpeg.spec b/ffmpeg.spec index 474e19f..6d39471 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -69,7 +69,7 @@ Name: ffmpeg %global pkg_name %{name}%{?pkg_suffix} Version: 5.0.1 -Release: 3%{?dist} +Release: 4%{?dist} Summary: A complete solution to record, convert and stream audio and video License: GPLv3+ URL: https://ffmpeg.org/ @@ -226,7 +226,7 @@ BuildRequires: pkgconfig(SvtAv1Enc) >= 0.8.4 %endif %if %{with vulkan} BuildRequires: vulkan-loader-devel -BuildRequires: glslang-devel +BuildRequires: pkgconfig(shaderc) >= 2019.1 %endif %if %{with x264} BuildRequires: pkgconfig(x264) @@ -559,7 +559,7 @@ cp -a doc/examples/{*.c,Makefile,README} _doc/examples/ --enable-gnutls \ --enable-ladspa \ %if %{with vulkan} - --enable-libglslang \ + --enable-libshaderc \ --enable-vulkan \ %endif --disable-cuda-sdk \ @@ -838,6 +838,9 @@ rm -rf %{buildroot}%{_datadir}/%{name}/examples %{_mandir}/man3/libswscale.3* %changelog +* Tue Apr 19 2022 Neal Gompa - 5.0.1-4 +- Use shaderc for Vulkan support + * Mon Apr 18 2022 Neal Gompa - 5.0.1-3 - Fix codec2 support enablement diff --git a/ffmpeg_free_sources b/ffmpeg_free_sources index a9ea8e3..248a7a0 100644 --- a/ffmpeg_free_sources +++ b/ffmpeg_free_sources @@ -2841,6 +2841,7 @@ libavutil/vulkan.h libavutil/vulkan_functions.h libavutil/vulkan_glslang.c libavutil/vulkan_loader.h +libavutil/vulkan_shaderc.c libavutil/wchar_filename.h libavutil/x86/Makefile libavutil/x86/asm.h diff --git a/sources b/sources index 4ce0fb2..4690153 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ -SHA512 (ffmpeg-free-5.0.1.tar.xz) = fc04fd4a5f04dd0932a802b5cef3aa1dcbf998f675807bbd8d17547c0142e4e0496ead75e528b577cedf41298ed6bce4d9e2a394b72df741c208c36cf7f9f996 +SHA512 (ffmpeg-free-5.0.1.tar.xz) = bfc5829c6cfffe69a5383b6c5c8e392ec21ee45b937722c5ad86b39fe74066521a11b97380a7f9e42ba7452ca01d8c006cd429406fed221e7269835c1d46e8ca SHA512 (ffmpeg-5.0.1.tar.xz.asc) = 9c4bd404196c3a3808bae92873aefc77f8c26a9419cc6130a3f2359a75c8e83189d206e9aee8ff85c5a7fe4a98da24e11cf607ec351386c18979ec2d5ad3b3ad SHA512 (ffmpeg-dlopen-headers.tar.xz) = ef47b5a8b5ef5c8c57b2372170ccda3fd6897572ab5aff5e3cd1dd3bbe1f892e42d9f89d1c159c79052a8ac57c42d4a2ebc8636d6f932df00b57f8010c5bfd3b SHA512 (ffmpeg.keyring) = 9b36506835db36f776b7ddb53ad6fa9e915e6ca2f9c7cfebe8eb45513e1036a985283590a840ca313a111bf35dc3731f68885aaafb1fb7011ec433cc119e5165