[pkgsrc/trunk]: pkgsrc/emulators/fceu Convert some C99-isms to C89 to make th...

[kristerw <kristerw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e9e74165e6f9
branches:  trunk
changeset: 478452:e9e74165e6f9
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Sat Jul 24 01:11:41 2004 +0000

description:
Convert some C99-isms to C89 to make this build with gcc 2.95.

diffstat:

 emulators/fceu/distinfo         |     5 +-
 emulators/fceu/patches/patch-ab |    19 +-
 emulators/fceu/patches/patch-ad |  6404 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 6421 insertions(+), 7 deletions(-)

diffs (truncated from 6453 to 300 lines):

diff -r ab6476909691 -r e9e74165e6f9 emulators/fceu/distinfo
--- a/emulators/fceu/distinfo   Sat Jul 24 00:36:51 2004 +0000
+++ b/emulators/fceu/distinfo   Sat Jul 24 01:11:41 2004 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/07/19 18:37:15 wiz Exp $
+$NetBSD: distinfo,v 1.2 2004/07/24 01:11:41 kristerw Exp $
 
 SHA1 (fceu-0.98.10.src.tar.bz2) = 578e25792f42e8fd640f0bd070241c43a63bbda2
 Size (fceu-0.98.10.src.tar.bz2) = 559750 bytes
 SHA1 (patch-aa) = e2e32735e52963f456ae9f74ed94b30d22468394
-SHA1 (patch-ab) = 192e6c25fd63db9cea4975af515e6e831bc56040
+SHA1 (patch-ab) = 593c40bfe03e8ae8835113972a58a1cf46e882a9
 SHA1 (patch-ac) = 8a5297b11484c6eaf5d70a391bb486ff58475f35
+SHA1 (patch-ad) = 2a253539f9103b75a09f31d51427e8849a3b0249
diff -r ab6476909691 -r e9e74165e6f9 emulators/fceu/patches/patch-ab
--- a/emulators/fceu/patches/patch-ab   Sat Jul 24 00:36:51 2004 +0000
+++ b/emulators/fceu/patches/patch-ab   Sat Jul 24 01:11:41 2004 +0000
@@ -1,13 +1,22 @@
-$NetBSD: patch-ab,v 1.1.1.1 2004/07/19 18:37:15 wiz Exp $
+$NetBSD: patch-ab,v 1.2 2004/07/24 01:11:41 kristerw Exp $
 
 SOL_TCP is 6, the same as IPPROTO_TCP and ISOPROTO_TCP on NetBSD.
 
---- src/drivers/pc/unix-netplay.c.orig 2004-05-17 07:28:06.000000000 +0200
-+++ src/drivers/pc/unix-netplay.c
-@@ -86,7 +86,7 @@ int FCEUD_NetworkConnect(void)
+--- src/drivers/pc/unix-netplay.c.orig Mon May 17 07:28:06 2004
++++ src/drivers/pc/unix-netplay.c      Sat Jul 24 03:01:36 2004
+@@ -76,6 +76,7 @@
+  unsigned long hadr;
+  int TSocket;
+  int netdivisor;
++ int tcpopt = 1;
+   
+  if(!netplayhost) return(0);
+ 
+@@ -85,8 +86,7 @@
+   FCEUD_NetworkClose();
    return(0);
   }
-  int tcpopt = 1;  
+- int tcpopt = 1;  
 - if(setsockopt(TSocket, SOL_TCP, TCP_NODELAY, &tcpopt, sizeof(int)))
 + if(setsockopt(TSocket, 6, TCP_NODELAY, &tcpopt, sizeof(int)))
    puts("Nodelay fail");
diff -r ab6476909691 -r e9e74165e6f9 emulators/fceu/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/fceu/patches/patch-ad   Sat Jul 24 01:11:41 2004 +0000
@@ -0,0 +1,6404 @@
+$NetBSD: patch-ad,v 1.1 2004/07/24 01:11:41 kristerw Exp $
+
+--- src/drivers/sexyal/convert.inc.orig        Mon Apr 19 07:27:01 2004
++++ src/drivers/sexyal/convert.inc     Sat Jul 24 03:00:04 2004
+@@ -133,9 +133,10 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+ tmp = (tmp+tmp2)>>1;
+  *dest=tmp;
+@@ -146,9 +147,10 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+ FLIP32(tmp);
+ tmp = (tmp+tmp2)>>1;
+@@ -163,10 +165,11 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+ FLIP32(tmp);
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+ FLIP32(tmp2);
+ tmp = (tmp+tmp2)>>1;
+@@ -178,10 +181,11 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+ FLIP32(tmp);
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+ FLIP32(tmp2);
+ FLIP32(tmp);
+@@ -200,9 +204,10 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+  *dest=tmp;
+  dest++;
+@@ -214,9 +219,10 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+ FLIP32(tmp);
+ FLIP32(tmp2);
+@@ -233,10 +239,11 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+ FLIP32(tmp);
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+ FLIP32(tmp2);
+  *dest=tmp;
+@@ -249,10 +256,11 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+ FLIP32(tmp);
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+ FLIP32(tmp2);
+ FLIP32(tmp);
+@@ -405,9 +413,10 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+  tmp+=128;
+  tmp2+=128;
+@@ -420,9 +429,10 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+  tmp+=128;
+  tmp2+=128;
+@@ -439,10 +449,11 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+ FLIP32(tmp);
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+ FLIP32(tmp2);
+  tmp+=128;
+@@ -456,10 +467,11 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+ FLIP32(tmp);
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+ FLIP32(tmp2);
+  tmp+=128;
+@@ -480,9 +492,10 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+  tmp+=128;
+  tmp2+=128;
+@@ -496,9 +509,10 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+  tmp+=128;
+  tmp2+=128;
+@@ -517,10 +531,11 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+ FLIP32(tmp);
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+ FLIP32(tmp2);
+  tmp+=128;
+@@ -535,10 +550,11 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+ FLIP32(tmp);
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+ FLIP32(tmp2);
+  tmp+=128;
+@@ -693,9 +709,10 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+  tmp <<= 8;
+  tmp2 <<= 8;
+@@ -708,9 +725,10 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+  tmp <<= 8;
+  tmp2 <<= 8;
+@@ -727,10 +745,11 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+ FLIP32(tmp);
+- int32_t tmp2=*src;
++ tmp2=*src;
+  src++;
+ FLIP32(tmp2);
+  tmp <<= 8;
+@@ -744,10 +763,11 @@
+ {
+ while(frames--)
+ {
++ int32_t tmp2;
+  int32_t tmp=*src;
+  src++;
+ FLIP32(tmp);
+- int32_t tmp2=*src;
++ tmp2=*src;