- attempt to fix building nine on x32

diff --git a/Mesa.spec b/Mesa.spec
index c7c8f9759e1530232479533ce8f6189864f6c653..496832a433b8ac978d85ad4c7be688acb89721cf 100644 (file)
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -38,10 +38,10 @@
 %define                glproto_ver             1.4.14
 %define                presentproto_ver        1.0
 
-%ifarch x32
-# X32 does not support ms_abi attribute
-%undefine      with_nine
-%endif
+#ifarch x32
+## X32 does not support ms_abi attribute
+#undefine      with_nine
+#endif
 
 %if %{without gallium}
 %undefine      with_gallium_intel
@@ -69,6 +69,7 @@ Group:                X11/Libraries
 Source0:       ftp://ftp.freedesktop.org/pub/mesa/%{version}/mesa-%{version}.tar.xz
 # Source0-md5: bf9118bf0fbf360715cfe60baf7a1db5
 Patch0:                missing-type.patch
+Patch1:                x32.patch
 URL:           http://www.mesa3d.org/
 BuildRequires: autoconf >= 2.60
 BuildRequires: automake
@@ -1076,6 +1077,7 @@ ATI Radeon oparte na układach Southern Islands.
 %prep
 %setup -q -n mesa-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..0551349
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,11 @@
+--- mesa-11.0.3/include/D3D9/d3d9types.h~      2015-10-02 10:45:51.000000000 +0200
++++ mesa-11.0.3/include/D3D9/d3d9types.h       2015-10-11 23:43:57.442310720 +0200
+@@ -178,7 +178,7 @@
+ #undef WINAPI
+ #endif /* WINAPI*/
+ 
+-#if defined(__x86_64__) || defined(_M_X64)
++#if (defined(__x86_64__) || defined(_M_X64)) && !defined(__ILP32__)
+ #define WINAPI __attribute__((ms_abi))
+ #else /* x86_64 */
+ #define WINAPI __attribute__((__stdcall__))