SHA256
1
0
forked from pool/ffmpeg-4

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

- Add conditional pkgconfig(aom) BuildRequires and pass
  --enable-libaom to configure as well as add libaom and libaom_av1
  to enable_decoders and enable_encoders: Build AOMedia Video 1
  (AV1) support.

OBS-URL: https://build.opensuse.org/request/show/627758
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=16
This commit is contained in:
Jan Engelhardt 2018-08-06 21:11:44 +00:00 committed by Git OBS Bridge
parent bc6dc60ca0
commit d813048738
4 changed files with 20 additions and 0 deletions

View File

@ -13,6 +13,8 @@ flac # libFLAC
gif # libpng gif # libpng
gsm # libgsm gsm # libgsm
huffyuv # trivial+zlib huffyuv # trivial+zlib
libaom # AV1
libaom_av1 # AV1
libcelt libcelt
libgsm libgsm
libopenjpeg libopenjpeg

View File

@ -8,6 +8,8 @@ flac # libFLAC
gif # libpng gif # libpng
huffyuv # trivial+zlib huffyuv # trivial+zlib
jpegls jpegls
libaom # AV1
libaom_av1 # AV1
libgsm libgsm
libmp3lame libmp3lame
libopenjpeg libopenjpeg

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Sun Aug 5 12:56:17 UTC 2018 - bjorn.lie@gmail.com
- Add conditional pkgconfig(aom) BuildRequires and pass
--enable-libaom to configure as well as add libaom and libaom_av1
to enable_decoders and enable_encoders: Build AOMedia Video 1
(AV1) support.
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jul 31 14:39:25 UTC 2018 - tchvatal@suse.com Tue Jul 31 14:39:25 UTC 2018 - tchvatal@suse.com

View File

@ -63,6 +63,7 @@
%endif %endif
%if 0%{?suse_version} > 1500 %if 0%{?suse_version} > 1500
%bcond_without libaom
%bcond_without mysofa %bcond_without mysofa
%bcond_without vidstab %bcond_without vidstab
%bcond_without srt %bcond_without srt
@ -73,6 +74,7 @@
%bcond_without soxr %bcond_without soxr
%bcond_without zmq %bcond_without zmq
%else %else
%bcond_with libaom
%bcond_with mysofa %bcond_with mysofa
%bcond_with vidstab %bcond_with vidstab
%bcond_with srt %bcond_with srt
@ -125,6 +127,9 @@ BuildRequires: libmysofa-devel
BuildRequires: nasm BuildRequires: nasm
BuildRequires: pkg-config BuildRequires: pkg-config
BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(alsa)
%if %{with libaom}
BuildRequires: pkgconfig(aom)
%endif
BuildRequires: pkgconfig(bzip2) BuildRequires: pkgconfig(bzip2)
BuildRequires: pkgconfig(celt) >= 0.11.0 BuildRequires: pkgconfig(celt) >= 0.11.0
%if %{with codec2} %if %{with codec2}
@ -580,6 +585,9 @@ CFLAGS="%optflags" \
%if ! %{with nvidia} %if ! %{with nvidia}
--disable-cuda \ --disable-cuda \
--disable-cuvid \ --disable-cuvid \
%endif
%if %{with libaom}
--enable-libaom \
%endif %endif
--enable-libass \ --enable-libass \
--enable-libbluray \ --enable-libbluray \