Commit 03cafe63 authored by Matti Lehtimäki's avatar Matti Lehtimäki

Merge branch 'jb48620' into 'master'

[ffmpeg] Update to version 4.2.2. Fixes JB#48620

See merge request !3
parents ca2b8e68 0d922e73
[submodule "upstream"]
path = upstream
url = https://git.merproject.org/mirror/ffmpeg.git
url = https://git.sailfishos.org/mirror/ffmpeg.git
Name: ffmpeg
Version: 4.1.1
Version: 4.2.2
Release: 1
Summary: FFmpeg video encoding and decoding library
Group: Productivity/Multimedia/Video/Editors and Convertors
......@@ -8,8 +8,13 @@ Source: http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
Source1: enable_decoders
Source2: enable_encoders
License: LGPLv2+
BuildRequires: pkgconfig(libopenjp2)
BuildRequires: pkgconfig(libpulse)
BuildRequires: pkgconfig(libwebp)
BuildRequires: pkgconfig(speex)
BuildRequires: pkgconfig(theora)
BuildRequires: pkgconfig(vorbis)
BuildRequires: pkgconfig(vpx)
BuildRequires: pkgconfig(zlib)
Conflicts: libav
%ifarch i486 x86_64
......@@ -47,7 +52,8 @@ sed -i 's/sed -E/sed -r/g' ./configure
./configure --prefix=/usr --libdir=%{_libdir} --disable-debug --enable-shared --enable-pic \
--disable-static --disable-doc --enable-muxers --enable-demuxers --enable-protocols \
--disable-indevs --disable-outdevs --disable-bsfs --enable-network --disable-hwaccels \
--enable-libpulse --enable-libspeex --disable-encoders --disable-decoders \
--enable-libopenjpeg --enable-libpulse --enable-libspeex --enable-libtheora \
--enable-libvorbis --enable-libvpx --enable-libwebp --disable-encoders --disable-decoders \
--enable-encoder="$(perl -pe 's{^(\w*).*}{$1,}gs' <%_sourcedir/enable_encoders)" \
--enable-decoder="$(perl -pe 's{^(\w*).*}{$1,}gs' <%_sourcedir/enable_decoders)" \
......@@ -160,6 +166,7 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/libavutil/file.h
%{_includedir}/libavutil/frame.h
%{_includedir}/libavutil/hash.h
%{_includedir}/libavutil/hdr_dynamic_metadata.h
%{_includedir}/libavutil/hmac.h
%{_includedir}/libavutil/hwcontext.h
%{_includedir}/libavutil/hwcontext_cuda.h
......@@ -205,6 +212,7 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/libavutil/timestamp.h
%{_includedir}/libavutil/tree.h
%{_includedir}/libavutil/twofish.h
%{_includedir}/libavutil/tx.h
%{_includedir}/libavutil/version.h
%{_includedir}/libavutil/xtea.h
%dir %{_includedir}/libswresample
......
Subproject commit 74700e50bf7444930bfc12935bd3e17cd5f766c1
Subproject commit 192d1d34eb3668fa27f433e96036340e1e5077a0
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment