[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/pygame/devel pygame-1.7.1-64bit.patch, 1.1, 1.2 pygame.spec, 1.16, 1.17 pygame-1.7.1-64bit-2.patch, 1.1, NONE



Author: xulchris

Update of /cvs/extras/rpms/pygame/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28594

Modified Files:
	pygame-1.7.1-64bit.patch pygame.spec 
Removed Files:
	pygame-1.7.1-64bit-2.patch 
Log Message:
fix up 64bit patches

pygame-1.7.1-64bit.patch:

Index: pygame-1.7.1-64bit.patch
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame-1.7.1-64bit.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pygame-1.7.1-64bit.patch	21 Apr 2006 00:19:40 -0000	1.1
+++ pygame-1.7.1-64bit.patch	16 May 2007 02:32:00 -0000	1.2
@@ -1,5 +1,51 @@
---- src/mixer.c.orig	2005-08-10 23:14:27.000000000 -0700
-+++ src/mixer.c	2006-04-20 14:16:28.000000000 -0700
+diff -ur pygame-1.7.1release.orig/src/event.c pygame-1.7.1release/src/event.c
+--- pygame-1.7.1release.orig/src/event.c	2005-08-15 04:11:40.000000000 -0700
++++ pygame-1.7.1release/src/event.c	2007-05-15 19:03:55.000000000 -0700
+@@ -534,7 +534,7 @@
+ 	if(keywords)
+ 	{
+ 		PyObject *key, *value;
+-		int pos  = 0;
++		Py_ssize_t pos  = 0;
+ 		while(PyDict_Next(keywords, &pos, &key, &value))
+ 			PyDict_SetItem(dict, key, value);
+ 	}
+diff -ur pygame-1.7.1release.orig/src/image.c pygame-1.7.1release/src/image.c
+--- pygame-1.7.1release.orig/src/image.c	2005-03-12 17:12:35.000000000 -0800
++++ pygame-1.7.1release/src/image.c	2007-05-15 19:03:55.000000000 -0700
+@@ -291,7 +291,8 @@
+ 	PyObject *surfobj, *string=NULL;
+ 	char *format, *data, *pixels;
+ 	SDL_Surface *surf, *temp=NULL;
+-	int w, h, color, len, flipped=0;
++	int w, h, color, flipped=0;
++	Py_ssize_t len;
+ 	int Rmask, Gmask, Bmask, Amask, Rshift, Gshift, Bshift, Ashift, Rloss, Gloss, Bloss, Aloss;
+ 	int hascolorkey, colorkey;
+ 
+@@ -605,7 +606,8 @@
+ 	PyObject *string;
+ 	char *format, *data;
+ 	SDL_Surface *surf = NULL;
+-	int w, h, len, flipped=0;
++	int w, h, flipped=0;
++	Py_ssize_t len;
+ 	int loopw, looph;
+ 
+ 	if(!PyArg_ParseTuple(arg, "O!(ii)s|i", &PyString_Type, &string, &w, &h, &format, &flipped))
+@@ -729,7 +731,8 @@
+ 	PyObject *buffer;
+ 	char *format, *data;
+ 	SDL_Surface *surf = NULL;
+-	int w, h, len;
++	int w, h;
++	Py_ssize_t len;
+         PyObject *surfobj;
+ 
+ 	if(!PyArg_ParseTuple(arg, "O(ii)s|i", &buffer, &w, &h, &format))
+diff -ur pygame-1.7.1release.orig/src/mixer.c pygame-1.7.1release/src/mixer.c
+--- pygame-1.7.1release.orig/src/mixer.c	2005-08-10 23:14:27.000000000 -0700
++++ pygame-1.7.1release/src/mixer.c	2007-05-15 19:03:40.000000000 -0700
 @@ -81,7 +81,7 @@
  	    channeldata[channel].queue = NULL;
  	    channelnum = Mix_PlayChannelTimed(channel, sound, 0, -1);
@@ -63,8 +109,9 @@
  
              channeldata[channelnum].sound = sound;
              Py_INCREF(sound);
---- src/overlay.c.org	2005-08-09 19:45:15.000000000 -0700
-+++ src/overlay.c	2006-04-20 14:16:28.000000000 -0700
+diff -ur pygame-1.7.1release.orig/src/overlay.c pygame-1.7.1release/src/overlay.c
+--- pygame-1.7.1release.orig/src/overlay.c	2005-08-09 19:45:15.000000000 -0700
++++ pygame-1.7.1release/src/overlay.c	2007-05-15 19:03:40.000000000 -0700
 @@ -85,7 +85,7 @@
  {
  	// Parse data params for frame
@@ -87,29 +134,21 @@
  		for (y=0; y< self->cOverlay->h; y++)
  		{
  			memcpy( dst_y, src_y, self->cOverlay->w );
---- src/time.c.org	2004-07-22 17:33:08.000000000 -0700
-+++ src/time.c	2006-04-20 14:24:43.000000000 -0700
-@@ -34,7 +34,7 @@
- 	{
- 		SDL_Event event;
- 		memset(&event, 0, sizeof(event));
--		event.type = (int)param;
-+		event.type = (intptr_t)param;
- 		SDL_PushEvent(&event);
- 	}
- 	return interval;
-@@ -193,7 +193,8 @@
- static PyObject* time_set_timer(PyObject* self, PyObject* arg)
- {
- 	SDL_TimerID newtimer;
--	int ticks = 0, event = SDL_NOEVENT;
-+	int ticks = 0;
-+	intptr_t event = SDL_NOEVENT;
- 	if(!PyArg_ParseTuple(arg, "ii", &event, &ticks))
- 		return NULL;
+diff -ur pygame-1.7.1release.orig/src/rect.c pygame-1.7.1release/src/rect.c
+--- pygame-1.7.1release.orig/src/rect.c	2004-07-18 18:39:49.000000000 -0700
++++ pygame-1.7.1release/src/rect.c	2007-05-15 19:05:10.000000000 -0700
+@@ -937,7 +937,7 @@
  
---- src/surface.c.orig	2005-02-05 16:03:07.000000000 -0800
-+++ src/surface.c	2006-04-20 15:01:07.000000000 -0700
+ /* sequence functions */
+ 
+-static int rect_length(PyRectObject *self)
++static Py_ssize_t rect_length(PyObject *_self)
+ {
+ 	return 4;
+ }
+diff -ur pygame-1.7.1release.orig/src/surface.c pygame-1.7.1release/src/surface.c
+--- pygame-1.7.1release.orig/src/surface.c	2005-02-05 16:03:07.000000000 -0800
++++ pygame-1.7.1release/src/surface.c	2007-05-15 19:03:55.000000000 -0700
 @@ -35,7 +35,7 @@
                          SDL_Surface *dst, SDL_Rect *dstrect);
  
@@ -119,6 +158,15 @@
  
  
  /* surface object methods */
+@@ -1353,7 +1353,7 @@
+ 	if(rect && kw)
+ 	{
+ 		PyObject *key, *value;
+-		int pos=0;
++		Py_ssize_t pos=0;
+ 		while(PyDict_Next(kw, &pos, &key, &value))
+ 		{
+ 			if((PyObject_SetAttr(rect, key, value) == -1))
 @@ -1880,7 +1880,7 @@
      return (PyObject *)self;
  }
@@ -171,3 +219,25 @@
  			}
  		}
  	}
+diff -ur pygame-1.7.1release.orig/src/time.c pygame-1.7.1release/src/time.c
+--- pygame-1.7.1release.orig/src/time.c	2004-07-22 17:33:08.000000000 -0700
++++ pygame-1.7.1release/src/time.c	2007-05-15 19:03:40.000000000 -0700
+@@ -34,7 +34,7 @@
+ 	{
+ 		SDL_Event event;
+ 		memset(&event, 0, sizeof(event));
+-		event.type = (int)param;
++		event.type = (intptr_t)param;
+ 		SDL_PushEvent(&event);
+ 	}
+ 	return interval;
+@@ -193,7 +193,8 @@
+ static PyObject* time_set_timer(PyObject* self, PyObject* arg)
+ {
+ 	SDL_TimerID newtimer;
+-	int ticks = 0, event = SDL_NOEVENT;
++	int ticks = 0;
++	intptr_t event = SDL_NOEVENT;
+ 	if(!PyArg_ParseTuple(arg, "ii", &event, &ticks))
+ 		return NULL;
+


Index: pygame.spec
===================================================================
RCS file: /cvs/extras/rpms/pygame/devel/pygame.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pygame.spec	13 May 2007 03:47:47 -0000	1.16
+++ pygame.spec	16 May 2007 02:32:00 -0000	1.17
@@ -2,7 +2,7 @@
 
 Name:           pygame
 Version:        1.7.1
-Release:        13%{?dist}
+Release:        14%{?dist}
 Summary:        Python modules for writing games
 
 Group:          Development/Languages
@@ -10,7 +10,6 @@
 URL:            http://www.pygame.org
 Patch0:         %{name}-%{version}-config.patch
 Patch1:         %{name}-%{version}-64bit.patch
-Patch2:         %{name}-%{version}-64bit-2.patch
 Source0:        http://pygame.org/ftp/%{name}-%{version}release.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -46,8 +45,7 @@
 %prep
 %setup -qn %{name}-%{version}release
 %patch0 -p0 -b .config~
-%patch1 -p0 -b .64bit~
-%patch2 -p1 -b .64bit-2~
+%patch1 -p1 -b .64bit~
 
 # rpmlint fixes
 rm -f "examples/.#stars.py.1.7"
@@ -97,6 +95,9 @@
 
 
 %changelog
+* Tue May 15 2007 Christopher Stone <chris stone gmail com> 1.7.1-14
+- Add one more bit to 64-bit patch
+
 * Sat May 12 2007 Christopher Stone <chris stone gmail com> 1.7.1-13
 - Apply 64-bit patch for python 2.5 (bz #239899)
 - Some minor spec file cleanups


--- pygame-1.7.1-64bit-2.patch DELETED ---


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]