- release 3 (by relup.sh)

[packages/ffmpeg.git] / ffmpeg.spec

diff --git a/ffmpeg.spec b/ffmpeg.spec
index 7597b6a6fe9314e6c78165b251d05d66c815d114..a25415dbf9e57718d3913c43157cb5049d08f6e8 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -53,13 +53,6 @@
 %undefine      with_opencv
 %endif
 
-%if %{without nonfree}
-%undefine      with_aacplus
-%undefine      with_fdk_aac
-%undefine      with_faac
-%undefine      with_nvenc
-%endif
-
 %ifnarch %{ix86} %{x8664} arm
 %undefine      with_x265
 %endif
@@ -69,19 +62,20 @@
 Summary:       FFmpeg - a very fast video and audio converter
 Summary(pl.UTF-8):     FFmpeg - szybki konwerter audio/wideo
 Name:          ffmpeg
-Version:       2.8.1
-Release:       2
+Version:       2.8.4
+Release:       3
 # LGPL or GPL, chosen at configure time (GPL version is more featured)
 # (postprocessing, some filters, x264, x265, xavs, xvid, x11grab)
 # 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.bz2
-# Source0-md5: 63b2cfeea930e942ff7579fd0064c5be
+Source0:       http://ffmpeg.org/releases/%{name}-%{version}.tar.xz
+# Source0-md5: ac1e3d6934f9efd8b67713677c7fd99f
 Source1:       ffserver.init
 Source2:       ffserver.sysconfig
 Source3:       ffserver.conf
 Patch0:                %{name}-kvazaar.patch
+Patch1:                %{name}-utvideo.patch
 URL:           http://www.ffmpeg.org/
 %{?with_decklink:BuildRequires:        Blackmagic_DeckLink_SDK}
 %{?with_openal:BuildRequires:  OpenAL-devel >= 1.1}
@@ -122,7 +116,7 @@ BuildRequires:      libgsm-devel
 BuildRequires: libiec61883-devel
 BuildRequires: libmodplug-devel
 BuildRequires: libnut-devel
-%{?with_quvi:BuildRequires:    libquvi-devel}
+%{?with_quvi:BuildRequires:    libquvi-0.4-devel}
 BuildRequires: libraw1394-devel >= 2
 BuildRequires: librtmp-devel
 %{?with_ssh:BuildRequires:     libssh-devel}
@@ -168,7 +162,7 @@ BuildRequires:      speex-devel >= 1:1.2-rc1
 %{?with_doc:BuildRequires:     texi2html}
 %{?with_doc:BuildRequires:     texinfo}
 BuildRequires: twolame-devel
-%{?with_utvideo:BuildRequires: utvideo-devel >= 12}
+%{?with_utvideo:BuildRequires: utvideo-devel >= 15.3}
 %{?with_vidstab:BuildRequires: vid.stab-devel >= 0.98}
 BuildRequires: vo-aacenc-devel
 BuildRequires: vo-amrwbenc-devel
@@ -187,7 +181,7 @@ BuildRequires:      zlib-devel
 # overflows maximum hash table size
 BuildConflicts:        pdksh < 5.2.14-57
 Requires:      %{name}-libs = %{version}-%{release}
-%{?with_utvideo:Requires:      utvideo >= 12}
+%{?with_utvideo:Requires:      utvideo >= 15.3}
 %{?with_ilbc:Requires: webrtc-libilbc}
 Requires:      xvid >= 1:1.1.0
 Obsoletes:     libpostproc
@@ -278,7 +272,7 @@ Requires:   libgsm-devel
 Requires:      libiec61883-devel
 Requires:      libmodplug-devel
 Requires:      libnut-devel
-%{?with_quvi:Requires: libquvi-devel}
+%{?with_quvi:Requires: libquvi-0.4-devel}
 Requires:      libraw1394-devel >= 2
 Requires:      librtmp-devel
 %{?with_smb:Requires:  libsmbclient-devel}
@@ -300,7 +294,7 @@ Requires:   schroedinger-devel
 %{?with_soxr:Requires: soxr-devel}
 Requires:      speex-devel >= 1:1.2-rc1
 Requires:      twolame-devel
-%{?with_utvideo:Requires:      utvideo-devel >= 12}
+%{?with_utvideo:Requires:      utvideo-devel >= 15.3}
 %{?with_vidstab:Requires:      vid.stab-devel >= 0.98}
 Requires:      vo-aacenc-devel
 Requires:      vo-amrwbenc-devel
@@ -386,6 +380,7 @@ Dokumentacja pakietu FFmpeg w formacie HTML.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 # package the grep result for mplayer, the result formatted as ./mplayer/configure
 cat <<EOF > ffmpeg-avconfig
@@ -466,6 +461,7 @@ EOF
        --disable-debug \
        --disable-optimizations \
        --disable-stripping \
+       %{!?with_doc:--disable-doc} \
        --enable-avfilter \
        --enable-avresample \
        %{?with_decklink:--enable-decklink} \
@@ -594,7 +590,9 @@ install -p tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
 install -p ffmpeg-avconfig $RPM_BUILD_ROOT%{_bindir}/ffmpeg-avconfig
 
 # packaged as %doc in -doc
+%if %{with doc}
 %{__rm} $RPM_BUILD_ROOT%{_docdir}/ffmpeg/*.html
+%endif
 
 install -d $RPM_BUILD_ROOT%{_examplesdir}
 %{__mv} $RPM_BUILD_ROOT%{_datadir}/ffmpeg/examples $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}