Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch 'jb48620' into 'master'
[ffmpeg] Update to version 4.2.2. Fixes JB#48620

See merge request mer-core/ffmpeg!3
  • Loading branch information
mlehtima committed Jan 20, 2020
2 parents ca2b8e6 + 0d922e7 commit 03cafe6
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 4 deletions.
2 changes: 1 addition & 1 deletion .gitmodules
@@ -1,3 +1,3 @@
[submodule "upstream"]
path = upstream
url = https://git.merproject.org/mirror/ffmpeg.git
url = https://git.sailfishos.org/mirror/ffmpeg.git
12 changes: 10 additions & 2 deletions rpm/ffmpeg.spec
@@ -1,5 +1,5 @@
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
Expand All @@ -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
Expand Down Expand Up @@ -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)" \

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion upstream
Submodule upstream updated from 74700e to 192d1d

0 comments on commit 03cafe6

Please sign in to comment.