- updated Source URL

- verbose make
- package LICENSE (notes on specific parts of ffmpeg and its dependencies)

Changed files:
    ffmpeg.spec -> 1.207

diff --git a/ffmpeg.spec b/ffmpeg.spec
index c3b4f38b3061fc53376e0b9681f7bed210d7b643..a717efd45c4c51fa6c4875104e7ba31b94a73ffa 100644 (file)
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -4,10 +4,9 @@
 # Conditional build:
 %bcond_with    nonfree         # non free options of package
 %bcond_without autoreqdep      # don't care about package name deps generated by rpm
-%bcond_without imlib2          # don't build imlib2 vhook module
-%bcond_without va                      # VAAPI (Video Acceleration API)
-%bcond_without vpx                     # VP8, a high-quality video codec
-%bcond_without doc                     # don't build docs
+%bcond_without va              # VAAPI (Video Acceleration API)
+%bcond_without vpx             # VP8, a high-quality video codec
+%bcond_without doc             # don't build docs
 
 Summary:       FFmpeg is a very fast video and audio converter
 Summary(pl.UTF-8):     Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
@@ -18,7 +17,7 @@ Release:      1
 # (postprocessing, ac3, xvid, x264, faad)
 License:       GPL v3+ with LGPL v3+ parts
 Group:         Applications/Multimedia
-Source0:       http://ffmpeg.mplayerhq.hu/releases/%{name}-%{version}.tar.bz2
+Source0:       http://ffmpeg.org/releases/%{name}-%{version}.tar.bz2
 # Source0-md5: 4f5d732d25eedfb072251b5314ba2093
 Source1:       ffserver.init
 Source2:       ffserver.sysconfig
@@ -26,8 +25,6 @@ Source3:      ffserver.conf
 Patch0:                %{name}-bug-803.patch
 Patch1:                %{name}-gsm.patch
 Patch2:                faadbin-libfaadname.patch
-# vhook is gone. this patch needs different approach
-#PatchX: imagewidth.patch
 # http://webm.googlecode.com/files/ffmpeg-0.6_libvpx-0.9.1.diff.gz
 Patch3:                ffmpeg-0.6_libvpx-0.9.1.diff
 URL:           http://www.ffmpeg.org/
@@ -40,7 +37,6 @@ BuildRequires:        freetype-devel
 # require version with altivec support fixed
 BuildRequires: gcc >= 5:3.3.2-3
 %endif
-%{?with_imlib2:BuildRequires:  imlib2-devel >= 1.3.0}
 BuildRequires: lame-libs-devel
 BuildRequires: libdc1394-devel
 BuildRequires: libgsm-devel
@@ -309,7 +305,8 @@ EOF
 # force oldscaler build
 sed -i -e 's|#define.*CONFIG_OLDSCALER.*0|#define CONFIG_OLDSCALER 1|g' config.h
 
-%{__make}
+%{__make} \
+       V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -318,7 +315,8 @@ install -d $RPM_BUILD_ROOT{%{_sysconfdir},%{_sbindir},/etc/{sysconfig,rc.d/init.
        $RPM_BUILD_ROOT/var/{cache,log}/ffserver
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       V=1
 
 cp -a config.h $RPM_BUILD_ROOT%{_includedir}/ffmpeg
 cp -a libavutil/intreadwrite.h $RPM_BUILD_ROOT%{_includedir}/libavutil
@@ -344,8 +342,8 @@ install ffmpeg-avconfig $RPM_BUILD_ROOT%{_bindir}/ffmpeg-avconfig
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%post libs     -p /sbin/ldconfig
-%postun libs   -p /sbin/ldconfig
+%post  libs -p /sbin/ldconfig
+%postun        libs -p /sbin/ldconfig
 
 %pre ffserver
 %groupadd -g 167 ffserver
@@ -369,7 +367,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc Changelog README %{?with_doc:doc/*.html} doc/TODO
+%doc Changelog LICENSE README %{?with_doc:doc/*.html} doc/TODO
 %attr(755,root,root) %{_bindir}/ffmpeg
 %attr(755,root,root) %{_bindir}/ffprobe
 %dir %{_datadir}/ffmpeg
@@ -397,6 +395,7 @@ fi
 %files devel
 %defattr(644,root,root,755)
 %doc doc/optimization.txt
+%attr(755,root,root) %{_bindir}/ffmpeg-avconfig
 %attr(755,root,root) %{_libdir}/libavcodec.so
 %attr(755,root,root) %{_libdir}/libavdevice.so
 %attr(755,root,root) %{_libdir}/libavfilter.so
@@ -404,7 +403,6 @@ fi
 %attr(755,root,root) %{_libdir}/libavutil.so
 %attr(755,root,root) %{_libdir}/libpostproc.so
 %attr(755,root,root) %{_libdir}/libswscale.so
-%attr(755,root,root) %{_bindir}/ffmpeg-avconfig
 %{_includedir}/ffmpeg
 %{_includedir}/libavcodec
 %{_includedir}/libavdevice
@@ -413,11 +411,23 @@ fi
 %{_includedir}/libavutil
 %{_includedir}/libpostproc
 %{_includedir}/libswscale
-%{_pkgconfigdir}/*.pc
+%{_pkgconfigdir}/libavcodec.pc
+%{_pkgconfigdir}/libavdevice.pc
+%{_pkgconfigdir}/libavfilter.pc
+%{_pkgconfigdir}/libavformat.pc
+%{_pkgconfigdir}/libavutil.pc
+%{_pkgconfigdir}/libpostproc.pc
+%{_pkgconfigdir}/libswscale.pc
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/lib*.a
+%{_libdir}/libavcodec.a
+%{_libdir}/libavdevice.a
+%{_libdir}/libavfilter.a
+%{_libdir}/libavformat.a
+%{_libdir}/libavutil.a
+%{_libdir}/libpostproc.a
+%{_libdir}/libswscale.a
 
 %files ffplay
 %defattr(644,root,root,755)