From 6264814dd8ff6c361305a6027037ad3308f67e659cce97f6f29d929cfe9391cc Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 20 May 2021 23:32:45 +0000 Subject: [PATCH 1/4] Accepting request 894701 from home:dmolkentin:branches:multimedia:libs - Enable vulkan on on Leap 15 OBS-URL: https://build.opensuse.org/request/show/894701 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=161 --- ffmpeg-4.changes | 5 +++++ ffmpeg-4.spec | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 94ec9e2..a3b0825 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 20 23:16:09 UTC 2021 - Daniel Molkentin + +- Enable vulkan on on Leap 15 + ------------------------------------------------------------------- Fri Apr 16 10:20:15 UTC 2021 - Jan Engelhardt diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 0575ca0..843ac8d 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -68,6 +68,7 @@ %bcond_without rubberband %bcond_without soxr %bcond_without zmq +%bcond_without vulkan %else %bcond_with libaom %bcond_with mysofa @@ -80,6 +81,7 @@ %bcond_with rubberband %bcond_with soxr %bcond_with zmq +%bcond_with vulkan %endif %if 0%{?suse_version} >= 1500 @@ -195,6 +197,9 @@ BuildRequires: pkgconfig(vdpau) %if %{with vidstab} BuildRequires: pkgconfig(vidstab) >= 0.98 %endif +%if %{with vulkan} +BuildRequires: pkgconfig(vulkan) +%endif BuildRequires: pkgconfig(vorbis) BuildRequires: pkgconfig(vpx) >= 1.4.0 BuildRequires: pkgconfig(x11) @@ -613,6 +618,9 @@ LDFLAGS="%_lto_cflags" \ --enable-avresample \ --enable-gnutls \ --enable-ladspa \ +%if %{with vulkan} + --enable-vulkan \ +%endif %if ! %{with cuda_sdk} --disable-cuda-sdk \ %endif From 00d83f912479011e0591dc60e57b4cd8bcff8cdc0cf03b130d6088ae08009b40 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 4 Jun 2021 12:29:37 +0000 Subject: [PATCH 2/4] - Enable SVT-AV1 encoding OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=162 --- enable_encoders | 1 + ffmpeg-4.changes | 5 +++++ ffmpeg-4.spec | 8 +++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/enable_encoders b/enable_encoders index 189e2fe..faf7004 100644 --- a/enable_encoders +++ b/enable_encoders @@ -20,6 +20,7 @@ libopus # opus librav1e # rav1e libschroedinger # schroedinger libspeex # speex +libsvtav1 libtheora # libtheora libtwolame # twolame libvorbis # libvorbis diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index a3b0825..bd25550 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Jun 4 12:29:16 UTC 2021 - Jan Engelhardt + +- Enable SVT-AV1 encoding + ------------------------------------------------------------------- Thu May 20 23:16:09 UTC 2021 - Daniel Molkentin diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 843ac8d..994447b 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -98,7 +98,7 @@ Name: ffmpeg-4 Version: 4.4 Release: 0 -Summary: Library for working with various multimedia formats +Summary: Set of libraries for working with various multimedia formats License: GPL-3.0-or-later Group: Productivity/Multimedia/Video/Editors and Convertors URL: https://ffmpeg.org/ @@ -125,6 +125,9 @@ BuildRequires: libmysofa-devel %endif BuildRequires: nasm BuildRequires: pkg-config +%if 0%{?suse_version} >= 1550 +BuildRequires: pkgconfig(SvtAv1Enc) >= 0.8.4 +%endif BuildRequires: pkgconfig(alsa) %if %{with libaom} BuildRequires: pkgconfig(aom) @@ -661,6 +664,9 @@ LDFLAGS="%_lto_cflags" \ %if %{with rubberband} --enable-librubberband \ %endif +%if 0%{?suse_version} >= 1550 + --enable-libsvtav1 \ +%endif %if %{with soxr} --enable-libsoxr \ %endif From b3ad779a1f54474596f1a993598366d8552854a14a9bae3e756d35fbfc0358b5 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 4 Jun 2021 12:55:39 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=163 --- ffmpeg-4.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 994447b..c79c4c5 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -125,9 +125,11 @@ BuildRequires: libmysofa-devel %endif BuildRequires: nasm BuildRequires: pkg-config +%ifarch x86_64 %if 0%{?suse_version} >= 1550 BuildRequires: pkgconfig(SvtAv1Enc) >= 0.8.4 %endif +%endif BuildRequires: pkgconfig(alsa) %if %{with libaom} BuildRequires: pkgconfig(aom) From 4d3af889b915561349acb9ad6b56526e75e77db472ee398b2de8987b2cfd60c1 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Fri, 4 Jun 2021 13:39:18 +0000 Subject: [PATCH 4/4] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=164 --- ffmpeg-4.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index c79c4c5..c919575 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -666,9 +666,11 @@ LDFLAGS="%_lto_cflags" \ %if %{with rubberband} --enable-librubberband \ %endif +%ifarch x86_64 %if 0%{?suse_version} >= 1550 --enable-libsvtav1 \ %endif +%endif %if %{with soxr} --enable-libsoxr \ %endif