Accepting request 629391 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/629391 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-4?expand=0&rev=3
2018-08-17 22:00:21 +00:00 · 2018-08-17 22:00:21 +00:00 · 329d375c2c
commit 329d375c2c
parent 468760bea8 019507f81a
8 changed files with 147 additions and 91 deletions
--- a/25
+++ b/25
@ -1,3 +1,4 @@
+## module name # reason for enablement in ffmpeg (usually there is another package that already got legal review)
 ac3
 ansi # trivial
 apng
@ -13,15 +14,18 @@ flac # libFLAC
 gif # libpng
 gsm # libgsm
 huffyuv # trivial+zlib
-libcelt
-libgsm
-libopenjpeg
-libopus
-libschroedinger
-libspeex
-libvorbis
-libvpx_vp8
-libvpx_vp9
+libaom # libaom
+libaom_av1 # libaom
+libcelt # celt, opus
+libcodec2 # codec2
+libgsm # libgsm
+libopenjpeg # openjpeg
+libopus # opus
+libschroedinger # schroedinger
+libspeex # speex
+libvorbis # libvorbis
+libvpx_vp8 # libvpx
+libvpx_vp9 # libvpx
 mjpeg # mjpegtools
 mpeg1video
 mpeg2video
@ -91,8 +95,9 @@ vp6f # libav
 vp8 # libvpx
 vp9 # libvpx
 webp # libwebp
+webvtt # trivial
 xbm # trivial
 xwd # xwd
 y41p # trivial
 yuv4 # trivial
-zlib # pseudo
+zlib # zlib
--- a/121
+++ b/121
@ -1,3 +1,4 @@
+## module name # reason for enablement in ffmpeg (usually there is another package that already got legal review)
 apng # libpng
 ass # trivial
 ayuv # trival
@ -8,69 +9,75 @@ flac # libFLAC
 gif # libpng
 huffyuv # trivial+zlib
 jpegls
-libgsm
-libmp3lame
-libopenjpeg
-libopus
-libschroedinger
-libspeex
-libtheora
-libtwolame
-libvorbis
+libaom # libaom
+libaom_av1 # libaom
+libcodec2 # codec2
+libgsm # libgsm
+libmp3lame # lame
+libopenjpeg # openjpeg
+libopus # opus
+libschroedinger # schroedinger
+libspeex # speex
+libtheora # libtheora
+libtwolame # twolame
+libvorbis # libvorbis
 libvpx_vp8
 libvpx_vp9
 libwebp
 libwebp_anim
 mjpeg # mjpegtools
+mpeg1video
+mpeg2video
 mp2 # twolame
 mp2fixed # twolame
-opus
+opus # opus
 pam
-pbm
-pcm_alaw
-pcm_f32be
-pcm_f32le
-pcm_f64be
-pcm_f64le
-pcm_mulaw
-pcm_s16be
-pcm_s16be_planar
-pcm_s16le
-pcm_s16le_planar
-pcm_s24be
-pcm_s24le
-pcm_s24le_planar
-pcm_s32be
-pcm_s32le
-pcm_s32le_planar
-pcm_s8
-pcm_s8_planar
-pcm_u16be
-pcm_u16le
-pcm_u24be
-pcm_u24le
-pcm_u32be
-pcm_u32le
-pcm_u8
+pbm # trivial
+pcm_alaw # trivial
+pcm_f32be # trivial
+pcm_f32le # trivial
+pcm_f64be # trivial
+pcm_f64le # trivial
+pcm_mulaw # trivial
+pcm_s16be # trivial
+pcm_s16be_planar # trivial
+pcm_s16le # trivial
+pcm_s16le_planar # trivial
+pcm_s24be # trivial
+pcm_s24le # trivial
+pcm_s24le_planar # trivial
+pcm_s32be # trivial
+pcm_s32le # trivial
+pcm_s32le_planar # trivial
+pcm_s8 # trivial
+pcm_s8_planar # trivial
+pcm_u16be # trivial
+pcm_u16le # trivial
+pcm_u24be # trivial
+pcm_u24le # trivial
+pcm_u32be # trivial
+pcm_u32le # trivial
+pcm_u8 # trivial
 pcx
-pgm
-pgmyuv
-png
-ppm
-sgi
-srt
-ssa
-sunrast
-targa
-text
-tiff
-v210
-v308
-v408
-v410
-vorbis
-xbm
-xwd
-y41p
-yuv4
-zlib
+pgm # trivial
+pgmyuv # trivial
+png # libpng
+ppm # trivial
+sgi # trivial
+srt # trivial
+ssa # trivial
+sunrast # trivial
+targa # trivial
+text # trivial
+tiff # libtiff
+v210 # trivial
+v308 # trivial
+v408 # trivial
+v410 # trivial
+vorbis # libvorbis
+webvtt # trivial
+xbm # (X11)
+xwd # xwd
+y41p # trivial
+yuv4 # trivial
+zlib # zlib
--- a/ffmpeg-4.0.1.tar.xz
+++ b/ffmpeg-4.0.1.tar.xz
@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:605f5c01c60db35d3b617a79cabb2c7032412be243554602eeed1b628125c0ee
-size 8663660
--- a/ffmpeg-4.0.1.tar.xz.asc
+++ b/ffmpeg-4.0.1.tar.xz.asc
@ -1,11 +0,0 @@
-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1
-
-iQEcBAABAgAGBQJbJGabAAoJELQyLwTWdljYYtUH/1zw4/Fm1O7MfNGZjnpgA5b2
-+1QxLIKPuZMNG6PjNwkqO1U7LxIB9KD3VXf3I43YqF6cJK8S8fasSWk4fQLaFAem
-kcDN0dGw3l4YdnfM14pnz/OzovqeatpdlBKmMkkWZBHk9jYQThY+5+QajwzHGq/Q
-fdRhbgrPFCjk7GnF4+/e5CBiB3p9qWhDcsUf9pqKeq5GCqAcK4Oqi2ko0/RRFw1p
-NF9OaWqygZ/C/Si4E+x4b2v5KEreh1HOAtmMRsZ6grPvQ2nPoO+KFt5fZQM18ILZ
-ulAcDOj5N5n8wP+hGKzKq9ZKDayfg9OIgTfsPlxH1i0To0+p+2q2mDVugm1LWBA=
-=bhrG
-----END PGP SIGNATURE-----
--- a/ffmpeg-4.0.2.tar.xz
+++ b/ffmpeg-4.0.2.tar.xz
@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97
+size 8662984
--- a/ffmpeg-4.0.2.tar.xz.asc
+++ b/ffmpeg-4.0.2.tar.xz.asc
@ -0,0 +1,11 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1
+
+iQEcBAABAgAGBQJbT0bXAAoJELQyLwTWdljYa7EIAIkBwOpBdZNuVvD2aNH82zmP
+1lnqsSFaO/OlQrs7M0cOGXgqmkIkVQZerWwO+VRct5oYut+MNCqVfT8L2pTNcHNW
+6aE3Jtvw00zwklNKI9e4oktypvcbe8m40QgPvNPu8lxiGZvafvGy53ioVI2eANFj
+PD2+BUGTRuotbm8skOpGTkU+RL74oPCdHEP9OcL3K4XnDFDMCXkjk34xCs4pnkV0
+2rVOque36M54DHQHa+qD1hxiqWiAyhEPnCklRwTRLLwPQuLiBDi/vExvDTsJHIuU
+AfdSsykmJz3c6biKOKOP6GYW7UjfsiIOV+G+uuZGJ/eBw0zXc38l8Rc7C1Kwmj4=
+=9xRf
+-----END PGP SIGNATURE-----
--- a/ffmpeg-4.changes
+++ b/ffmpeg-4.changes
@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Mon Aug 13 18:07:13 UTC 2018 - bjorn.lie@gmail.com
+
+- Update to version 4.0.2:
+  * Various bugfixes and a revert.
+
+-------------------------------------------------------------------
+Sat Aug 11 08:28:47 UTC 2018 - carmen@carmenbianca.eu
+
+- bsc#1092241 Enable webvtt encoders and decoders.
+
+-------------------------------------------------------------------
+Tue Aug  7 22:28:52 UTC 2018 - bjorn.lie@gmail.com
+
+- Build codec2 encoder and decoder, add libcodec2 to
+  enable_decoders and enable_encoders.
+
+-------------------------------------------------------------------
+Mon Aug  6 07:40:15 UTC 2018 - davejplater@gmail.com
+
+- Enable mpeg 1 and 2 encoders.
+
+-------------------------------------------------------------------
+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
+
+- bsc#1103064 attempt to allow migration from the unprefixed devel
+  packages cleanly
+
 -------------------------------------------------------------------
 Fri Jul 27 08:56:56 UTC 2018 - tchvatal@suse.com

--- a/ffmpeg-4.spec
+++ b/ffmpeg-4.spec
@ -63,6 +63,7 @@
 %endif

 %if 0%{?suse_version} > 1500
+%bcond_without libaom
 %bcond_without mysofa
 %bcond_without vidstab
 %bcond_without srt
@ -73,6 +74,7 @@
 %bcond_without soxr
 %bcond_without zmq
 %else
+%bcond_with libaom
 %bcond_with mysofa
 %bcond_with vidstab
 %bcond_with srt
@ -96,7 +98,7 @@
 %define _major_version 4
 %define _major_expected 5
 Name:           ffmpeg-4
-Version:        4.0.1
+Version:        4.0.2
 Release:        0
 Summary:        Library for working with various multimedia formats
 License:        LGPL-2.1-or-later AND GPL-2.0-or-later
@ -125,6 +127,9 @@ BuildRequires:  libmysofa-devel
 BuildRequires:  nasm
 BuildRequires:  pkg-config
 BuildRequires:  pkgconfig(alsa)
+%if %{with libaom}
+BuildRequires:  pkgconfig(aom)
+%endif
 BuildRequires:  pkgconfig(bzip2)
 BuildRequires:  pkgconfig(celt) >= 0.11.0
 %if %{with codec2}
@ -270,7 +275,7 @@ This build of ffmpeg is limited in the number of codecs supported.
 Summary:        Development files for FFmpeg's codec library
 Group:          Development/Libraries/C and C++
 Provides:       libavcodec-devel = %version-%release
-Conflicts:      libavcodec-devel
+Obsoletes:      libavcodec-devel < %version-%release
 Requires:       %{name}-libavresample-devel = %version-%release
 Requires:       %{name}-libavutil-devel = %version-%release
 Requires:       libavcodec58 = %version-%release
@ -304,7 +309,7 @@ Group:          Development/Libraries/C and C++
 Provides:       ffmpeg-devel = %version-%release
 Conflicts:      ffmpeg-devel
 Provides:       libavdevice-devel = %version-%release
-Conflicts:      libavdevice-devel
+Obsoletes:      libavdevice-devel < %version-%release
 Requires:       %{name}-libavcodec-devel = %version-%release
 Requires:       %{name}-libavfilter-devel = %version-%release
 Requires:       %{name}-libavformat-devel = %version-%release
@ -344,7 +349,7 @@ framework containing several filters, sources and sinks.
 Summary:        Development files for FFmpeg's audio/video filter library
 Group:          Development/Libraries/C and C++
 Provides:       libavfilter-devel = %version-%release
-Conflicts:      libavfilter-devel
+Obsoletes:      libavfilter-devel < %version-%release
 Requires:       %{name}-libavcodec-devel = %version-%release
 Requires:       %{name}-libavformat-devel = %version-%release
 Requires:       %{name}-libavresample-devel = %version-%release
@ -382,7 +387,7 @@ This build of ffmpeg is limited in the number of codecs supported.
 Summary:        Development files for FFmpeg's stream format library
 Group:          Development/Libraries/C and C++
 Provides:       libavformat-devel = %version-%release
-Conflicts:      libavformat-devel
+Obsoletes:      libavformat-devel < %version-%release
 Requires:       %{name}-libavcodec-devel = %version-%release
 Requires:       %{name}-libavutil-devel = %version-%release
 Requires:       %{name}-libswresample-devel = %version-%release
@ -413,7 +418,7 @@ It is advised to use libswresample for new code.
 Summary:        Development files for libavresample as present in FFmpeg
 Group:          Development/Libraries/C and C++
 Provides:       libavresample-devel = %version-%release
-Conflicts:      libavresample-devel
+Obsoletes:      libavresample-devel < %version-%release
 Requires:       %{name}-libavutil-devel = %version-%release
 Requires:       libavresample4 = %version-%release
 %devel_conflicts -c < -v %{_major_version}
@ -442,7 +447,7 @@ for pixel and sample formats).
 Summary:        Development files for FFmpeg's utility library
 Group:          Development/Libraries/C and C++
 Provides:       libavutil-devel = %version-%release
-Conflicts:      libavutil-devel
+Obsoletes:      libavutil-devel < %version-%release
 Requires:       libavutil56 = %version-%release
 %devel_conflicts -c < -v %{_major_version}
 %devel_conflicts -c >= -v %{_major_expected}
@ -470,7 +475,7 @@ correction, linear/cubic interpolating deinterlacing.
 Summary:        Development files for the FFmpeg post-processing library
 Group:          Development/Libraries/C and C++
 Provides:       libpostproc-devel = %version-%release
-Conflicts:      libpostproc-devel
+Obsoletes:      libpostproc-devel < %version-%release
 Requires:       %{name}-libavutil-devel = %version-%release
 Requires:       libpostproc55 = %version-%release
 %devel_conflicts -c < -v %{_major_version}
@ -496,7 +501,7 @@ sample rates, channel layout and channel formats.
 Summary:        Development files for the FFmpeg software resampling library
 Group:          Development/Libraries/C and C++
 Provides:       libswresample-devel = %version-%release
-Conflicts:      libswresample-devel
+Obsoletes:      libswresample-devel < %version-%release
 Requires:       %{name}-libavutil-devel = %version-%release
 Requires:       libswresample3 = %version-%release
 %devel_conflicts -c < -v %{_major_version}
@ -540,7 +545,7 @@ Requires:       %{name}-libavcodec-devel = %version-%release
 Requires:       %{name}-libavformat-devel = %version-%release
 Requires:       %{name}-libavutil-devel = %version-%release
 Provides:       ffmpeg-private-devel = %version
-Conflicts:      ffmpeg-private-devel
+Obsoletes:      ffmpeg-private-devel < %version
 %devel_conflicts -c < -v %{_major_version}
 %devel_conflicts -c >= -v %{_major_expected}

@ -580,6 +585,9 @@ CFLAGS="%optflags" \
 %if ! %{with nvidia}
 	--disable-cuda \
 	--disable-cuvid \
+%endif
+%if %{with libaom}
+	--enable-libaom \
 %endif
 	--enable-libass \
 	--enable-libbluray \