[packages/xvid] - fix building on x32 - rel 3

[baggins]

commit bb10258053cab2b9f18a3c2cb6d590b339ceb7f6
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Thu Mar 5 18:22:34 2015 +0000

    - fix building on x32
    - rel 3

 x32.patch | 28 ++++++++++++++++++++++++++++
 xvid.spec |  6 ++++--
 2 files changed, 32 insertions(+), 2 deletions(-)
---
diff --git a/xvid.spec b/xvid.spec
index f0d22f2..dae4d11 100644
--- a/xvid.spec
+++ b/xvid.spec
@@ -4,17 +4,18 @@ Summary:	ISO MPEG-4 compliant video codec
 Summary(pl.UTF-8):	Implementacja kodeka wideo zgodnego ze standardem ISO MPEG-4
 Name:		xvid
 Version:	1.3.2
-Release:	2
+Release:	3
 Epoch:		1
 License:	GPL
 Group:		Libraries
 # Source0Download: http://www.xvid.org/Downloads.43.0.html
 Source0:	http://downloads.xvid.org/downloads/%{name}core-%{version}.tar.bz2
 # Source0-md5:	34389e980d4f849688f8b1e168f4e2f9
+Patch0:		x32.patch
 URL:		http://www.xvid.org/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
-%ifarch %{ix86} %{x8664}
+%ifarch %{ix86} %{x8664} x32
 BuildRequires:	nasm >= 2.07
 %endif
 Provides:	xvidcore = %{epoch}:%{version}-%{release}
@@ -59,6 +60,7 @@ Statyczna biblioteka kodeka wideo XviD.
 
 %prep
 %setup -q -n %{name}core
+%patch0 -p1
 
 %build
 cd build/generic
diff --git a/x32.patch b/x32.patch
new file mode 100644
index 0000000..dae69d3
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,28 @@
+--- xvidcore/build/generic/configure.in~	2011-05-18 07:59:28.000000000 +0000
++++ xvidcore/build/generic/configure.in	2015-03-05 18:01:10.805221468 +0000
+@@ -179,6 +179,11 @@
+ 	  	ARCHITECTURE="IA32"
+                 ;;
+           x86_64)
++	  case "$target_os" in
++		  *gnux32)
++                SUB_ARCHITECTURE="X32"
++		;;
++	  esac
+                 AC_MSG_RESULT(x86_64)
+                 ARCHITECTURE="X86_64"
+ 		;;	
+@@ -423,8 +431,13 @@
+        case "$target_os" in
+            *bsd*|linux*|beos|irix*|solaris*)
+                if test "$ARCHITECTURE" = "X86_64" ; then
++                 if test "$SUB_ARCHITECTURE" = "X32" ; then
++                   AC_MSG_RESULT([elfx32])
++                   NASM_FORMAT="elfx32"
++                 else
+                    AC_MSG_RESULT([elf64])
+                    NASM_FORMAT="elf64"
++                 fi
+                else
+                    AC_MSG_RESULT([elf])
+                    NASM_FORMAT="elf"
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xvid.git/commitdiff/bb10258053cab2b9f18a3c2cb6d590b339ceb7f6