Hello community, here is the log from the commit of package ffmpeg for openSUSE:Factory checked in at 2018-03-28 10:27:27 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/ffmpeg (Old) and /work/SRC/openSUSE:Factory/.ffmpeg.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ffmpeg" Wed Mar 28 10:27:27 2018 rev:41 rq:591095 version:3.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/ffmpeg/ffmpeg.changes 2018-02-25 12:21:41.477007087 +0100 +++ /work/SRC/openSUSE:Factory/.ffmpeg.new/ffmpeg.changes 2018-03-28 10:27:33.261303337 +0200 @@ -1,0 +2,15 @@ +Fri Mar 23 10:54:48 UTC 2018 - [email protected] + +- Create a new package ffmpeg-private-devel which contains some + headers under /usr/include/ffmpeg/private that were not installed + by upstream. Those headers are needed by the libav package in order + to build avconv and other tools using the libav* libraries generated + by ffmpeg instead of its own. No other package should require + ffmpeg-private-devel. + +------------------------------------------------------------------- +Wed Mar 21 16:04:32 UTC 2018 - [email protected] + +- Build and install also the sidxindex tool + +------------------------------------------------------------------- @@ -85,0 +101 @@ +- Fixed a denial of service in rtmppkt [boo#1082335, CVE-2017-11665] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ ffmpeg.spec ++++++ --- /var/tmp/diff_new_pack.e86Oem/_old 2018-03-28 10:27:35.537221495 +0200 +++ /var/tmp/diff_new_pack.e86Oem/_new 2018-03-28 10:27:35.541221352 +0200 @@ -36,7 +36,7 @@ Version: 3.4.2 Release: 0 Summary: Library for working with various multimedia formats -License: LGPL-2.1+ and GPL-2.0+ +License: LGPL-2.1-or-later AND GPL-2.0-or-later Group: Productivity/Multimedia/Video/Editors and Convertors Url: https://ffmpeg.org/ @@ -395,6 +395,22 @@ This subpackage contains the headers for FFmpeg libswscale. +%package private-devel +Summary: Some FFmpeg private headers +Group: Development/Libraries/C and C++ +Requires: libavcodec-devel = %version-%release +Requires: libavformat-devel = %version-%release +Requires: libavutil-devel = %version-%release + +%description private-devel +FFmpeg is a multimedia framework, able to decode, encode, +transcode, mux, demux, stream, filter and play several formats +that humans and machines have created. + +This package contains some private headers for libavformat, libavcodec and +libavutil which are needed by libav-tools to build. No other package apart +from libav should depend on these private headers which are expected to +break compatibility without any notice. %prep %setup -q @@ -479,7 +495,7 @@ cat config.h make %{?_smp_mflags} V=1 -%global extratools aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper probetest qt-faststart seek_print trasher +%global extratools aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper probetest qt-faststart seek_print sidxindex trasher for i in %extratools; do make "tools/$i" @@ -493,6 +509,16 @@ cp -a "tools/$i" "$b/%_bindir/" done +# Install private headers required by libav-tools +for i in libavformat/options_table.h libavformat/os_support.h \ + libavformat/internal.h libavcodec/options_table.h libavutil/libm.h \ + libavutil/internal.h libavutil/colorspace.h libavutil/timer.h \ + libavutil/x86/emms.h libavutil/aarch64/timer.h libavutil/arm/timer.h \ + libavutil/bfin/timer.h libavutil/ppc/timer.h libavutil/x86/timer.h; do + mkdir -p "$b/%_includedir/ffmpeg/private/"`dirname $i` + cp -a $i "$b/%_includedir/ffmpeg/private/$i" +done + %post -n libavcodec57 -p /sbin/ldconfig %postun -n libavcodec57 -p /sbin/ldconfig %post -n libavdevice57 -p /sbin/ldconfig @@ -625,4 +651,8 @@ %_libdir/pkgconfig/libswscale.pc %_mandir/man3/libswscale.3* +%files private-devel +%defattr(-,root,root) +%_includedir/ffmpeg/private/ + %changelog
