rpms/tecnoballz/devel tecnoballz-0.92-gcc43.patch, NONE, 1.1 tecnoballz.spec, 1.3, 1.4

[Andrea Musuruane (musuruan)]

Author: musuruan

Update of /cvs/pkgs/rpms/tecnoballz/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21978

Modified Files:
	tecnoballz.spec 
Added Files:
	tecnoballz-0.92-gcc43.patch 
Log Message:
* Sun Jan 06 2008 Andrea Musuruane <musuruan at gmail.com> 0.92-2
- added a patch from upstream CVS to compile with GCC 4.3


tecnoballz-0.92-gcc43.patch:

--- NEW FILE tecnoballz-0.92-gcc43.patch ---
--- tecnoballz/tecnoballz/include/surface_sdl.h	2007/09/12 06:32:48	1.8
+++ tecnoballz/tecnoballz/include/surface_sdl.h	2007/12/11 07:22:30	1.9
@@ -1,15 +1,15 @@
-/** 
- * @file surface_sdl.h 
+/**
+ * @file surface_sdl.h
  * @brief an surface drawing surface
  * @created 2007-02-15
- * @date 2007-04-09
+ * @date 2007-12-11
  * @copyright 1991-2007 TLK Games
  * @author Bruno Ethvignot
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
  */
-/* 
+/*
  * copyright (c) 1991-2007 TLK Games all rights reserved
- * $Id: surface_sdl.h,v 1.8 2007/09/12 06:32:48 gurumeditation Exp $
+ * $Id: surface_sdl.h,v 1.9 2007/12/11 07:22:30 gurumeditation Exp $
  *
  * TecnoballZ is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -26,50 +26,59 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
  * MA  02110-1301, USA.
  */
-#ifndef __SURFACE_SDL__ 
+#ifndef __SURFACE_SDL__
 #define __SURFACE_SDL__
 class surface_sdl;
 #include "../include/tecnoballz.h"
 
 class surface_sdl:public virtual tecnoballz
-{
-
-protected:
-  SDL_Surface* surface;
-  /** The number of bytes used to represent each pixel in a surface */
-  Uint32 bytes_per_pixel;
-  char* pixel_data;
-
-public:
-  surface_sdl ();
-  surface_sdl (Uint32 w, Uint32 h, Uint32 depth);
-  ~surface_sdl ();
-  SDL_Surface* get_surface ();
-  char* get_pixel_data ();
-  char* get_pixel_data (Uint32 coord_x, Uint32 coord_x);
-  Uint32 get_row_size ();
-  Uint32 get_offset (Uint32 xcoord, Uint32 ycoord);
-  void clear (Uint32 color = 0);
-  void clear (Uint32 color, Uint32 xcoord, Uint32 ycoord, Uint32 w, Uint32 height);
-  Uint32 get_width ();
-  Uint32 get_height ();
-  Uint32 get_line_modulo (Uint32 w);
-  void lock_surface ();
-  void unlock_surface ();
-  void blit_to_surface (surface_sdl *dest);
-  void blit_to_surface (surface_sdl *dest, Uint32 xcoord, Uint32 ycoord, Uint32 w, Uint32 h);
-  void blit_to_surface (surface_sdl *dest, Uint32 x1, Uint32 y1, Uint32 x2, Uint32 y2, Uint32 w, Uint32 h);
-  void set_palette (SDL_Color *colors);
-  void set_palette (surface_sdl *dest);
-  void blit_surface (surface_sdl *dest, Uint32 x1, Uint32 y1, Uint32 x2, Uint32 y2, Uint32 w, Uint32 h);
-  void fill_shadow_rect (Uint32 xcoord, Uint32 ycoord, Uint32 w, Uint32 h);
-
-public:
-  void create_surface (Uint32 w, Uint32 h, Sint32 depth, Uint32 flags = SDL_ANYFORMAT, Uint32 red_mask = 0xf00, Uint32 green_mask = 0x0f0, Uint32 blue_mask = 0x00f, Uint32 alpha_mask = 0x00);
-  surface_sdl *cut_to_surface (Sint32 xcoord, Sint32 ycoord, Uint32 w,
-                               Uint32 h);
-  void cut_to_surface (surface_sdl *dest, Sint32 xcoord, Sint32 ycoord, Uint32 w, Uint32 h);
-};
-
+  {
 
+  protected:
+    SDL_Surface* surface;
+    /** The number of bytes used to represent each pixel in a surface */
+    Uint32 bytes_per_pixel;
+    char* pixel_data;
+
+  public:
+    surface_sdl ();
+    surface_sdl (Uint32 w, Uint32 h, Uint32 depth);
+    ~surface_sdl ();
+    SDL_Surface* get_surface ();
+    char* get_pixel_data ();
+    char* get_pixel_data (Uint32 xcoord, Uint32 ycoord);
+    Uint32 get_row_size ();
+    Uint32 get_offset (Uint32 xcoord, Uint32 ycoord);
+    void clear (Uint32 color = 0);
+    void clear (Uint32 color, Uint32 xcoord, Uint32 ycoord, Uint32 w,
+                Uint32 height);
+    Uint32 get_width ();
+    Uint32 get_height ();
+    Uint32 get_line_modulo (Uint32 w);
+    void lock_surface ();
+    void unlock_surface ();
+    void blit_to_surface (surface_sdl *dest);
+    void blit_to_surface (surface_sdl *dest, Uint32 xcoord,
+                          Uint32 ycoord, Uint32 w, Uint32 h);
+    void blit_to_surface (surface_sdl *dest, Uint32 x1, Uint32 y1,
+                          Uint32 x2, Uint32 y2, Uint32 w, Uint32 h);
+    void set_palette (SDL_Color *colors);
+    void set_palette (surface_sdl *dest);
+    void blit_surface (surface_sdl *dest, Uint32 x1, Uint32 y1,
+                       Uint32 x2, Uint32 y2, Uint32 w, Uint32 h);
+    void fill_shadow_rect (Uint32 xcoord, Uint32 ycoord, Uint32 w,
+                           Uint32 h);
+
+  public:
+    void create_surface (Uint32 w, Uint32 h, Sint32 depth,
+                         Uint32 flags = SDL_ANYFORMAT,
+                         Uint32 red_mask = 0xf00,
+                         Uint32 green_mask = 0x0f0,
+                         Uint32 blue_mask = 0x00f,
+                         Uint32 alpha_mask = 0x00);
+    surface_sdl *cut_to_surface (Sint32 xcoord, Sint32 ycoord, Uint32 w,
+                                 Uint32 h);
+    void cut_to_surface (surface_sdl *dest, Sint32 xcoord,
+                         Sint32 ycoord, Uint32 w, Uint32 h);
+  };
 #endif



Index: tecnoballz.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tecnoballz/devel/tecnoballz.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tecnoballz.spec	23 Dec 2007 13:32:15 -0000	1.3
+++ tecnoballz.spec	6 Jan 2008 20:49:41 -0000	1.4
@@ -1,6 +1,6 @@
 Name: tecnoballz
 Version: 0.92
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: A Brick Busting game
 
 Group: Amusements/Games
@@ -12,6 +12,8 @@
 # Hans de Goede
 Patch0: tecnoballz-0.92-no-smpeg.patch
 Patch1: tecnoballz-0.92-dropsgid.patch
+# Upstream CVS
+Patch2: tecnoballz-0.92-gcc43.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -35,6 +37,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p2
 
 # FIX: set gamedir and scoredir
 sed -i 's:gamesdir = $(prefix)/games:gamesdir = ${bindir}:' src/Makefile.in
@@ -95,6 +98,9 @@
 
 
 %changelog
+* Sun Jan 06 2008 Andrea Musuruane <musuruan at gmail.com> 0.92-2
+- added a patch from upstream CVS to compile with GCC 4.3
+
 * Sat Dec 22 2007 Andrea Musuruane <musuruan at gmail.com> 0.92-1
 - updated to v0.92
 - license changed to GPLv3+