Author: glen Date: Mon Dec 4 22:52:29 2006 GMT
Module: SPECS Tag: HEAD
---- Log message:
- 2006-12-04 snapshot (compiles)
---- Files affected:
SPECS:
ffmpeg.spec (1.105 -> 1.106)
---- Diffs:
================================================================
Index: SPECS/ffmpeg.spec
diff -u SPECS/ffmpeg.spec:1.105 SPECS/ffmpeg.spec:1.106
--- SPECS/ffmpeg.spec:1.105 Thu Oct 26 14:34:06 2006
+++ SPECS/ffmpeg.spec Mon Dec 4 23:52:24 2006
@@ -8,12 +8,13 @@
%bcond_without imlib2 # don't build imlib2 vhook module
%bcond_with lzo # build with LZO support
#
+%define _snap 2006-12-04
+%define snap %(echo %{_snap} | tr -d -)
+%define _rel 0.1
Summary: Realtime audio/video encoder and streaming server
Summary(pl): Koder audio/wideo czasu rzeczywistego oraz serwer strumieni
Name: ffmpeg
Version: 0.4.9
-%define snap 20060129
-%define _rel 15
Release: 3.%{snap}.%{_rel}
# LGPL or GPL, chosen at configure time (GPL version is more featured)
# (postprocessing, a52, xvid, x264, dts, faad)
@@ -21,8 +22,9 @@
Group: Applications/Multimedia
#Source0: http://dl.sourceforge.net/ffmpeg/%{name}-%{version}-pre1.tar.gz
#Source0: ftp://ftp2.mplayerhq.hu/MPlayer/cvs/FFMpeg-%{snap}.tar.bz2
-Source0: %{name}-%{snap}.tar.bz2
-# Source0-md5: d8ea09431d6c0c91bfd35e0ca74a67e1
+#Source0: %{name}-%{snap}.tar.bz2
+Source0: http://ffmpeg.mplayerhq.hu/%{name}-export-snapshot.tar.bz2
+# Source0-md5: 5be2e4d1e326bb7809205a3401204621
Source1: ffserver.init
Source2: ffserver.sysconfig
Source3: ffserver.conf
@@ -30,7 +32,7 @@
Patch1: %{name}-libdir.patch
Patch2: %{name}-gcc4.patch
Patch3: %{name}-system-amr.patch
-Patch4: %{name}-x264.patch
+Patch4: %{name}-x264-symbol.patch
Patch5: %{name}-as_needed.patch
URL: http://ffmpeg.mplayerhq.hu/
BuildRequires: SDL-devel
@@ -53,7 +55,7 @@
BuildRequires: libtool >= 2:1.4d-3
BuildRequires: libvorbis-devel
BuildRequires: libx264-devel >= 0.1.2-1.20061024_2245.1
-%{?with_lzo:BuildRequires: lzo-devel < 2.0}
+#%{?with_lzo:BuildRequires: lzo-devel < 2.0}
%ifarch %{ix86}
%ifnarch i386 i486
BuildRequires: nasm
@@ -125,8 +127,8 @@
Requires: libgsm-devel
Requires: libtheora-devel
Requires: libvorbis-devel
-%{?with_lzo:Requires: lzo-devel < 2.0}
Requires: libx264-devel >= 0.1.2-1.20060828_2245.1
+#%{?with_lzo:Requires: lzo-devel < 2.0}
Requires: xvid-devel >= 1:1.1.0
Requires: zlib-devel
Obsoletes: libpostproc-devel
@@ -188,8 +190,8 @@
Summary(pl): FFserver - serwer strumieni obrazu
Group: Daemons
Requires(post,preun): /sbin/chkconfig
-Requires: rc-scripts >= 0.4.0.10
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
@@ -205,13 +207,13 @@
dużej przestrzeni na dane skonfigurowanej w ffserver.conf).
%prep
-%setup -q -n %{name}
-%patch0 -p1
+%setup -q -n %{name}-export-%{_snap}
+#%patch0 -p1 NEEDS UPDATE
%patch1 -p1
%patch2 -p1
-%patch3 -p1
+#%patch3 -p1 NEEDS UPDATE
%patch4 -p1
-%patch5 -p1
+#%patch5 -p1 MIGHT BE UNNECCESSARY
%build
# notes:
@@ -221,7 +223,6 @@
--prefix=%{_prefix} \
--libdir=%{_libdir} \
--mandir=%{_mandir} \
- %{!?with_lzo:--disable-lzo} \
--disable-strip \
--enable-a52 \
--enable-a52bin \
@@ -236,7 +237,6 @@
--enable-pp \
--enable-pthreads \
--enable-shared \
- --enable-theora \
--enable-vorbis \
--enable-x264 \
--enable-xvid \
@@ -255,7 +255,11 @@
--extra-ldflags="%{rpmldflags}" \
--disable-debug \
--disable-opts \
- --tune=generic
+
+# GONE?
+# %{!?with_lzo:--disable-lzo} \
+# --enable-theora \
+# --tune=generic
%{__make} \
BUILD_DOC=yes
@@ -326,7 +330,7 @@
%attr(755,root,root) %{_libdir}/libavformat.so
%attr(755,root,root) %{_libdir}/libavutil.so
%attr(755,root,root) %{_libdir}/libpostproc.so
-%{_libdir}/lib*.la
+#%{_libdir}/lib*.la
%{_includedir}/ffmpeg
%{_includedir}/postproc
%{_pkgconfigdir}/*.pc
@@ -362,6 +366,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.106 2006/12/04 22:52:24 glen
+- 2006-12-04 snapshot (compiles)
+
Revision 1.105 2006/10/26 12:34:06 grzegol
- fixed to build with libx264-0.1.2-1.20061024_2245.1; rel. 15
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SPECS/ffmpeg.spec?r1=1.105&r2=1.106&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
