- fix building on x32

- rel 15

diff --git a/python-pygame.spec b/python-pygame.spec
index b4105518b76624fe482f6e71a88c58afe944655d..17843e7cd9f76eb948632376a0b416421a8239b5 100644 (file)
--- a/python-pygame.spec
+++ b/python-pygame.spec
@@ -12,13 +12,14 @@ Summary:    Python modules designed for writing games
 Summary(pl.UTF-8):     Moduły Pythona dla piszących gry
 Name:          python-%{module}
 Version:       1.9.1
-Release:       14
+Release:       15
 License:       LGPL v2.1+
 Group:         Libraries/Python
 Source0:       http://www.pygame.org/ftp/pygame-%{version}release.tar.gz
 # Source0-md5: 1c4cdc708d17c8250a2d78ef997222fc
 Patch0:                %{name}-porttime.patch
 Patch1:                %{name}-remove-v4l.patch
+Patch2:                x32.patch
 URL:           http://www.pygame.org/
 BuildRequires: SDL-devel
 BuildRequires: SDL_image-devel
@@ -66,6 +67,7 @@ Pliki nagłówkowe języka C modułów pygame.
 %setup -q -n %{module}-%{version}release
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 CFLAGS="%{rpmcflags} -I/usr/include/smpeg"; export CFLAGS

diff --git a/x32.patch b/x32.patch
new file mode 100644 (file)
index 0000000..fc8122f
--- /dev/null
+++ b/x32.patch
@@ -0,0 +1,22 @@
+--- pygame-1.9.1release/config_unix.py~        2015-05-10 12:40:56.000000000 +0200
++++ pygame-1.9.1release/config_unix.py 2015-05-10 12:47:41.989724259 +0200
+@@ -17,7 +17,7 @@
+ #these get prefixes with '/usr' and '/usr/local' or the $LOCALBASE
+ origincdirs = ['/include', '/include/SDL', '/include/SDL',
+                '/include/smpeg' ]
+-origlibdirs = ['/lib','/lib64','/X11R6/lib']
++origlibdirs = ['/lib','/lib64','/libx32']
+ 
+ def confirm(message):
+     "ask a yes/no question, return result"
+--- pygame-1.9.1release/src/scale_mmx.c~       2009-05-26 23:15:24.000000000 +0200
++++ pygame-1.9.1release/src/scale_mmx.c        2015-05-10 12:52:36.495345985 +0200
+@@ -29,7 +29,7 @@
+  * Including source code like this may be frowned upon by some,\r
+  * but the alternative is ungainly conditionally compiled code.\r
+  */\r
+-#   if defined(__x86_64__)\r
++#   if defined(__x86_64__) && !defined(__ILP32__)\r
+ #       include "scale_mmx64.c"\r
+ #   elif defined(__i386__)\r
+ #       include "scale_mmx32.c"\r