[fedora-extras-commits] rpms/vice/devel vice-1.14-gcc34.patch, NONE, 1.1 vice.spec, 1.3, 1.4

[Michael Schwendt (mschwendt)]

Changeset from: mschwendt

Update of /cvs/extras/rpms/vice/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv5236

Modified Files:
	vice.spec 
Added Files:
	vice-1.14-gcc34.patch 
Log Message:
Fix build for FC3.

vice-1.14-gcc34.patch:

--- NEW FILE vice-1.14-gcc34.patch ---
diff -Nur vice-1.14-orig/src/c64/c64tpi.c vice-1.14/src/c64/c64tpi.c
--- vice-1.14-orig/src/c64/c64tpi.c	2003-11-01 17:04:46.000000000 +0100
+++ vice-1.14/src/c64/c64tpi.c	2004-11-10 12:42:18.099504904 +0100
@@ -46,17 +46,17 @@
 #define mytpi_set_int tpi_set_int
 
 
-void REGPARM3 tpi_store(WORD addr, BYTE data)
+void REGPARM2 tpi_store(WORD addr, BYTE data)
 {
     tpicore_store(machine_context.tpi1, addr, data);
 }
 
-BYTE REGPARM2 tpi_read(WORD addr)
+BYTE REGPARM1 tpi_read(WORD addr)
 {
     return tpicore_read(machine_context.tpi1, addr);
 }
 
-BYTE REGPARM2 tpi_peek(WORD addr)
+BYTE REGPARM1 tpi_peek(WORD addr)
 {
     return tpicore_peek(machine_context.tpi1, addr);
 }
diff -Nur vice-1.14-orig/src/cbm2/cbm2tpi1.c vice-1.14/src/cbm2/cbm2tpi1.c
--- vice-1.14-orig/src/cbm2/cbm2tpi1.c	2003-11-01 17:12:28.000000000 +0100
+++ vice-1.14/src/cbm2/cbm2tpi1.c	2004-11-10 12:42:18.099504904 +0100
@@ -47,17 +47,17 @@
 #include "types.h"
 
 
-void REGPARM3 tpi1_store(WORD addr, BYTE data)
+void REGPARM2 tpi1_store(WORD addr, BYTE data)
 {
     tpicore_store(machine_context.tpi1, addr, data);
 }
 
-BYTE REGPARM2 tpi1_read(WORD addr)
+BYTE REGPARM1 tpi1_read(WORD addr)
 {
     return tpicore_read(machine_context.tpi1, addr);
 }
 
-BYTE REGPARM2 tpi1_peek(WORD addr)
+BYTE REGPARM1 tpi1_peek(WORD addr)
 {
     return tpicore_peek(machine_context.tpi1, addr);
 }
diff -Nur vice-1.14-orig/src/cbm2/cbm2tpi2.c vice-1.14/src/cbm2/cbm2tpi2.c
--- vice-1.14-orig/src/cbm2/cbm2tpi2.c	2003-10-25 17:32:21.000000000 +0200
+++ vice-1.14/src/cbm2/cbm2tpi2.c	2004-11-10 12:42:18.099504904 +0100
@@ -41,17 +41,17 @@
 #include "types.h"
 
 
-void REGPARM3 tpi2_store(WORD addr, BYTE data)
+void REGPARM2 tpi2_store(WORD addr, BYTE data)
 {
     tpicore_store(machine_context.tpi2, addr, data);
 }
 
-BYTE REGPARM2 tpi2_read(WORD addr)
+BYTE REGPARM1 tpi2_read(WORD addr)
 {
     return tpicore_read(machine_context.tpi2, addr);
 }
 
-BYTE REGPARM2 tpi2_peek(WORD addr)
+BYTE REGPARM1 tpi2_peek(WORD addr)
 {
     return tpicore_peek(machine_context.tpi2, addr);
 }
diff -Nur vice-1.14-orig/src/core/ciacore.c vice-1.14/src/core/ciacore.c
--- vice-1.14-orig/src/core/ciacore.c	2003-11-13 12:20:38.000000000 +0100
+++ vice-1.14/src/core/ciacore.c	2004-11-10 12:42:18.099504904 +0100
@@ -269,7 +269,7 @@
 }
 
 
-void REGPARM3 ciacore_store(cia_context_t *cia_context, WORD addr, BYTE byte)
+void REGPARM2 ciacore_store(cia_context_t *cia_context, WORD addr, BYTE byte)
 {
     CLOCK rclk;
 
@@ -538,7 +538,7 @@
 /* ------------------------------------------------------------------------- */
 
 
-BYTE REGPARM2 ciacore_read(cia_context_t *cia_context, WORD addr)
+BYTE REGPARM1 ciacore_read(cia_context_t *cia_context, WORD addr)
 {
 #if defined(CIA_TIMER_DEBUG)
 
@@ -736,7 +736,7 @@
     return (cia_context->c_cia[addr]);
 }
 
-BYTE REGPARM2 ciacore_peek(cia_context_t *cia_context, WORD addr)
+BYTE REGPARM1 ciacore_peek(cia_context_t *cia_context, WORD addr)
 {
     /* This code assumes that update_cia is a projector - called at
      * the same cycle again it doesn't change anything. This way
diff -Nur vice-1.14-orig/src/core/viacore.c vice-1.14/src/core/viacore.c
--- vice-1.14-orig/src/core/viacore.c	2003-11-21 18:26:39.000000000 +0100
+++ vice-1.14/src/core/viacore.c	2004-11-10 12:42:18.099504904 +0100
@@ -314,7 +314,7 @@
     }
 }
 
-void REGPARM3 viacore_store(via_context_t *via_context, WORD addr, BYTE byte)
+void REGPARM2 viacore_store(via_context_t *via_context, WORD addr, BYTE byte)
 {
     CLOCK rclk;
 
@@ -554,7 +554,7 @@
 
 /* ------------------------------------------------------------------------- */
 
-BYTE REGPARM2 viacore_read(via_context_t *via_context, WORD addr)
+BYTE REGPARM1 viacore_read(via_context_t *via_context, WORD addr)
 {
 #ifdef MYVIA_TIMER_DEBUG
     BYTE viacore_read_(via_context_t *via_context, WORD);
@@ -706,7 +706,7 @@
     return via_context->via[addr];
 }
 
-BYTE REGPARM2 viacore_peek(via_context_t *via_context, WORD addr)
+BYTE REGPARM1 viacore_peek(via_context_t *via_context, WORD addr)
 {
     CLOCK rclk = *(via_context->clk_ptr);
 


Index: vice.spec
===================================================================
RCS file: /cvs/extras/rpms/vice/devel/vice.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- vice.spec	8 Nov 2004 05:32:01 -0000	1.3
+++ vice.spec	10 Nov 2004 11:57:18 -0000	1.4
@@ -1,7 +1,7 @@
 Summary: Versatile Commodore Emulator
 Name: vice
 Version: 1.14
-Release: 0.fdr.4.2
+Release: 5
 Epoch: 0
 License: GPL
 Group: Applications/Emulators
@@ -9,6 +9,7 @@
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 Source0: ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/%{name}-%{version}.tar.gz
 Patch0: vice-1.14-mkstemp.patch
+Patch1: vice-1.14-gcc34.patch
 BuildRequires: flex, gettext, readline-devel
 BuildRequires: gnome-libs-devel >= 1:1.2
 BuildRequires: SDL-devel >= 0:1.2, libpng-devel, zlib-devel
@@ -24,6 +25,7 @@
 %prep
 %setup -q
 %patch0 -p1 -b .mkstemp
+%patch1 -p1 -b .gcc34
 
 %build
 %configure --enable-gnomeui --enable-fullscreen --with-sdl 
@@ -66,6 +68,9 @@
 %doc FEEDBACK INSTALL README NEWS AUTHORS 
 
 %changelog
+* Wed Nov 10 2004 Michael Schwendt <mschwendt[AT]users.sf.net> 1.14-5
+- fix code for gcc 3.4, FC3
+
 * Thu Jun 10 2004 Panu Matilainen <pmatilai at welho.com> 1.14-0.fdr.4
 - patch from Michael Schwendt to use mkstemp() instead of tempnam()