From 996c1e0368d3abc7d5c88c656807860563e428c2e09e03be9ad33aaf841a180f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 18 Jul 2018 12:16:12 +0000 Subject: [PATCH] Accepting request 623645 from home:scarabeus_iv:branches:OBS_Maintained:chromium SLE-12 Backports support OBS-URL: https://build.opensuse.org/request/show/623645 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=7 --- ffmpeg-4.changes | 11 +++++++++++ ffmpeg-4.spec | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 44 insertions(+) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index f9ea0b3..63d664c 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +Wed Jul 18 12:13:38 UTC 2018 - tchvatal@suse.com + +- Add new bconds to build on SLE12 backports project without + requiring extra packages: + * %bcond_without codec2 + * %bcond_without bs2b + * %bcond_without lv2 + * %bcond_without rubberband + * %bcond_without soxr + ------------------------------------------------------------------- Fri Jul 6 10:54:14 UTC 2018 - tchvatal@suse.com diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 22a842a..7f40e95 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -75,6 +75,21 @@ %bcond_with openmpt %endif +%if 0%{?suse_version} > 1500 || 0%{?is_opensuse} +%bcond_without codec2 +%bcond_without bs2b +%bcond_without lv2 +%bcond_without rubberband +%bcond_without soxr +%else +# backports SLE12 +%bcond_with codec2 +%bcond_with bs2b +%bcond_with lv2 +%bcond_with rubberband +%bcond_with soxr +%endif + %define _name ffmpeg %define _major_version 4 %define _major_expected 5 @@ -110,7 +125,9 @@ BuildRequires: pkg-config BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(celt) >= 0.11.0 +%if %{with codec2} BuildRequires: pkgconfig(codec2) +%endif BuildRequires: pkgconfig(enca) BuildRequires: pkgconfig(fontconfig) >= 2.4.2 BuildRequires: pkgconfig(freetype2) @@ -119,7 +136,9 @@ BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(jack) BuildRequires: pkgconfig(libass) BuildRequires: pkgconfig(libbluray) +%if %{with bs2b} BuildRequires: pkgconfig(libbs2b) +%endif BuildRequires: pkgconfig(libcdio) BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libdc1394-2) @@ -139,12 +158,18 @@ BuildRequires: pkgconfig(libva) >= 0.35.0 BuildRequires: pkgconfig(libwebp) >= 0.4 BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(libzmq) +%if %{with lv2} BuildRequires: pkgconfig(lilv-0) +%endif BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(opus) +%if %{with rubberband} BuildRequires: pkgconfig(rubberband) +%endif BuildRequires: pkgconfig(sdl2) +%if %{with soxr} BuildRequires: pkgconfig(soxr) +%endif BuildRequires: pkgconfig(speex) %if %{with srt} BuildRequires: pkgconfig(srt) @@ -555,7 +580,9 @@ CFLAGS="%optflags" \ --enable-libbluray \ --enable-libcelt \ --enable-libcdio \ +%if %{with codec2} --enable-libcodec2 \ +%endif --enable-libdc1394 \ --enable-libfontconfig \ --enable-libfreetype \ @@ -572,8 +599,12 @@ CFLAGS="%optflags" \ %endif --enable-libopus \ --enable-libpulse \ +%if %{with rubberband} --enable-librubberband \ +%endif +%if %{with soxr} --enable-libsoxr \ +%endif --enable-libspeex \ --enable-libssh \ %if %{with srt} @@ -594,7 +625,9 @@ CFLAGS="%optflags" \ %endif --enable-libzmq \ --enable-libzvbi \ +%if %{with lv2} --enable-lv2 \ +%endif --enable-vaapi \ --enable-vdpau \ %if %{with fdk_aac}