From 835095ac51b1c8a8e0b870d567b955bb19a8630a583d065333eb76e784102ae2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 8 Oct 2022 16:27:27 +0000 Subject: [PATCH] Accepting request 1008954 from home:alois:branches:multimedia:libs - Enable AMF conditionally OBS-URL: https://build.opensuse.org/request/show/1008954 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=29 --- ffmpeg-5.changes | 5 +++++ ffmpeg-5.spec | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/ffmpeg-5.changes b/ffmpeg-5.changes index 01aff29..fc5dfc4 100644 --- a/ffmpeg-5.changes +++ b/ffmpeg-5.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 5 17:00:38 UTC 2022 - Luigi Baldoni + +- Enable AMF conditionally + ------------------------------------------------------------------- Mon Sep 26 18:44:55 UTC 2022 - C J diff --git a/ffmpeg-5.spec b/ffmpeg-5.spec index be34e42..b8ed433 100644 --- a/ffmpeg-5.spec +++ b/ffmpeg-5.spec @@ -38,6 +38,7 @@ %nil %if 0%{?BUILD_ORIG} +%bcond_without amf_sdk %bcond_without cuda_sdk %else # If software H264 is disabled, the hw driver must be as well: @@ -46,6 +47,7 @@ # -codecs` rather than the success/failure status of libav* initialization. # This becomes a problem when a format only has a HW driver; # the browser thinks it can do H264 but never succeeds. +%bcond_with amf_sdk %bcond_with cuda_sdk %endif %bcond_with amrwb @@ -103,6 +105,9 @@ Patch9: ffmpeg-4.4-CVE-2020-22046.patch Patch10: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch +%if %{with amf_sdk} +BuildRequires: AMF-devel +%endif BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: libmp3lame-devel @@ -557,6 +562,9 @@ LDFLAGS="%_lto_cflags" \ %if %{with vulkan} --enable-libshaderc --enable-vulkan \ %endif +%if %{with amf} + --enable-amf \ +%endif %if !%{with cuda_sdk} --disable-cuda-sdk \ %endif