From 401e2d934ed5adab1f8a6417a8b1d3f86886f33361526a23a3e28eaeeb459d8e Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 15 Jan 2019 22:35:26 +0000 Subject: [PATCH] Accepting request 666332 from home:iznogood:branches:multimedia:libs - Add conditional pkgconfig(vo-amrwbenc) BuildRequires and conditionally pass --enable-libvo-amrwbenc --enable-version3 to configure: build amrwb encoder if dependency is present. OBS-URL: https://build.opensuse.org/request/show/666332 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=37 --- ffmpeg-4.changes | 7 +++++++ ffmpeg-4.spec | 10 +++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 46319f0..c38a464 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Jan 15 20:45:50 UTC 2019 - bjorn.lie@gmail.com + +- Add conditional pkgconfig(vo-amrwbenc) BuildRequires and + conditionally pass --enable-libvo-amrwbenc --enable-version3 to + configure: build amrwb encoder if dependency is present. + ------------------------------------------------------------------- Wed Dec 5 18:07:58 UTC 2018 - Stefan BrĂ¼ns diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 3b9abbd..510a059 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -1,7 +1,7 @@ # # spec file for package ffmpeg-4 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -44,6 +44,7 @@ %bcond_without nvcodec %endif %if 0%{?BUILD_ORIG} +%bcond_with amrwb %bcond_without cuda_sdk %else %bcond_with cuda_sdk @@ -219,6 +220,9 @@ BuildRequires: libxvidcore-devel %if %{with opencore} BuildRequires: pkgconfig(opencore-amrnb) %endif +%if %{with amrwb} +BuildRequires: pkgconfig(vo-amrwbenc) +%endif %if %{with x264} BuildRequires: pkgconfig(x264) %endif @@ -653,6 +657,10 @@ CFLAGS="%optflags" \ --enable-libopencore-amrwb \ --enable-version3 \ %endif +%if %{with amrwb} + --enable-libvo-amrwbenc \ + --enable-version3 \ +%endif %if %{with x264} --enable-libx264 \ %endif