[packages/x262] - add x32 asm fix

[baggins]

commit d11716b77595a511d166f39e631b241997b6519e
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat May 2 20:40:12 2015 +0200

    - add x32 asm fix

 x262.spec | 11 ++++++++++-
 x32.patch | 17 +++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)
---
diff --git a/x262.spec b/x262.spec
index 7b837b6..a3d314d 100644
--- a/x262.spec
+++ b/x262.spec
@@ -3,13 +3,15 @@ Summary(pl.UTF-8):	Koder MPEG-2 oparty na x264
 Name:		x262
 Version:	0
 %define	snap	20150316
-Release:	0.%{snap}.1
+Release:	0.%{snap}.2
 License:	GPL v2+
 Group:		Libraries
 # git clone git://git.videolan.org/x262.git
 Source0:	%{name}.tar.xz
 # Source0-md5:	24b9949ae551f5881c44be65a410b0ee
 Patch0:		%{name}-lsmash-update.patch
+Patch1:		arch-buildflags.patch
+Patch2:		x32.patch
 URL:		https://www.videolan.org/developers/x262.html
 # libswscale libavformat libavcodec libavutil
 BuildRequires:	ffmpeg-devel >= 0.7.1
@@ -30,8 +32,15 @@ x262 to koder MPEG-2 oparty na najlepszych cechach x264.
 %prep
 %setup -q -n %{name}
 %patch0 -p1
+%patch1 -p1
+%ifarch x32
+%patch2 -p1
+%endif
 
 %build
+%ifarch x32
+export X32="yes"
+%endif
 %configure \
 	--extra-cflags="%{rpmcflags}" \
 	--extra-ldflags="%{rpmldflags}"
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..f863953
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,17 @@
+--- x262/common/x86/cabac-a.asm~	2015-05-02 20:29:07.000000000 +0200
++++ x262/common/x86/cabac-a.asm	2015-05-02 20:34:32.415137363 +0200
+@@ -42,11 +42,11 @@
+     %define funccpu3 %3
+     %rep 14
+         %ifidn %4, 4
+-            dq mangle(x264_coeff_last%4_ %+ funccpu1)
++            dd mangle(x264_coeff_last%4_ %+ funccpu1)
+         %elifidn %4, 64
+-            dq mangle(x264_coeff_last%4_ %+ funccpu2)
++            dd mangle(x264_coeff_last%4_ %+ funccpu2)
+         %else
+-            dq mangle(x264_coeff_last%4_ %+ funccpu3)
++            dd mangle(x264_coeff_last%4_ %+ funccpu3)
+         %endif
+         %rotate 1
+     %endrep
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/x262.git/commitdiff/d11716b77595a511d166f39e631b241997b6519e