dirkmueller/ffmpeg-4
SHA256
1
0
Fork 0
forked from pool/ffmpeg-4
Code Pull Requests Activity

Accepting request 666332 from home:iznogood:branches:multimedia:libs

Browse Source 
- 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
This commit is contained in:
Jan Engelhardt 2019-01-15 22:35:26 +00:00 committed by Git OBS Bridge
parent b1cb1b22e3
commit 401e2d934e
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ffmpeg-4.changes
View File

@ -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 <stefan.bruens@rwth-aachen.de> Wed Dec 5 18:07:58 UTC 2018 - Stefan Brüns <stefan.bruens@rwth-aachen.de>

10
ffmpeg-4.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package ffmpeg-4 # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -44,6 +44,7 @@
%bcond_without nvcodec %bcond_without nvcodec
%endif %endif
%if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG}
%bcond_with amrwb
%bcond_without cuda_sdk %bcond_without cuda_sdk
%else %else
%bcond_with cuda_sdk %bcond_with cuda_sdk
@ -219,6 +220,9 @@ BuildRequires: libxvidcore-devel
%if %{with opencore} %if %{with opencore}
BuildRequires: pkgconfig(opencore-amrnb) BuildRequires: pkgconfig(opencore-amrnb)
%endif %endif
%if %{with amrwb}
BuildRequires: pkgconfig(vo-amrwbenc)
%endif
%if %{with x264} %if %{with x264}
BuildRequires: pkgconfig(x264) BuildRequires: pkgconfig(x264)
%endif %endif
@ -653,6 +657,10 @@ CFLAGS="%optflags" \
--enable-libopencore-amrwb \ --enable-libopencore-amrwb \
--enable-version3 \ --enable-version3 \
%endif %endif
%if %{with amrwb}
--enable-libvo-amrwbenc \
--enable-version3 \
%endif
%if %{with x264} %if %{with x264}
--enable-libx264 \ --enable-libx264 \
%endif %endif