X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=ffmpeg.spec;h=504fcc77854d7967b10cbd979b9a9d668c9c4254;hb=30dac56;hp=8b0b4ef427315888c456b897d80a876e0c6ca741;hpb=44f5d561c1548bcd2d2677f0c5ddfdf3d0827ba7;p=packages%2Fffmpeg.git diff --git a/ffmpeg.spec b/ffmpeg.spec index 8b0b4ef..504fcc7 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -77,18 +77,15 @@ Summary: FFmpeg - a very fast video and audio converter Summary(pl.UTF-8): FFmpeg - szybki konwerter audio/wideo Name: ffmpeg -Version: 3.4.1 -Release: 2 +Version: 4.1 +Release: 4 # LGPL or GPL, chosen at configure time (GPL version is more featured) # (postprocessing, some filters, x264, x265, xavs, xvid, xcbgrab) # using v3 allows Apache-licensed libs (opencore-amr, libvo-*enc) License: GPL v3+ with LGPL v3+ parts Group: Applications/Multimedia Source0: http://ffmpeg.org/releases/%{name}-%{version}.tar.xz -# Source0-md5: 726212db1b8a7eff6c25a2bc2e6fa75c -Source1: ffserver.init -Source2: ffserver.sysconfig -Source3: ffserver.conf +# Source0-md5: b011c94e075c2d0cd7c914730f55f9a9 Patch0: %{name}-omx-libnames.patch URL: http://www.ffmpeg.org/ %{?with_decklink:BuildRequires: Blackmagic_DeckLink_SDK >= 10.6.1} @@ -100,6 +97,7 @@ URL: http://www.ffmpeg.org/ BuildRequires: SDL2-devel >= 2.0.1 BuildRequires: SDL2-devel < 2.1.0 BuildRequires: alsa-lib-devel +BuildRequires: aom-devel >= 1.0.0 BuildRequires: bzip2-devel BuildRequires: celt-devel >= 0.11.0 %{?with_fdk_aac:BuildRequires: fdk-aac-devel} @@ -147,7 +145,7 @@ BuildRequires: libva-x11-devel >= 1.0.3 %endif BuildRequires: libvdpau-devel >= 0.2 BuildRequires: libvorbis-devel -%{?with_vpx:BuildRequires: libvpx-devel >= 1.3.0} +%{?with_vpx:BuildRequires: libvpx-devel >= 1.4.0} %{?with_webp:BuildRequires: libwebp-devel >= 0.4.0} # X264_BUILD >= 118 %{?with_x264:BuildRequires: libx264-devel >= 0.1.3-1.20111212_2245} @@ -183,7 +181,7 @@ BuildRequires: speex-devel >= 1:1.2-rc1 %{?with_doc:BuildRequires: tetex} %{?with_doc:BuildRequires: texi2html} %{?with_doc:BuildRequires: texinfo} -BuildRequires: twolame-devel +BuildRequires: twolame-devel >= 0.3.10 %{?with_vidstab:BuildRequires: vid.stab-devel >= 0.98} BuildRequires: vo-amrwbenc-devel %{?with_wavpack:BuildRequires: wavpack-devel} @@ -196,7 +194,7 @@ BuildRequires: xvid-devel >= 1:1.1.0 BuildRequires: xz-devel BuildRequires: yasm %{?with_zmq:BuildRequires: zeromq-devel} -%{?with_zimg:BuildRequires: zimg-devel >= 2.3.0} +%{?with_zimg:BuildRequires: zimg-devel >= 2.7.0} BuildRequires: zlib-devel %{?with_zvbi:BuildRequires: zvbi-devel} %{?with_autoreqdep:BuildConflicts: libpostproc} @@ -235,14 +233,16 @@ Summary: ffmpeg libraries Summary(pl.UTF-8): Biblioteki ffmpeg Group: Libraries Requires: SDL2 >= 2.0.1 +Requires: aom >= 1.0.0 %if "%(rpm -q --qf '%{V}' gnutls-devel)" >= "3.0.20" # uses gnutls_certificate_set_x509_system_trust if >= 3.0.20 Requires: gnutls-libs >= 3.0.20 %endif %{?with_openmpt:Requires: libopenmpt >= 0.2.6557} -%{?with_vpx:Requires: libvpx >= 1.3.0} +%{?with_vpx:Requires: libvpx >= 1.4.0} %{?with_rubberband:Requires: rubberband-libs >= 1.8.1} -%{?with_zimg:Requires: zimg >= 2.3.0} +Requires: twolame-libs >= 0.3.10 +%{?with_zimg:Requires: zimg >= 2.7.0} %description libs This package contains the ffmpeg shared libraries: @@ -301,7 +301,7 @@ Requires: librtmp-devel Requires: libtheora-devel >= 1.0-0.beta3 %{?with_va:Requires: libva-devel >= 1.0.3} Requires: libvorbis-devel -%{?with_vpx:Requires: libvpx-devel >= 1.3.0} +%{?with_vpx:Requires: libvpx-devel >= 1.4.0} %{?with_webp:Requires: libwebp-devel >= 0.4.0} %{?with_x264:Requires: libx264-devel >= 0.1.3-1.20110625_2245} %{?with_x265:Requires: libx265-devel >= 1.8} @@ -317,7 +317,7 @@ Requires: openjpeg2-devel >= 2.1 %{?with_soxr:Requires: soxr-devel} Requires: speex-devel >= 1:1.2-rc1 %{?with_tesseract:Requires: tesseract-devel} -Requires: twolame-devel +Requires: twolame-devel >= 0.3.10 %{?with_vidstab:Requires: vid.stab-devel >= 0.98} Requires: vo-amrwbenc-devel %{?with_wavpack:Requires: wavpack-devel} @@ -365,27 +365,6 @@ FFplay to bardzo prosty i przenośny odtwarzacz mediów używający bibliotek FFmpeg oraz biblioteki SDL. Jest używany głównie do testowania różnych API FFmpeg. -%package ffserver -Summary: FFserver video server -Summary(pl.UTF-8): FFserver - serwer strumieni obrazu -Group: Daemons -Requires(post,preun): /sbin/chkconfig -Requires: %{name}-libs = %{version}-%{release} -Requires: rc-scripts >= 0.4.0.10 - -%description ffserver -FFserver is a streaming server for both audio and video. It supports -several live feeds, streaming from files and time shifting on live -feeds (you can seek to positions in the past on each live feed, -provided you specify a big enough feed storage in ffserver.conf). - -%description ffserver -l pl.UTF-8 -FFserver to serwer strumieni dla dźwięku i obrazu. Obsługuje kilka -źródeł na żywo, przekazywanie strumieni z plików i przesuwanie w -czasie dla źródeł na żywo (można przeskakiwać na położenia w -przeszłości dla każdego źródła na żywo, pod warunkiem odpowiednio -dużej przestrzeni na dane skonfigurowanej w ffserver.conf). - %package doc Summary: FFmpeg documentation in HTML format Summary(pl.UTF-8): Dokumentacja pakietu FFmpeg w formacie HTML @@ -496,6 +475,7 @@ EOF --enable-version3 \ %{?with_frei0r:--enable-frei0r} \ %{?with_ladspa:--enable-ladspa} \ + --enable-libaom \ --enable-libass \ --enable-libbluray \ %{?with_bs2b:--enable-libbs2b} \ @@ -589,8 +569,7 @@ EOF %install rm -rf $RPM_BUILD_ROOT install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/etc/{sysconfig,rc.d/init.d}} \ - $RPM_BUILD_ROOT%{_includedir}/ffmpeg \ - $RPM_BUILD_ROOT/var/{cache,log}/ffserver + $RPM_BUILD_ROOT%{_includedir}/ffmpeg %{__make} install install-headers \ DESTDIR=$RPM_BUILD_ROOT \ @@ -602,13 +581,7 @@ for a in libavutil/*/{asm,bswap}.h; do install -Dp $a $RPM_BUILD_ROOT%{_includedir}/$a done cp -a libavformat/riff.h $RPM_BUILD_ROOT%{_includedir}/libavformat -# for lim-omx ffmpeg components -cp -a libavcodec/audioconvert.h $RPM_BUILD_ROOT%{_includedir}/libavcodec -install -p %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/ffserver -cp -a %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/ffserver -cp -a %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/ffserver.conf -mv -f $RPM_BUILD_ROOT{%{_bindir},%{_sbindir}}/ffserver install -p tools/qt-faststart $RPM_BUILD_ROOT%{_bindir} # install as ffmpeg-avconfig to avoid with possible programs looking for @@ -630,26 +603,6 @@ rm -rf $RPM_BUILD_ROOT %post libs -p /sbin/ldconfig %postun libs -p /sbin/ldconfig -%pre ffserver -%groupadd -g 167 ffserver -%useradd -g ffserver -u 167 ffserver - -%post ffserver -/sbin/chkconfig --add ffserver -%service ffserver restart - -%preun ffserver -if [ "$1" = 0 ]; then - %service ffserver stop - /sbin/chkconfig --del ffserver -fi - -%postun ffserver -if [ "$1" = 0 ]; then - %userremove ffserver - %groupremove ffserver -fi - %files %defattr(644,root,root,755) %doc CREDITS LICENSE.md MAINTAINERS README.md RELEASE_NOTES doc/APIchanges @@ -678,23 +631,23 @@ fi %files libs %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libavcodec.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.57 +%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.58 %attr(755,root,root) %{_libdir}/libavdevice.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.57 +%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.58 %attr(755,root,root) %{_libdir}/libavfilter.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.6 +%attr(755,root,root) %ghost %{_libdir}/libavfilter.so.7 %attr(755,root,root) %{_libdir}/libavformat.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libavformat.so.57 +%attr(755,root,root) %ghost %{_libdir}/libavformat.so.58 %attr(755,root,root) %{_libdir}/libavresample.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libavresample.so.3 +%attr(755,root,root) %ghost %{_libdir}/libavresample.so.4 %attr(755,root,root) %{_libdir}/libavutil.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libavutil.so.55 +%attr(755,root,root) %ghost %{_libdir}/libavutil.so.56 %attr(755,root,root) %{_libdir}/libpostproc.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libpostproc.so.54 +%attr(755,root,root) %ghost %{_libdir}/libpostproc.so.55 %attr(755,root,root) %{_libdir}/libswresample.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libswresample.so.2 +%attr(755,root,root) %ghost %{_libdir}/libswresample.so.3 %attr(755,root,root) %{_libdir}/libswscale.so.*.*.* -%attr(755,root,root) %ghost %{_libdir}/libswscale.so.4 +%attr(755,root,root) %ghost %{_libdir}/libswscale.so.5 %files devel %defattr(644,root,root,755) @@ -759,19 +712,6 @@ fi %{_mandir}/man1/ffplay-all.1* %endif -%files ffserver -%defattr(644,root,root,755) -%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/ffserver.conf -%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ffserver -%attr(755,root,root) %{_sbindir}/ffserver -%attr(754,root,root) /etc/rc.d/init.d/ffserver -%if %{with doc} -%{_mandir}/man1/ffserver.1* -%{_mandir}/man1/ffserver-all.1* -%endif -%dir %attr(770,root,ffserver) /var/cache/ffserver -%dir %attr(770,root,ffserver) /var/log/ffserver - %if %{with doc} %files doc %defattr(644,root,root,755)