rpms/dosbox/devel dosbox-x86-64-build.patch, 1.2, 1.3 dosbox.spec, 1.10, 1.11

[Andreas Bierfert (awjb)]

Author: awjb

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

Modified Files:
	dosbox-x86-64-build.patch dosbox.spec 
Log Message:
- more build fixes and cleanups


dosbox-x86-64-build.patch:

Index: dosbox-x86-64-build.patch
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox-x86-64-build.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- dosbox-x86-64-build.patch	30 May 2005 07:21:00 -0000	1.2
+++ dosbox-x86-64-build.patch	30 May 2005 08:43:46 -0000	1.3
@@ -1,26 +1,29 @@
---- src/dos/drive_cache.cpp.orig	2005-05-23 00:12:57.412255755 +0200
-+++ src/dos/drive_cache.cpp	2005-05-23 00:15:03.667374882 +0200
-@@ -317,7 +317,7 @@
+--- src/dos/drive_cache.cpp.orig	2005-05-30 10:35:39.000000000 +0200
++++ src/dos/drive_cache.cpp	2005-05-30 10:38:48.000000000 +0200
+@@ -317,12 +317,12 @@
  {
  	char* cpos = strchr(shortName,'~');
  	if (cpos) {
 -		Bits compareCount1	= (int)cpos - (int)shortName;
 +		Bits compareCount1	= (intptr_t)cpos - (intptr_t)shortName;
  		char* endPos		= strchr(cpos,'.');
- 		Bitu numberSize		= endPos ? int(endPos)-int(cpos) : strlen(cpos);
- 		
---- src/dos/drive_cache.cpp.orig	2005-05-30 08:53:27.000000000 +0200
-+++ src/dos/drive_cache.cpp	2005-05-30 08:55:47.000000000 +0200
-@@ -319,10 +319,10 @@
- 	if (cpos) {
- 		Bits compareCount1	= (int)cpos - (int)shortName;
- 		char* endPos		= strchr(cpos,'.');
 -		Bitu numberSize		= endPos ? int(endPos)-int(cpos) : strlen(cpos);
-+		Bitu numberSize		= endPos ? size_t(endPos)-size_t(cpos) : strlen(cpos);
++		Bitu numberSize		= endPos ? intptr_t(endPos)-intptr_t(cpos) : strlen(cpos);
  		
  		char* lpos			= strchr(compareName,'.');
 -		Bits compareCount2	= lpos ? int(lpos)-int(compareName) : strlen(compareName);
-+		Bits compareCount2	= lpos ? size_t(lpos)-size_t(compareName) : strlen(compareName);
++		Bits compareCount2	= lpos ? intptr_t(lpos)-intptr_t(compareName) : strlen(compareName);
  		if (compareCount2>8) compareCount2 = 8;
  
  		compareCount2 -= numberSize;
+--- src/gui/midi_alsa.h.orig	2005-05-30 10:40:34.000000000 +0200
++++ src/gui/midi_alsa.h	2005-05-30 10:42:05.000000000 +0200
+@@ -112,7 +112,7 @@
+ 			}
+ 			break;
+ 		default:
+-			LOG(LOG_MISC,LOG_WARN)("ALSA:Unknown Command: %08x", (int)msg);
++			LOG(LOG_MISC,LOG_WARN)("ALSA:Unknown Command: %08x", (intptr_t)msg);
+ 			send_event(1);
+ 			break;
+ 		}


Index: dosbox.spec
===================================================================
RCS file: /cvs/extras/rpms/dosbox/devel/dosbox.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- dosbox.spec	30 May 2005 07:21:00 -0000	1.10
+++ dosbox.spec	30 May 2005 08:43:46 -0000	1.11
@@ -72,6 +72,9 @@
 
 %changelog
 * Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- more build fixes and cleanups...
+
+* Mon May 30 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - more x86_64 build fixes...
 
 * Mon May 23 2005 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>