rpms/motion/devel ffmpeg-0.5.patch,NONE,1.1 motion.spec,1.2,1.3
Author: moixs
Update of /cvs/free/rpms/motion/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv3381
Modified Files:
motion.spec
Added Files:
ffmpeg-0.5.patch
Log Message:
* Sun Apr 05 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-5
- Patch and rebuild for ffmpeg 0.5
ffmpeg-0.5.patch:
--- NEW FILE ffmpeg-0.5.patch ---
--- ffmpeg.c-original 2008-09-22 01:20:58.000000000 +0200
+++ ffmpeg.c 2009-04-05 11:46:52.000000000 +0200
@@ -164,7 +164,7 @@
return write(fd, buf, size);
}
-static offset_t file_seek(URLContext *h, offset_t pos, int whence)
+static int64_t file_seek(URLContext *h, int64_t pos, int whence)
{
int fd = (size_t)h->priv_data;
return lseek(fd, pos, whence);
Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- motion.spec 29 Mar 2009 13:47:18 -0000 1.2
+++ motion.spec 5 Apr 2009 10:22:13 -0000 1.3
@@ -1,6 +1,6 @@
Name: motion
Version: 3.2.11
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: A motion detection system
Group: Applications/Multimedia
@@ -9,10 +9,10 @@
Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
Source1: motion-initscript
Patch0: ffmpeg-detection.patch
+Patch1: ffmpeg-0.5.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: libjpeg-devel ffmpeg-devel zlib-devel
-#Requires: ffmpeg
Requires(post): chkconfig
Requires(preun): chkconfig initscripts
Requires(postun): initscripts
@@ -29,6 +29,8 @@
%setup -q
#ffmpeg detection patch in version 3.2.11. This is an upstream patch.
%patch0 -p0
+#ffmpeg 0.5 patch for rawhide/F11
+%patch1 -p0
%build
%configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg
--without-mysql --without-pgsql
@@ -94,6 +96,9 @@
%attr(0755,root,root) %{_initrddir}/%{name}
%changelog
+* Sun Apr 05 2009 Steven Moix <steven.moix(a)axianet.ch> - 3.2.11-5
+- Patch and rebuild for ffmpeg 0.5
+
* Sun Mar 29 2009 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info> - 3.2.11-4
- rebuild for new F11 features