rpms/motion/F-17 motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch, NONE, 1.1 motion.spec, 1.15, 1.16 sources, 1.9, 1.10

Author: ttorcz Update of /cvs/free/rpms/motion/F-17 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv9133 Modified Files: motion.spec sources Added Files: motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch Log Message: * Thu Dec 06 2012 Tomasz Torcz <ttorcz(a)fedoraproject.org&gt; - 3.3.3-trunkREV557.1 - synchronize with F-18 package version: - newest snapshot - compatibility with newest ffmpeg - patch for ARM compilation motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch: ffmpeg.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) --- NEW FILE motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch --- From: Tomasz Torcz <tomek(a)pipebreaker.pl&gt; Date: Mon, 3 Dec 2012 14:25:50 +0100 Subject: [PATCH] emit asm "emms" only on x86 and amd64 arches Fixes compilation error on ARM: armv5tel - Error: bad instruction `emms` --- ffmpeg.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ffmpeg.c b/ffmpeg.c index 1c2ae47..57eeda4 100644 --- a/ffmpeg.c +++ b/ffmpeg.c @@ -1000,7 +1000,7 @@ void ffmpeg_deinterlace(unsigned char *img, int width, int height) /* We assume using 'PIX_FMT_YUV420P' always */ avpicture_deinterlace(&picture, &picture, PIX_FMT_YUV420P, width, height); -#ifndef __SSE_MATH__ +#if !defined(__SSE_MATH__) && (defined(__i386__) || defined(__x86_64__)) __asm__ __volatile__ ( "emms"); #endif -- 1.7.11.7 Index: motion.spec =================================================================== RCS file: /cvs/free/rpms/motion/F-17/motion.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- motion.spec 28 Feb 2012 11:44:54 -0000 1.15 +++ motion.spec 6 Dec 2012 20:01:38 -0000 1.16 @@ -1,12 +1,13 @@ Name: motion Version: 3.3.0 -Release: trunkREV534%{?dist}.2 +Release: trunkREV557.1%{?dist} Summary: A motion detection system Group: Applications/Multimedia License: GPLv2+ URL: http://www.lavrsen.dk/twiki/bin/view/Motion/WebHome Source0: http://prdownloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz +Patch0: motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libjpeg-devel ffmpeg-devel zlib-devel @@ -26,6 +27,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql @@ -95,6 +97,12 @@ %attr(0755,root,root) %{_initrddir}/%{name} %changelog +* Thu Dec 06 2012 Tomasz Torcz <ttorcz(a)fedoraproject.org&gt; - 3.3.3-trunkREV557.1 +- synchronize with F-18 package version: + - newest snapshot + - compatibility with newest ffmpeg + - patch for ARM compilation + * Tue Feb 28 2012 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 3.3.0-trunkREV534.2 - Rebuilt for x264/FFmpeg Index: sources =================================================================== RCS file: /cvs/free/rpms/motion/F-17/sources,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- sources 1 Oct 2011 13:03:24 -0000 1.9 +++ sources 6 Dec 2012 20:01:38 -0000 1.10 @@ -1 +1 @@ -ecc497ec9307aef283c1bc0cae3adf4e motion-3.3.0.tar.gz +a11826f948e0d99120b32123679d5fc5 motion-3.3.0.tar.gz