commit trackballs for openSUSE:Factory
![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community,
here is the log from the commit of package trackballs for openSUSE:Factory
checked in at Mon Mar 8 18:26:06 CET 2010.
--------
--- trackballs/trackballs.changes 2007-09-24 19:59:11.000000000 +0200
+++ /mounts/work_src_done/STABLE/trackballs/trackballs.changes 2010-03-08 08:19:44.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Mar 7 16:40:37 UTC 2010 - coolo@novell.com
+
+- fix build with gcc 4.5
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
trackballs-1.1.4-bufferoverflow.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ trackballs.spec ++++++
--- /var/tmp/diff_new_pack.3ye5db/_old 2010-03-08 18:25:50.000000000 +0100
+++ /var/tmp/diff_new_pack.3ye5db/_new 2010-03-08 18:25:50.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package trackballs (Version 1.1.4)
#
-# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,10 +21,9 @@
BuildRequires: SDL_image-devel SDL_mixer-devel SDL_ttf-devel gcc-c++ guile-devel hicolor-icon-theme libdrm-devel libstdc++ libstdc++-devel update-desktop-files xorg-x11-Mesa-devel
Summary: Trackballs - A Marble Madness-like Game
Version: 1.1.4
-Release: 146
+Release: 147
PreReq: permissions
AutoReqProv: on
-Provides: trackballs-music
Obsoletes: trackballs-music
Source0: trackballs-%version.tar.bz2
Source4: %name.png
@@ -35,8 +34,9 @@
Patch: trackballs-%version-codecleanup.diff
Patch1: trackballs-off_by_one.diff
Patch2: void-funcs.diff
+Patch3: trackballs-1.1.4-bufferoverflow.diff
Group: Amusements/Games/3D/Other
-License: GPL v2 or later
+License: GPLv2+
Url: http://trackballs.sf.net
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _gamesbindir /usr/games
@@ -65,6 +65,7 @@
%patch
%patch1
%patch2
+%patch3 -p1
sed -i 's/MimeType=application\/x-executable/&;/' share/icons/trackballs.desktop.in
%build
++++++ trackballs-1.1.4-bufferoverflow.diff ++++++
Index: trackballs-1.1.4/src/enterHighScoreMode.cc
===================================================================
--- trackballs-1.1.4.orig/src/enterHighScoreMode.cc 2007-04-07 15:17:17.000000000 +0200
+++ trackballs-1.1.4/src/enterHighScoreMode.cc 2010-03-07 17:27:44.000000000 +0100
@@ -112,7 +112,7 @@ void EnterHighScoreMode::activated() {
if(!background) { printf("Error: failed to load %s\n",str); exit(0); }
}
- snprintf(name,sizeof(str),"%s",Game::current->gamer->name);
+ snprintf(name,sizeof(name),"%s",Game::current->gamer->name);
if(!HighScore::highScore->isHighScore(Game::current->player1->score))
GameMode::activate(MenuMode::menuMode);
++++++ trackballs-1.1.4-codecleanup.diff ++++++
--- /var/tmp/diff_new_pack.3ye5db/_old 2010-03-08 18:25:51.000000000 +0100
+++ /var/tmp/diff_new_pack.3ye5db/_new 2010-03-08 18:25:51.000000000 +0100
@@ -1,6 +1,8 @@
---- ../trackballs-1.1.1.orig/src/font.cc 2005-11-17 15:18:37.518019849 +0100
-+++ ./src/font.cc 2005-11-17 15:25:04.108830070 +0100
-@@ -207,6 +207,7 @@
+Index: src/font.cc
+===================================================================
+--- src/font.cc.orig 2005-11-22 23:11:48.000000000 +0100
++++ src/font.cc 2010-03-07 17:24:16.000000000 +0100
+@@ -207,6 +207,7 @@ int Font::figureFontInfo(void *pixels, i
this->char_sizes[5*CHAR_WNB+2]=0;
this->char_sizes[4*CHAR_WNB+14]=0;
*/
@@ -8,7 +10,7 @@
}
int Font::addText(int font, const char *text, int x, int y, float sx, float sy, double delay,
-@@ -806,6 +807,7 @@
+@@ -806,6 +807,7 @@ int Font::l_drawSimpleText(const char *t
glEnd();
Leave2DMode();
@@ -16,7 +18,7 @@
}
int Font::l_drawRightSimpleText(const char *text, int x, int y, float sx, float sy, float r, float g, float b, float a) {
-@@ -849,6 +851,7 @@
+@@ -849,6 +851,7 @@ int Font::l_drawSimpleText3D(const char
}
glEnd();
@@ -24,10 +26,11 @@
}
-diff -u -r ../trackballs-1.1.1.orig/src/glHelp.cc ./src/glHelp.cc
---- ../trackballs-1.1.1.orig/src/glHelp.cc 2005-11-17 15:18:37.356048034 +0100
-+++ ./src/glHelp.cc 2005-11-17 15:32:52.026862572 +0100
-@@ -279,7 +279,7 @@
+Index: src/glHelp.cc
+===================================================================
+--- src/glHelp.cc.orig 2007-04-07 15:15:09.000000000 +0200
++++ src/glHelp.cc 2010-03-07 17:24:32.000000000 +0100
+@@ -282,7 +282,7 @@ int createSnapshot()
/* allocate buffer */
if ((buffer = (unsigned char*)malloc(sizeof(unsigned char)*screenWidth*screenHeight*3)) == NULL)
{
@@ -36,7 +39,7 @@
return(0);
}
-@@ -333,6 +333,7 @@
+@@ -336,6 +336,7 @@ int createSnapshot()
/* freed everything */
fclose(f);
free(buffer);
@@ -44,9 +47,11 @@
}
---- ../trackballs-1.1.1.orig/src/guile.cc 2005-11-17 15:18:37.636999145 +0100
-+++ ./src/guile.cc 2005-11-17 15:18:52.901342971 +0100
-@@ -880,11 +880,11 @@
+Index: src/guile.cc
+===================================================================
+--- src/guile.cc.orig 2007-05-25 16:22:16.000000000 +0200
++++ src/guile.cc 2010-03-07 17:24:16.000000000 +0100
+@@ -1121,11 +1121,11 @@ SCM_DEFINE (difficulty, "difficulty", 0,
/*********** use-grid ************/
SCM_DEFINE (use_grid, "use-grid", 1, 0, 0, (SCM v), "Turns the grid on/off")
@@ -60,7 +65,7 @@
/*********** jump ************/
SCM_DEFINE (jump, "jump", 1, 0, 0, (SCM v), "Scales maximum jump height of player.")
-@@ -893,6 +893,7 @@
+@@ -1134,6 +1134,7 @@ SCM_DEFINE (jump, "jump", 1, 0, 0, (SCM
SCM_ASSERT(SCM_NUMBERP(v),v,SCM_ARG1,FUNC_NAME);
if(Game::current)
Game::current->jumpFactor=scm_num2dbl(v,FUNC_NAME);
@@ -68,7 +73,7 @@
}
#undef FUNC_NAME
-@@ -903,6 +904,7 @@
+@@ -1144,6 +1145,7 @@ SCM_DEFINE (scale_oxygen, "scale-oxygen"
SCM_ASSERT(SCM_NUMBERP(v),v,SCM_ARG1,FUNC_NAME);
if(Game::current)
Game::current->oxygenFactor=scm_num2dbl(v,FUNC_NAME);
@@ -76,7 +81,7 @@
}
#undef FUNC_NAME
-@@ -1188,6 +1190,7 @@
+@@ -1348,6 +1350,7 @@ SCM_DEFINE (camera_angle,"camera-angle",
SCM_ASSERT(SCM_NUMBERP(z),z,SCM_ARG2,FUNC_NAME);
((MainMode*)GameMode::current)->wantedXYAngle = scm_num2dbl(xy,FUNC_NAME);
((MainMode*)GameMode::current)->wantedZAngle = scm_num2dbl(z,FUNC_NAME);
@@ -84,7 +89,7 @@
}
#undef FUNC_NAME
-@@ -1197,6 +1200,7 @@
+@@ -1358,6 +1361,7 @@ SCM_DEFINE (restart_time,"restart-time",
{
SCM_ASSERT(SCM_NUMBERP(t),t,SCM_ARG1,FUNC_NAME);
Game::current->player1->timeOnDeath=scm_num2dbl(t,FUNC_NAME);
@@ -92,10 +97,11 @@
}
#undef FUNC_NAME
-diff -u -r ../trackballs-1.1.1.orig/src/image.cc ./src/image.cc
---- ../trackballs-1.1.1.orig/src/image.cc 2005-11-17 15:18:37.605004713 +0100
-+++ ./src/image.cc 2005-11-17 15:18:52.912341057 +0100
-@@ -59,7 +59,7 @@
+Index: src/image.cc
+===================================================================
+--- src/image.cc.orig 2005-11-22 23:11:48.000000000 +0100
++++ src/image.cc 2010-03-07 17:24:16.000000000 +0100
+@@ -59,7 +59,7 @@ static Image *ImageOpen(char *fileName)
image = (Image *) malloc(sizeof(Image));
if(image == NULL)
{
@@ -104,7 +110,7 @@
return(NULL);
}
if((image->file = fopen(fileName, "rb")) == NULL)
-@@ -230,7 +230,7 @@
+@@ -230,7 +230,7 @@ IMAGE *ImageLoad(char *fileName)
final = (IMAGE *) malloc(sizeof(IMAGE));
if(final == NULL)
{
@@ -113,7 +119,7 @@
ImageClose(image);
return(NULL);
}
-@@ -253,7 +253,7 @@
+@@ -253,7 +253,7 @@ IMAGE *ImageLoad(char *fileName)
{
ImageClose(image);
free(final);
@@ -122,7 +128,7 @@
return(NULL);
}
-@@ -283,7 +283,7 @@
+@@ -283,7 +283,7 @@ void read_2d_image_rgb(char *image, unsi
*rbuffer = (unsigned char*)malloc(sizeof(unsigned char)*base_image->sizeX*base_image->sizeY*4);
if (*rbuffer == NULL)
{
@@ -131,10 +137,11 @@
/* Free the image */
free(base_image->data);
free(base_image);
-diff -u -r ../trackballs-1.1.1.orig/src/player.cc ./src/player.cc
---- ../trackballs-1.1.1.orig/src/player.cc 2005-11-17 15:18:37.402040031 +0100
-+++ ./src/player.cc 2005-11-17 15:18:52.919339839 +0100
-@@ -71,7 +71,7 @@
+Index: src/player.cc
+===================================================================
+--- src/player.cc.orig 2007-05-25 11:42:39.000000000 +0200
++++ src/player.cc 2010-03-07 17:24:16.000000000 +0100
+@@ -75,7 +75,7 @@ void Player::draw() {
Ball::draw();
}
void Player::tick(Real t) {
@@ -143,7 +150,7 @@
int superAccelerate=0;
static time_t lastTick=0;
-@@ -341,4 +341,5 @@
+@@ -370,4 +370,5 @@ Boolean Player::crash(Real speed) {
double espeed=modTimeLeft[MOD_GLASS] ? (1.5*speed) / crashTolerance : speed / crashTolerance;
setHealth(1.0-espeed);
this->Ball::crash(speed);
++++++ trackballs-off_by_one.diff ++++++
--- /var/tmp/diff_new_pack.3ye5db/_old 2010-03-08 18:25:51.000000000 +0100
+++ /var/tmp/diff_new_pack.3ye5db/_new 2010-03-08 18:25:51.000000000 +0100
@@ -1,8 +1,10 @@
Matrix3D is a [3][3] array.
---- src/glHelp.cc
-+++ src/glHelp.cc
-@@ -762,7 +762,7 @@
+Index: src/glHelp.cc
+===================================================================
+--- src/glHelp.cc.orig 2010-03-07 17:24:16.000000000 +0100
++++ src/glHelp.cc 2010-03-07 17:24:28.000000000 +0100
+@@ -759,7 +759,7 @@ void useMatrix(Matrix4d A,const double B
void useMatrix(Matrix3d A,const double B[3],double C[3]) {
int i,k;
for(i=0;i<3;i++) {
++++++ void-funcs.diff ++++++
--- /var/tmp/diff_new_pack.3ye5db/_old 2010-03-08 18:25:51.000000000 +0100
+++ /var/tmp/diff_new_pack.3ye5db/_new 2010-03-08 18:25:51.000000000 +0100
@@ -1,6 +1,8 @@
---- src/glHelp.cc 2007/07/10 15:15:32 1.1
-+++ src/glHelp.cc 2007/07/10 16:23:44
-@@ -62,9 +62,7 @@
+Index: src/glHelp.cc
+===================================================================
+--- src/glHelp.cc.orig 2010-03-07 17:24:16.000000000 +0100
++++ src/glHelp.cc 2010-03-07 17:24:16.000000000 +0100
+@@ -62,9 +62,7 @@ GLuint mousePointerTexture;
void draw2DString(TTF_Font *font,char *string, int x,int y,Uint8 red, Uint8 green, Uint8 blue) {
int w,h;
SDL_Color fgColor={255,255,255};
@@ -10,7 +12,7 @@
GLuint texture;
GLfloat texcoord[4];
GLfloat texMinX, texMinY;
-@@ -516,7 +514,6 @@
+@@ -517,7 +515,6 @@ int loadTexture(char *name, Font *font)
void glHelpInit() {
char str[256];
@@ -18,7 +20,7 @@
qobj = gluNewQuadric();
gluQuadricDrawStyle(qobj,GLU_FILL);
-@@ -612,12 +609,12 @@
+@@ -613,12 +610,12 @@ void regenerateSphereDisplaylists() {
#define FRAME 50
@@ -33,7 +35,7 @@
}
// YP: if the texture is not found, try to load it
// and add it in the list
-@@ -625,7 +622,7 @@
+@@ -626,7 +623,7 @@ int bindTexture(char *name) {
if(i >= 0) glBindTexture(GL_TEXTURE_2D,textures[i]);
}
@@ -42,7 +44,7 @@
GLfloat texCoord[4];
char str[256];
SDL_Surface *surface;
-@@ -646,14 +643,13 @@
+@@ -647,14 +644,13 @@ int resetTextures() {
}
if(!surface) {
printf(_("Warning: Failed to load texture %s\n"),str);
@@ -58,7 +60,7 @@
}
/* Calculates and displays current framerate */
-@@ -944,8 +940,6 @@
+@@ -945,8 +941,6 @@ GLuint LoadTexture(SDL_Surface *surface,
SDL_Surface *source=SDL_ConvertSurface(surface,image->format,SDL_SWSURFACE);
SDL_LockSurface(source);
SDL_LockSurface(image);
@@ -67,7 +69,7 @@
for(int x=0;x
participants (1)
-
root@Hilbert.suse.de