packages: ffmpeg/ffmpeg.spec - updated Source URL - verbose make - package ...

[qboosh]

Author: qboosh                       Date: Mon Nov  1 16:44:56 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated Source URL
- verbose make
- package LICENSE (notes on specific parts of ffmpeg and its dependencies)

---- Files affected:
packages/ffmpeg:
   ffmpeg.spec (1.206 -> 1.207) 

---- Diffs:

================================================================
Index: packages/ffmpeg/ffmpeg.spec
diff -u packages/ffmpeg/ffmpeg.spec:1.206 packages/ffmpeg/ffmpeg.spec:1.207
--- packages/ffmpeg/ffmpeg.spec:1.206	Fri Oct 22 15:37:29 2010
+++ packages/ffmpeg/ffmpeg.spec	Mon Nov  1 17:44:51 2010
@@ -5,10 +5,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
@@ -19,7 +18,7 @@
 # (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
@@ -27,8 +26,6 @@
 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/
@@ -41,7 +38,6 @@
 # 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
@@ -310,7 +306,8 @@
 # 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
@@ -319,7 +316,8 @@
 	$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
@@ -345,8 +343,8 @@
 %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
@@ -370,7 +368,7 @@
 
 %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
@@ -398,6 +396,7 @@
 %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
@@ -405,7 +404,6 @@
 %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
@@ -414,11 +412,23 @@
 %{_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)
@@ -441,6 +451,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.207  2010/11/01 16:44:51  qboosh
+- updated Source URL
+- verbose make
+- package LICENSE (notes on specific parts of ffmpeg and its dependencies)
+
 Revision 1.206  2010/10/22 13:37:29  glen
 - va, vpx, doc bconds
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ffmpeg/ffmpeg.spec?r1=1.206&r2=1.207&f=u