Hello community, here is the log from the commit of package ffmpeg for openSUSE:Factory checked in at 2016-01-23 01:16:05 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpeg (Old) and /work/SRC/openSUSE:Factory/.ffmpeg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpeg" Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg.changes 2015-11-18 22:32:32.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg.changes 2016-01-23 01:16:06.000000000 +0100 @@ -1,0 +2,78 @@ +Sun Jan 17 09:45:29 UTC 2016 - [email protected] + +- Update to version 2.8.5 +* Fixes CVE-2016-1897 and CVE-2016-1898 [boo#961937] + +------------------------------------------------------------------- +Mon Dec 28 13:51:18 UTC 2015 - [email protected] + +- Update to version 2.8.4 +* Many bugfixes, see the included Changelog for all the changes. +* resolving CVE-2015-8661 [boo#960385], CVE-2015-8662 [boo#960384], + CVE-2015-8663 [boo#960383] +- Drop ffmpeg-remove_some_unused_ctrl_id_mappings.patch, fixed + upstream. + +------------------------------------------------------------------- +Tue Dec 22 09:14:58 UTC 2015 - [email protected] + +- Obsolete ffmpeg-tools from packman + +------------------------------------------------------------------- +Mon Dec 21 12:37:05 UTC 2015 - [email protected] + +- Add some provides to make it easier for firefox to recommend + this package for installation + +------------------------------------------------------------------- +Sat Dec 19 13:05:31 UTC 2015 - [email protected] + +- Added patch ffmpeg-remove_some_unused_ctrl_id_mappings.patch to + successfully build against libvpx >= 1.5 (at least on PMBS). + +------------------------------------------------------------------- +Thu Dec 17 07:04:14 UTC 2015 - [email protected] + +- Add buildconditionals for libass,libva,vdpau to fix build in SLE_11 + +------------------------------------------------------------------- +Mon Dec 14 11:05:46 UTC 2015 - [email protected] + +- Rename bcond dca to dcadec +- Add more buildconditionals to get closer to removal of BUILD_ORIG + +------------------------------------------------------------------- +Wed Dec 9 13:23:44 UTC 2015 - [email protected] + +- Remove unused imlib2 + +------------------------------------------------------------------- +Mon Dec 7 12:18:36 UTC 2015 - [email protected] + +- Sync with packman changes + * All packman specific changes are protected with BUILD_ORIG +- Added the following patches + * ffmpeg-2.4.5-arm6l.patch + * ffmpeg-libcdio_cdda-pkgconfig.patch + +------------------------------------------------------------------- +Sun Nov 29 11:24:54 UTC 2015 - [email protected] + +- Update to new upstream maintenance release 2.8.3 +* avformat/matroskadec: Check subtitle stream before dereferencing +* avcodec/jpeg2000dec: Fix potential integer overflow with tile + dimensions +* avcodec/jpeg2000dec: Check for duplicate SIZ marker +* avcodec/jpeg2000: Change coord to 32bit to support larger than + 32k width or height +* avcodec/jpeg2000dec: Check SIZ dimensions to be within the + supported range +* avcodec/jpeg2000: Check comp coords to be within the supported + size +* dds: validate compressed source buffer size +* dds: validate source buffer size before copying +* softfloat: assert when the argument of av_sqrt_sf is negative +- Fixes CVE-2015-8363 [bnc#957114], CVE-2015-8364 [bnc#957115], + CVE-2015-8365 [bnc#957116] + +------------------------------------------------------------------- Old: ---- ffmpeg-2.8.2.tar.bz2 ffmpeg-2.8.2.tar.bz2.asc New: ---- ffmpeg-2.4.5-arm6l.patch ffmpeg-2.8.5.tar.bz2 ffmpeg-2.8.5.tar.bz2.asc ffmpeg-libcdio_cdda-pkgconfig.patch ffmpeg-rpmlintrc ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpeg.spec ++++++ --- /var/tmp/diff_new_pack.rD03K0/_old 2016-01-23 01:16:07.000000000 +0100 +++ /var/tmp/diff_new_pack.rD03K0/_new 2016-01-23 01:16:07.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package ffmpeg # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,47 +16,121 @@ # +%bcond_with dcadec +%bcond_with lame +%bcond_with librtmp +%bcond_with twolame +%bcond_with vo_aacenc +%bcond_with x264 +%bcond_with x265 +%bcond_with xvid +%bcond_without celt +%bcond_without libass +%bcond_without libva +%bcond_without openjpeg +%bcond_without vdpau +%bcond_without webp + Name: ffmpeg -Version: 2.8.2 +Version: 2.8.5 Release: 0 Summary: Library working with various multimedia formats License: LGPL-2.1+ and GPL-2.0+ Group: Productivity/Multimedia/Video/Editors and Convertors Url: https://ffmpeg.org/ - #Freshcode-URL: http://freshcode.club/projects/ffmpeg #Git-Clone: git://source.ffmpeg.org/ffmpeg Source: https://www.ffmpeg.org/releases/%name-%version.tar.bz2 Source2: https://www.ffmpeg.org/releases/%name-%version.tar.bz2.asc +Source3: ffmpeg-rpmlintrc Source99: baselibs.conf +Patch1: ffmpeg-libcdio_cdda-pkgconfig.patch +Patch2: ffmpeg-2.4.5-arm6l.patch +# +Provides: ffmpeg-tools = %{version} +Obsoletes: ffmpeg-tools < %{version} +# +BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: pkg-config BuildRequires: yasm BuildRequires: pkgconfig(alsa) BuildRequires: pkgconfig(bzip2) +%if %{with celt} +BuildRequires: pkgconfig(celt) >= 0.11.0 +%endif +BuildRequires: pkgconfig(enca) +BuildRequires: pkgconfig(fontconfig) >= 2.4.2 BuildRequires: pkgconfig(freetype2) -BuildRequires: pkgconfig(frei0r) +BuildRequires: pkgconfig(fribidi) >= 0.19.0 BuildRequires: pkgconfig(gnutls) BuildRequires: pkgconfig(jack) +%if %{with libass} +BuildRequires: pkgconfig(libass) +%endif BuildRequires: pkgconfig(libbluray) +BuildRequires: pkgconfig(libcdio) BuildRequires: pkgconfig(libcdio_paranoia) BuildRequires: pkgconfig(libdc1394-2) +BuildRequires: pkgconfig(liboil-0.3) >= 0.3.15 +%if %{with openjpeg} BuildRequires: pkgconfig(libopenjpeg) +%endif BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libraw1394) +%if %{with libva} BuildRequires: pkgconfig(libva) +%endif +%if %{with webp} +BuildRequires: pkgconfig(libwebp) >= 0.4 +%endif +BuildRequires: pkgconfig(ogg) BuildRequires: pkgconfig(opus) BuildRequires: pkgconfig(schroedinger-1.0) BuildRequires: pkgconfig(sdl) BuildRequires: pkgconfig(speex) -BuildRequires: pkgconfig(theora) +BuildRequires: pkgconfig(theora) >= 1.1 +%if %{with vdpau} BuildRequires: pkgconfig(vdpau) +%endif BuildRequires: pkgconfig(vorbis) -BuildRequires: pkgconfig(vpx) +BuildRequires: pkgconfig(vpx) >= 1.3.0 BuildRequires: pkgconfig(x11) +BuildRequires: pkgconfig(xcb) +BuildRequires: pkgconfig(xcb-render) +BuildRequires: pkgconfig(xcb-shape) +BuildRequires: pkgconfig(xcb-shm) +BuildRequires: pkgconfig(xcb-xfixes) BuildRequires: pkgconfig(xext) BuildRequires: pkgconfig(xfixes) BuildRequires: pkgconfig(zlib) +%if 0%{?BUILD_ORIG} +%if %{with librtmp} +BuildRequires: pkgconfig(librtmp) +%endif +%if %{with lame} +BuildRequires: libmp3lame-devel +%endif +%if %{with xvid} +BuildRequires: libxvidcore-devel +%endif +%if %{with dcadec} +BuildRequires: pkgconfig(dcadec) +%endif +BuildRequires: pkgconfig(opencore-amrnb) +%if %{with twolame} +BuildRequires: pkgconfig(twolame) +%endif +%if %{with vo_aacenc} +BuildRequires: pkgconfig(vo-aacenc) +%endif +%if %{with x264} +BuildRequires: pkgconfig(x264) +%endif +%if %{with x265} +BuildRequires: pkgconfig(x265) +%endif +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -69,6 +143,11 @@ %package -n libavcodec56 Summary: FFmpeg codec library Group: System/Libraries +# For mozillas +Provides: libavcodec = %version-%release +%if 0%{?BUILD_ORIG} +Provides: libavcodec-full = %version-%release +%endif %description -n libavcodec56 The libavcodec library provides a generic encoding/decoding framework @@ -283,10 +362,13 @@ %prep %setup -q +%patch1 -p1 +%patch2 -p1 %build perl -i -pe 's{__TIME__|__DATE__}{"$&"}g' *.c +%if !0%{?BUILD_ORIG} #image b="$b,012v,ansi,apng,bmp,flac,exr,ffv1,ffvhuff,gif,huffyuv" b="$b,jpegls,libopenjpeg,libtheora,libvpx,pam,pbm,pcx,pgm,png,pgmyuv,ppm" @@ -301,26 +383,37 @@ e="libvorbis" #other d="$d,otf,ttf,ass,srt,ssa,text" +%endif CFLAGS="%optflags" \ ./configure \ --prefix="%_prefix" --libdir="%_libdir" --shlibdir="%_libdir" \ --incdir="%_includedir/ffmpeg" \ --extra-cflags="%optflags" --optflags="%optflags" \ + --disable-htmlpages \ --enable-pic --disable-stripping \ --enable-shared --disable-static \ --enable-runtime-cpudetect \ --enable-gpl \ --disable-openssl \ --enable-avresample \ - --enable-frei0r \ + --enable-libcdio \ --enable-gnutls \ + --enable-ladspa \ +%if %{with libass} + --enable-libass \ +%endif --enable-libbluray \ +%if %{with celt} + --enable-libcelt \ +%endif --enable-libcdio \ --enable-libdc1394 \ --enable-libfreetype \ --enable-libgsm \ +%if %{with openjpeg} --enable-libopenjpeg \ +%endif --enable-libopus \ --enable-libpulse \ --enable-libschroedinger \ @@ -328,16 +421,48 @@ --enable-libtheora \ --enable-libvorbis \ --enable-libvpx \ +%if %{with webp} + --enable-libwebp \ +%endif --enable-pic \ --enable-pthreads \ +%if %{with libva} --enable-vaapi \ +%endif +%if %{with vdpau} --enable-vdpau \ -%if !0%{?BUILD_ORIG} +%endif +%if 0%{?BUILD_ORIG} +%if %{with dcadec} + --disable-decoder="dca" \ + --enable-libdcadec \ +%endif +%if %{with lame} + --enable-libmp3lame \ +%endif + --enable-libopencore-amrnb \ + --enable-libopencore-amrwb \ + --enable-version3 \ +%if %{with twolame} + --enable-libtwolame \ +%endif +%if %{with vo_aacenc} + --enable-libvo-aacenc \ +%endif +%if %{with x264} + --enable-libx264 \ +%endif +%if %{with x265} + --enable-libx265 \ +%endif +%if %{with xvid} + --enable-libxvid \ +%endif +%else --disable-encoders \ --disable-decoders \ --disable-muxers \ --disable-demuxers \ - --enable-libschroedinger \ --enable-encoder="$b,$e" \ --enable-decoder="$b,$d" \ --enable-muxer="flac,gif,image2,image2pipe,matroska,matroska_audio,null,webm" \ @@ -346,7 +471,8 @@ --enable-x11grab make %{?_smp_mflags} -%global extratools aviocat graph2dot ismindex pktdumper qt-faststart trasher cws2fws +%global extratools aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper probetest qt-faststart seek_print trasher + for i in %extratools; do make "tools/$i" done ++++++ ffmpeg-2.4.5-arm6l.patch ++++++ --- libavutil/arm/timer.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Index: ffmpeg-2.8.3/libavutil/arm/timer.h =================================================================== --- ffmpeg-2.8.3.orig/libavutil/arm/timer.h +++ ffmpeg-2.8.3/libavutil/arm/timer.h @@ -24,7 +24,7 @@ #include <stdint.h> #include "config.h" -#if HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__) +#if HAVE_INLINE_ASM && defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_6ZK__) #define AV_READ_TIME read_time ++++++ ffmpeg-2.8.2.tar.bz2 -> ffmpeg-2.8.5.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg-2.8.2.tar.bz2 /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg-2.8.5.tar.bz2 differ: char 11, line 1 ++++++ ffmpeg-libcdio_cdda-pkgconfig.patch ++++++ --- configure | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) Index: ffmpeg-2.8.3/configure =================================================================== --- ffmpeg-2.8.3.orig/configure +++ ffmpeg-2.8.3/configure @@ -5453,8 +5453,9 @@ enabled jack_indev && check_lib2 jack/ja enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio if enabled libcdio; then - check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio || - check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open -lcdio_paranoia -lcdio_cdda -lcdio || +# cdio_cdda needs -lrt, get it from pkg-config from the external pkg + check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open `pkg-config --libs libcdio_paranoia` `pkg-config --libs libcdio_cdda` `pkg-config --libs libcdio` || + check_lib2 "cdio/paranoia/cdda.h cdio/paranoia/paranoia.h" cdio_cddap_open `pkg-config --libs libcdio_paranoia` `pkg-config --libs libcdio_cdda` `pkg-config --libs libcdio` || die "ERROR: No usable libcdio/cdparanoia found" fi ++++++ ffmpeg-rpmlintrc ++++++ # manpages for such executables aren't supplied addFilter("no-manual-page-for-binary") # our libraries really have those names and versions addFilter("shlib-fixed-dependency") addFilter("no-dependency-on libffmpeg.*")
