From c33289573cfe8d4150b794c5d8197012d07fdbf2c4709b889819c15226be18dd Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 19 Sep 2019 19:59:49 +0000 Subject: [PATCH] streamline style again OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=94 --- ffmpeg-4.spec | 124 +++++++++++++++++++++++++------------------------- 1 file changed, 62 insertions(+), 62 deletions(-) diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 7174e2e..e29dbd3 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -26,17 +26,17 @@ %define comparator %{-c:%{-c*}}%{!-c:%{error:Comparator not defined}} \ %define conflicts_version %{-v:%{-v*}}%{!-v:%{error:Version not defined}} \ \ -%{preamble_string} libavcodec-devel %{comparator} %{conflicts_version} \ -%{preamble_string} libavdevice-devel %{comparator} %{conflicts_version} \ -%{preamble_string} libavfilter-devel %{comparator} %{conflicts_version} \ -%{preamble_string} libavformat-devel %{comparator} %{conflicts_version} \ -%{preamble_string} libavresample-devel %{comparator} %{conflicts_version} \ -%{preamble_string} libavutil-devel %{comparator} %{conflicts_version} \ -%{preamble_string} libpostproc-devel %{comparator} %{conflicts_version} \ -%{preamble_string} libswresample-devel %{comparator} %{conflicts_version} \ -%{preamble_string} libswscale-devel %{comparator} %{conflicts_version} \ -%{preamble_string} ffmpeg-private-devel %{comparator} %{conflicts_version} \ -%{nil} +%preamble_string libavcodec-devel %comparator %conflicts_version \ +%preamble_string libavdevice-devel %comparator %conflicts_version \ +%preamble_string libavfilter-devel %comparator %conflicts_version \ +%preamble_string libavformat-devel %comparator %conflicts_version \ +%preamble_string libavresample-devel %comparator %conflicts_version \ +%preamble_string libavutil-devel %comparator %conflicts_version \ +%preamble_string libpostproc-devel %comparator %conflicts_version \ +%preamble_string libswresample-devel %comparator %conflicts_version \ +%preamble_string libswscale-devel %comparator %conflicts_version \ +%preamble_string ffmpeg-private-devel %comparator %conflicts_version \ +%nil # nvcodec headers only present after leap15 %bcond_with nvcodec @@ -241,8 +241,8 @@ BuildRequires: pkgconfig(x264) %if %{with x265} BuildRequires: pkgconfig(x265) %endif -Provides: ffmpeg-tools = %{version} -Obsoletes: ffmpeg-tools < %{version} +Provides: ffmpeg-tools = %version +Obsoletes: ffmpeg-tools < %version Provides: ffmpeg = %version Obsoletes: ffmpeg < %version Requires: libavcodec58 = %version-%release @@ -291,11 +291,11 @@ Summary: Development files for FFmpeg's codec library Group: Development/Libraries/C and C++ Provides: libavcodec-devel = %version-%release Obsoletes: libavcodec-devel < %version-%release -Requires: %{name}-libavresample-devel = %version-%release -Requires: %{name}-libavutil-devel = %version-%release +Requires: %name-libavresample-devel = %version-%release +Requires: %name-libavutil-devel = %version-%release Requires: libavcodec58 = %version-%release -%devel_conflicts -c < -v %{_major_version} -%devel_conflicts -c >= -v %{_major_expected} +%devel_conflicts -c < -v %_major_version +%devel_conflicts -c >= -v %_major_expected %description libavcodec-devel The libavcodec library provides a generic encoding/decoding framework @@ -325,17 +325,17 @@ Provides: ffmpeg-devel = %version-%release Conflicts: ffmpeg-devel Provides: libavdevice-devel = %version-%release Obsoletes: libavdevice-devel < %version-%release -Requires: %{name}-libavcodec-devel = %version-%release -Requires: %{name}-libavfilter-devel = %version-%release -Requires: %{name}-libavformat-devel = %version-%release -Requires: %{name}-libavresample-devel = %version-%release -Requires: %{name}-libavutil-devel = %version-%release -Requires: %{name}-libpostproc-devel = %version-%release -Requires: %{name}-libswresample-devel = %version-%release -Requires: %{name}-libswscale-devel = %version-%release +Requires: %name-libavcodec-devel = %version-%release +Requires: %name-libavfilter-devel = %version-%release +Requires: %name-libavformat-devel = %version-%release +Requires: %name-libavresample-devel = %version-%release +Requires: %name-libavutil-devel = %version-%release +Requires: %name-libpostproc-devel = %version-%release +Requires: %name-libswresample-devel = %version-%release +Requires: %name-libswscale-devel = %version-%release Requires: libavdevice58 = %version-%release -%devel_conflicts -c < -v %{_major_version} -%devel_conflicts -c >= -v %{_major_expected} +%devel_conflicts -c < -v %_major_version +%devel_conflicts -c >= -v %_major_expected %description libavdevice-devel The libavdevice library provides a generic framework for grabbing from @@ -365,16 +365,16 @@ Summary: Development files for FFmpeg's audio/video filter library Group: Development/Libraries/C and C++ Provides: libavfilter-devel = %version-%release Obsoletes: libavfilter-devel < %version-%release -Requires: %{name}-libavcodec-devel = %version-%release -Requires: %{name}-libavformat-devel = %version-%release -Requires: %{name}-libavresample-devel = %version-%release -Requires: %{name}-libavutil-devel = %version-%release -Requires: %{name}-libpostproc-devel = %version-%release -Requires: %{name}-libswresample-devel = %version-%release -Requires: %{name}-libswscale-devel = %version-%release +Requires: %name-libavcodec-devel = %version-%release +Requires: %name-libavformat-devel = %version-%release +Requires: %name-libavresample-devel = %version-%release +Requires: %name-libavutil-devel = %version-%release +Requires: %name-libpostproc-devel = %version-%release +Requires: %name-libswresample-devel = %version-%release +Requires: %name-libswscale-devel = %version-%release Requires: libavfilter7 = %version-%release -%devel_conflicts -c < -v %{_major_version} -%devel_conflicts -c >= -v %{_major_expected} +%devel_conflicts -c < -v %_major_version +%devel_conflicts -c >= -v %_major_expected %description libavfilter-devel The libavfilter library provides a generic audio/video filtering @@ -403,12 +403,12 @@ Summary: Development files for FFmpeg's stream format library Group: Development/Libraries/C and C++ Provides: libavformat-devel = %version-%release Obsoletes: libavformat-devel < %version-%release -Requires: %{name}-libavcodec-devel = %version-%release -Requires: %{name}-libavutil-devel = %version-%release -Requires: %{name}-libswresample-devel = %version-%release +Requires: %name-libavcodec-devel = %version-%release +Requires: %name-libavutil-devel = %version-%release +Requires: %name-libswresample-devel = %version-%release Requires: libavformat58 = %version-%release -%devel_conflicts -c < -v %{_major_version} -%devel_conflicts -c >= -v %{_major_expected} +%devel_conflicts -c < -v %_major_version +%devel_conflicts -c >= -v %_major_expected %description libavformat-devel The libavformat library provides a generic framework for multiplexing @@ -434,10 +434,10 @@ Summary: Development files for libavresample as present in FFmpeg Group: Development/Libraries/C and C++ Provides: libavresample-devel = %version-%release Obsoletes: libavresample-devel < %version-%release -Requires: %{name}-libavutil-devel = %version-%release +Requires: %name-libavutil-devel = %version-%release Requires: libavresample4 = %version-%release -%devel_conflicts -c < -v %{_major_version} -%devel_conflicts -c >= -v %{_major_expected} +%devel_conflicts -c < -v %_major_version +%devel_conflicts -c >= -v %_major_expected %description libavresample-devel An audio resampling library that is being provided for drop-in @@ -464,8 +464,8 @@ Group: Development/Libraries/C and C++ Provides: libavutil-devel = %version-%release Obsoletes: libavutil-devel < %version-%release Requires: libavutil56 = %version-%release -%devel_conflicts -c < -v %{_major_version} -%devel_conflicts -c >= -v %{_major_expected} +%devel_conflicts -c < -v %_major_version +%devel_conflicts -c >= -v %_major_expected %description libavutil-devel The libavutil library is a utility library to aid portable multimedia @@ -491,10 +491,10 @@ Summary: Development files for the FFmpeg post-processing library Group: Development/Libraries/C and C++ Provides: libpostproc-devel = %version-%release Obsoletes: libpostproc-devel < %version-%release -Requires: %{name}-libavutil-devel = %version-%release +Requires: %name-libavutil-devel = %version-%release Requires: libpostproc55 = %version-%release -%devel_conflicts -c < -v %{_major_version} -%devel_conflicts -c >= -v %{_major_expected} +%devel_conflicts -c < -v %_major_version +%devel_conflicts -c >= -v %_major_expected %description libpostproc-devel A library with video postprocessing filters, such as deblocking and @@ -517,10 +517,10 @@ Summary: Development files for the FFmpeg software resampling library Group: Development/Libraries/C and C++ Provides: libswresample-devel = %version-%release Obsoletes: libswresample-devel < %version-%release -Requires: %{name}-libavutil-devel = %version-%release +Requires: %name-libavutil-devel = %version-%release Requires: libswresample3 = %version-%release -%devel_conflicts -c < -v %{_major_version} -%devel_conflicts -c >= -v %{_major_expected} +%devel_conflicts -c < -v %_major_version +%devel_conflicts -c >= -v %_major_expected %description libswresample-devel The libswresample library performs audio conversion between different @@ -542,10 +542,10 @@ Summary: Development files for FFmpeg's image scaling and colorspace libr Group: Development/Libraries/C and C++ Provides: libswscale-devel = %version-%release Conflicts: libswscale-devel -Requires: %{name}-libavutil-devel = %version-%release +Requires: %name-libavutil-devel = %version-%release Requires: libswscale5 = %version-%release -%devel_conflicts -c < -v %{_major_version} -%devel_conflicts -c >= -v %{_major_expected} +%devel_conflicts -c < -v %_major_version +%devel_conflicts -c >= -v %_major_expected %description libswscale-devel The libswscale library performs image scaling and colorspace and @@ -556,13 +556,13 @@ This subpackage contains the headers for FFmpeg libswscale. %package private-devel Summary: Some FFmpeg private headers Group: Development/Libraries/C and C++ -Requires: %{name}-libavcodec-devel = %version-%release -Requires: %{name}-libavformat-devel = %version-%release -Requires: %{name}-libavutil-devel = %version-%release +Requires: %name-libavcodec-devel = %version-%release +Requires: %name-libavformat-devel = %version-%release +Requires: %name-libavutil-devel = %version-%release Provides: ffmpeg-private-devel = %version Obsoletes: ffmpeg-private-devel < %version -%devel_conflicts -c < -v %{_major_version} -%devel_conflicts -c >= -v %{_major_expected} +%devel_conflicts -c < -v %_major_version +%devel_conflicts -c >= -v %_major_expected %description private-devel FFmpeg is a multimedia framework, able to decode, encode, @@ -580,10 +580,10 @@ break compatibility without any notice. %build %ifarch %ix86 %arm -%define _lto_cflags %{nil} +%define _lto_cflags %nil %endif CFLAGS="%optflags" \ -%if %{suse_version} > 1500 +%if %suse_version > 1500 %ifarch %ix86 %else LDFLAGS="%_lto_cflags" \