rpms/sopwith/F-12 sopwith-gtk-video.patch, NONE, 1.1 sopwith-sdl-video.patch, NONE, 1.1 sopwith-vid_vga.patch, NONE, 1.1 sopwith.6.patch, NONE, 1.1 sopwith.spec, 1.13, 1.14

[Adrian Reber]

Author: adrian

Update of /cvs/extras/rpms/sopwith/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv10866

Modified Files:
	sopwith.spec 
Added Files:
	sopwith-gtk-video.patch sopwith-sdl-video.patch 
	sopwith-vid_vga.patch sopwith.6.patch 
Log Message:
* Wed Apr 21 2010 Adrian Reber <adrian at lisas.de> - 1.7.1-10
- fixed a 32/64 bit bug in the GTK version (#583417)
- added a few patches from debian
- now also using the %{dist} tag


sopwith-gtk-video.patch:
 video.c |   10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

--- NEW FILE sopwith-gtk-video.patch ---
--- a/src/gtk/video.c
+++ b/src/gtk/video.c
@@ -39,6 +39,8 @@
 
 #include "vid_vga.c"
 
+#include <string.h>
+
 BOOL vid_fullscreen = FALSE;
 BOOL vid_double_size = TRUE;
 
@@ -579,11 +581,11 @@ static void Vid_UpdateScaled()
 			pixels2 += SCR_WDTH;
 		}
 	} else if(screen->bpp == 4) {
-		register unsigned long *pixels = (unsigned long *) screen->mem;
+		register unsigned int *pixels = (unsigned int *) screen->mem;
 		register unsigned char *pixels2 = screenbuf;
 
 		for (y = 0; y < SCR_HGHT; ++y) {
-			register unsigned long *p = pixels;
+			register unsigned int *p = pixels;
 			register unsigned char *p2 = pixels2;
 
 			for (x = 0; x < SCR_WDTH; ++x) {
@@ -663,11 +665,11 @@ static void Vid_UpdateUnscaled()
 			pixels2 += SCR_WDTH;
 		}
 	} else if(screen->bpp == 4) {
-		register unsigned long *pixels = (unsigned long *) screen->mem;
+		register unsigned int *pixels = (unsigned int *) screen->mem;
 		register unsigned char *pixels2 = screenbuf;
 
 		for (y = 0; y < SCR_HGHT; ++y) {
-			register unsigned long *p = pixels;
+			register unsigned int *p = pixels;
 			register unsigned char *p2 = pixels2;
 
 			for (x = 0; x < SCR_WDTH; ++x)

sopwith-sdl-video.patch:
 video.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE sopwith-sdl-video.patch ---
--- sopwith-1.7.1.orig/src/sdl/video.c
+++ sopwith-1.7.1/src/sdl/video.c
@@ -31,6 +31,8 @@
 
 #include "vid_vga.c"
 
+#include <time.h>
+
 // lcd mode to emulate my old laptop i used to play sopwith on :)
 
 //#define LCD

sopwith-vid_vga.patch:
 vid_vga.c |    2 ++
 1 file changed, 2 insertions(+)

--- NEW FILE sopwith-vid_vga.patch ---
--- sopwith-1.7.1.orig/src/vid_vga.c
+++ sopwith-1.7.1/src/vid_vga.c
@@ -32,6 +32,8 @@
 #include "swsymbol.h"
 #include "swutil.h"
 
+#include <string.h>
+
 // this should be in a header somewhere
 #define SBAR_HGHT 19
 

sopwith.6.patch:
 sopwith.6 |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE sopwith.6.patch ---
--- sopwith-1.7.1.orig/doc/sopwith.6
+++ sopwith-1.7.1/doc/sopwith.6
@@ -5,7 +5,7 @@
 
 .SH SYNOPSIS
 .B sopwith 
-[ \-n | \-s | \-c | \-l | \-j \fIhost\fR ] [-f] [-2] [-x] [-q]
+[ \-n | \-s | \-c | \-l | \-j \fIhost\fR ] [\-f] [\-2] [\-x] [\-q]
 
 .SH DESCRIPTION
 Sopwith is a classic 1980s shoot 'em up originally developed by BMB


Index: sopwith.spec
===================================================================
RCS file: /cvs/extras/rpms/sopwith/F-12/sopwith.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- sopwith.spec	27 Jul 2009 04:35:33 -0000	1.13
+++ sopwith.spec	22 Apr 2010 10:18:08 -0000	1.14
@@ -1,6 +1,6 @@
 Name:           sopwith
 Version:        1.7.1
-Release:        9
+Release:        10%{?dist}
 Summary:        SDL port of the sopwith game
 
 Group:          Amusements/Games
@@ -9,6 +9,10 @@ URL:            http://sdl-sopwith.sourc
 Source0:        http://downloads.sourceforge.net/sdl-sopwith/sdl_sopwith-1.7.1.tar.gz
 Source1:        sopwith.png
 Patch0:         sopwith-gcc4.patch
+Patch1:         sopwith.6.patch
+Patch2:         sopwith-gtk-video.patch
+Patch3:         sopwith-sdl-video.patch
+Patch4:         sopwith-vid_vga.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -22,6 +26,10 @@ computers and operating systems.
 %prep
 %setup -q -n sdl_sopwith-%{version}
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 sed -i 's/\r//' doc/readme.txt
 
 
@@ -70,6 +78,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Wed Apr 21 2010 Adrian Reber <adrian at lisas.de> - 1.7.1-10
+- fixed a 32/64 bit bug in the GTK version (#583417)
+- added a few patches from debian
+- now also using the %%{dist} tag
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild