From f23e778b6e74f3a6ce50d7e42c47a21f49125695fcfb137955b050f6c9e7419f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Mon, 15 Jan 2024 16:48:53 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-6?expand=0&rev=21 --- ffmpeg-6.spec | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/ffmpeg-6.spec b/ffmpeg-6.spec index 97f0ee9..44a1ffc 100644 --- a/ffmpeg-6.spec +++ b/ffmpeg-6.spec @@ -16,11 +16,11 @@ # -%define flavor @BUILD_FLAVOR@%{nil} +%define flavor @BUILD_FLAVOR@%nil # # preamble is present twice, watch out # -%if "%{flavor}" != "ffmpeg-6-mini" +%if "%flavor" != "ffmpeg-6-mini" # Create proper conflicts to make sure we require all from one version # p: Conflict string, eg if you need them all for requires instead @@ -221,7 +221,6 @@ BuildRequires: pkgconfig(SvtAv1Enc) >= 0.9.0 %endif %endif - %if %{with vulkan} %if 0%{?suse_version} >= 1550 || 0%{?sle_version} >= 150600 BuildRequires: pkgconfig(libplacebo) >= 6.292.0 @@ -538,7 +537,7 @@ This subpackage contains the headers for FFmpeg libswscale. %global _lto_cflags %_lto_cflags -ffat-lto-objects %endif CFLAGS="%optflags" \ -%if %suse_version > 1500 +%if 0%{?suse_version} > 1500 %ifarch %ix86 %else LDFLAGS="%_lto_cflags" \ @@ -695,7 +694,7 @@ for i in %extratools; do done %install -b=%{buildroot} +b="%buildroot" %make_install install-man rm -Rf "$b/%_datadir/ffmpeg/examples" for i in %extratools; do @@ -907,7 +906,7 @@ cat config.h %make_build %install -b=%{buildroot} +b="%buildroot" %make_install rm -Rf "$b/%_datadir/ffmpeg/examples"