rpms/motion/devel motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch, NONE, 1.1 motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch, NONE, 1.1 motion.spec, 1.20, 1.21

[Tomasz Torcz]

Author: ttorcz

Update of /cvs/free/rpms/motion/devel
In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv5480

Modified Files:
	motion.spec 
Added Files:
	motion-0001-emit-asm-emms-only-on-x86-and-amd64-arches.patch 
	motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch 
Log Message:
* Fri Apr 19 2013 Tomasz Torcz <ttorcz at fedoraproject.org> - 3.3.0-trunkREV557.2
 - synchronize with F-18 version:
   - patches for ARM compilation and newest ffmpeg
     (this undoes ffmpeg-compat support)
   - logrotate fixes


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 dcb186cb3ad6666d66aba6453031203ba1f6c15a Mon Sep 17 00:00:00 2001
From: Tomasz Torcz <tomek at pipebreaker.pl>
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


motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch:
 motion.logrotate |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

--- NEW FILE motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch ---
>From 0e81a85851b9c4aa495b2dd697120df5ca53d660 Mon Sep 17 00:00:00 2001
From: Tomasz Torcz <tomek at pipebreaker.pl>
Date: Sat, 8 Dec 2012 10:38:42 +0100
Subject: [PATCH] there is no "/bin/service" in Fedora, use systemctl

---
 motion.logrotate | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/motion.logrotate b/motion.logrotate
index b97f2f3..75ad7c2 100644
--- a/motion.logrotate
+++ b/motion.logrotate
@@ -5,6 +5,6 @@
     size 10M
     create 0600 root root
     postrotate
-        /bin/service motion reload  >/dev/null  2>&1 || true
+        /usr/bin systemctl reload-or-try-restart motion.service  >/dev/null  2>&1 || true
     endscript
 }
-- 
1.8.0.1



Index: motion.spec
===================================================================
RCS file: /cvs/free/rpms/motion/devel/motion.spec,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- motion.spec	20 Mar 2013 22:40:06 -0000	1.20
+++ motion.spec	19 Apr 2013 10:57:01 -0000	1.21
@@ -1,15 +1,17 @@
 Name:           motion
 Version:        3.3.0
-Release:        trunkREV534%{?dist}.7
+Release:        trunkREV557.2%{?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
+Patch1:         motion-0002-there-is-no-bin-service-in-Fedora-use-systemctl.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  libjpeg-devel ffmpeg-compat-devel zlib-devel
+BuildRequires:  libjpeg-devel ffmpeg-devel zlib-devel
 Buildrequires:  pkgconfig(sqlite3)
 #This requires comes from the startup script, it will be there until motion supports libv4l calls in the code
 Requires: libv4l
@@ -27,9 +29,10 @@
 
 %prep
 %setup -q
+%patch0 -p1
+%patch1 -p1
 
 %build
-export PKG_CONFIG_LIBDIR="%{_libdir}/ffmpeg-compat/pkgconfig"
 %configure --sysconfdir=%{_sysconfdir}/%{name} --without-optimizecpu --with-ffmpeg --without-mysql --without-pgsql
 make %{?_smp_mflags}
 
@@ -97,6 +100,12 @@
 %attr(0755,root,root) %{_initrddir}/%{name}
 
 %changelog
+* Fri Apr 19 2013 Tomasz Torcz <ttorcz at fedoraproject.org> - 3.3.0-trunkREV557.2
+ - synchronize with F-18 version:
+   - patches for ARM compilation and newest ffmpeg
+     (this undoes ffmpeg-compat support)
+   - logrotate fixes
+
 * Wed Mar 20 2013 Nicolas Chauvet <kwizart at gmail.com> - 3.3.0-trunkREV534.7
 - Move to ffmpeg-compat support
 - Add sqlite3