[packages/mjpegtools] - fix building on x32 - rel 2

[baggins]

commit 07ffd2465cf1dd0df77b84b655ab3881153165d3
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Fri Apr 3 23:41:31 2015 +0200

    - fix building on x32
    - rel 2

 mjpegtools.spec |  4 +++-
 x32.patch       | 22 ++++++++++++++++++++++
 2 files changed, 25 insertions(+), 1 deletion(-)
---
diff --git a/mjpegtools.spec b/mjpegtools.spec
index a81ba9e..f4677bc 100644
--- a/mjpegtools.spec
+++ b/mjpegtools.spec
@@ -6,7 +6,7 @@ Summary:	Tools for recording, editing, playing back and MPEG-encoding video unde
 Summary(pl.UTF-8):	Narzędzia do nagrywania, edycji, odtwarzania i kodowania do MPEG obrazu
 Name:		mjpegtools
 Version:	2.1.0
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Applications/Graphics
 Source0:	http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@ Source0:	http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
 Patch0:		%{name}-opt.patch
 Patch1:		%{name}-pthread.patch
 Patch2:		%{name}-sec.patch
+Patch3:		x32.patch
 URL:		http://mjpeg.sourceforge.net/
 BuildRequires:	SDL-devel >= 1.1.3
 BuildRequires:	SDL_gfx-devel
@@ -101,6 +102,7 @@ Statyczne biblioteki mjpegtools.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..62b1a97
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,22 @@
+--- mjpegtools-2.1.0/utils/cpu_accel.c.orig	2010-09-19 23:21:37.000000000 +0200
++++ mjpegtools-2.1.0/utils/cpu_accel.c	2015-04-03 23:40:52.986289070 +0200
+@@ -117,14 +117,18 @@
+ 
+ static int x86_accel (void)
+ {
++#if defined(__ILP32__)
++    long long eax, ebx, ecx, edx;
++#else
+     long eax, ebx, ecx, edx;
++#endif
+     int32_t AMD;
+     int32_t caps;
+ 
+ 	/* Slightly weirdified cpuid that preserves the ebx and edi required
+ 	   by gcc for PIC offset table and frame pointer */
+ 
+-#if defined(__LP64__) || defined(_LP64)
++#if defined(__LP64__) || defined(_LP64) || defined(__ILP32__)
+ #  define REG_b "rbx"
+ #  define REG_S "rsi"
+ #else
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/mjpegtools.git/commitdiff/07ffd2465cf1dd0df77b84b655ab3881153165d3