Author: arekm Date: Tue Sep 30 06:27:19 2008 GMT
Module: SPECS Tag: HEAD
---- Log message:
- up to 20080930
---- Files affected:
SPECS:
ffmpeg.spec (1.169 -> 1.170)
---- Diffs:
================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.169 SPECS/ffmpeg.spec:1.170
--- SPECS/ffmpeg.spec:1.169 Mon Sep 8 22:18:48 2008
+++ SPECS/ffmpeg.spec Tue Sep 30 08:27:14 2008
@@ -7,7 +7,7 @@
%bcond_without autoreqdep # don't care about package name deps generated
by rpm
%bcond_without imlib2 # don't build imlib2 vhook module
#
-%define _snap 2008-09-08
+%define _snap 2008-09-30
%define snap %(echo %{_snap} | tr -d -)
%define rel 1
Summary: Realtime audio/video encoder and streaming server
@@ -21,11 +21,12 @@
Group: Applications/Multimedia
#Source0: http://dl.sourceforge.net/ffmpeg/%{name}-%{version}-pre1.tar.gz
Source0: http://ffmpeg.mplayerhq.hu/%{name}-export-snapshot.tar.bz2
-# Source0-md5: 9b2ef1d3f550420264124836107fc008
+# Source0-md5: d85a173fa0843706e4f943b84046db84
Source1: ffserver.init
Source2: ffserver.sysconfig
Source3: ffserver.conf
Patch0: %{name}-img_convert_symbol.patch
+Patch1: %{name}-x264.patch
URL: http://ffmpeg.mplayerhq.hu/
BuildRequires: SDL-devel
%if %{with amr}
@@ -46,7 +47,7 @@
BuildRequires: libdc1394-devel
BuildRequires: libgsm-devel
BuildRequires: libraw1394-devel
-BuildRequires: libtheora-devel >= 1.0-0.alpha7
+BuildRequires: libtheora-devel >= 1.0-0.beta3
BuildRequires: libtool >= 2:1.4d-3
BuildRequires: libvorbis-devel
BuildRequires: libx264-devel >= 0.1.2-1.20080801
@@ -204,6 +205,7 @@
%prep
%setup -q -n %{name}-export-%{_snap}
%patch0 -p1
+%patch1 -p1
# package the grep result for mplayer, the result formatted as
mplayer/configure
cat <<EOF > ffmpeg-config
@@ -368,12 +370,12 @@
%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) %ghost %{_libdir}/libavcodec.so.51
-%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.52
-%attr(755,root,root) %ghost %{_libdir}/libavformat.so.52
-%attr(755,root,root) %ghost %{_libdir}/libavutil.so.49
-%attr(755,root,root) %ghost %{_libdir}/libpostproc.so.51
-%attr(755,root,root) %ghost %{_libdir}/libswscale.so.0
+%attr(755,root,root) %ghost %{_libdir}/libavcodec.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libavdevice.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libavformat.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libavutil.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libpostproc.so.[0-9][0-9]
+%attr(755,root,root) %ghost %{_libdir}/libswscale.so.[0-9]
%dir %{_libdir}/vhook
%attr(755,root,root) %{_libdir}/vhook/drawtext.so
%attr(755,root,root) %{_libdir}/vhook/fish.so
@@ -431,6 +433,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.170 2008/09/30 06:27:14 arekm
+- up to 20080930
+
Revision 1.169 2008/09/08 20:18:48 arekm
- up to 20080908
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/ffmpeg.spec?r1=1.169&r2=1.170&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
