Your message dated Mon, 07 Aug 2006 03:02:09 -0700
with message-id <[EMAIL PROTECTED]>
and subject line Bug#297011: fixed in atari800 1.3.2-2
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
Package: atari800
Severity: normal
Tags: patch
When building 'atari800' on amd64 with gcc-4.0,
I get the following error:
gcc -c -o sndsave.o -DHAVE_CONFIG_H -I. -g -Wall -O3 -g -Wall -O3 sndsave.c
sndsave.c:33: error: static declaration of 'sndoutput' follows non-static
declaration
sndsave.h:7: error: previous declaration of 'sndoutput' was here
make[2]: *** [sndsave.o] Error 1
make[2]: Leaving directory `/atari800-1.3.2/src'
With the attached patch 'atari800' can be compiled
on amd64 using gcc-4.0.
Regards
Andreas Jochens
diff -urN ../tmp-orig/atari800-1.3.2/src/sndsave.h ./src/sndsave.h
--- ../tmp-orig/atari800-1.3.2/src/sndsave.h 2000-11-14 13:13:33.000000000
+0000
+++ ./src/sndsave.h 2005-02-26 14:39:57.974106328 +0000
@@ -4,7 +4,6 @@
#include "atari.h"
#include <stdio.h>
-extern FILE *sndoutput;
extern int iSoundRate;
typedef int BOOL;
diff -urN ../tmp-orig/atari800-1.3.2/src/atari_x11.c ./src/atari_x11.c
--- ../tmp-orig/atari800-1.3.2/src/atari_x11.c 2003-02-24 09:32:44.000000000
+0000
+++ ./src/atari_x11.c 2005-02-26 14:47:24.087998116 +0000
@@ -215,7 +215,7 @@
static int keypad_trig = 1; /* Keypad Trigger Position */
static int keypad_stick = 0x0f; /* Keypad Joystick Position */
-static int mouse_mode = -1; /* Joystick, Paddle and Light Pen */
+static int mouse_mode_local = -1; /* Joystick, Paddle and Light Pen */
static int mouse_stick; /* Mouse Joystick Position */
static int js0_mode = -1;
@@ -1174,7 +1174,7 @@
new_mode = xv_get(keypad_item, PANEL_VALUE);
- if ((new_mode != mouse_mode) &&
+ if ((new_mode != mouse_mode_local) &&
(new_mode != js0_mode) &&
(new_mode != js1_mode)) {
keypad_mode = new_mode;
@@ -1196,12 +1196,12 @@
if ((new_mode != keypad_mode) &&
(new_mode != js0_mode) &&
(new_mode != js1_mode)) {
- mouse_mode = new_mode;
+ mouse_mode_local = new_mode;
}
else {
sorry_message();
xv_set(mouse_item,
- PANEL_VALUE, mouse_mode,
+ PANEL_VALUE, mouse_mode_local,
NULL);
}
}
@@ -1214,7 +1214,7 @@
new_mode = xv_get(js0_item, PANEL_VALUE);
if ((new_mode != keypad_mode) &&
- (new_mode != mouse_mode) &&
+ (new_mode != mouse_mode_local) &&
(new_mode != js1_mode)) {
js0_mode = new_mode;
}
@@ -1233,7 +1233,7 @@
new_mode = xv_get(js1_item, PANEL_VALUE);
if ((new_mode != keypad_mode) &&
- (new_mode != mouse_mode) &&
+ (new_mode != mouse_mode_local) &&
(new_mode != js0_mode)) {
js1_mode = new_mode;
}
@@ -1692,7 +1692,7 @@
}
#endif
- mouse_mode = mode++;
+ mouse_mode_local = mode++;
if (keypad_mode == -1)
keypad_mode = mode++;
@@ -1879,7 +1879,7 @@
"Paddle 8",
"Light Pen",
NULL,
-
PANEL_VALUE, mouse_mode,
+
PANEL_VALUE, mouse_mode_local,
PANEL_NOTIFY_PROC, mouse_callback,
NULL);
ypos += 25;
@@ -2531,7 +2531,7 @@
Atari_WhatIs(keypad_mode);
printf("\n");
printf("Mouse is ");
- Atari_WhatIs(mouse_mode);
+ Atari_WhatIs(mouse_mode_local);
printf("\n");
printf("/dev/js0 is ");
Atari_WhatIs(js0_mode);
@@ -3415,12 +3415,12 @@
else if (keypad_mode == 1)
nibble_1 = keypad_stick;
- if (mouse_mode == 0) {
- mouse_joystick(mouse_mode);
+ if (mouse_mode_local == 0) {
+ mouse_joystick(mouse_mode_local);
nibble_0 = mouse_stick;
}
else if (mouse_mode == 1) {
- mouse_joystick(mouse_mode);
+ mouse_joystick(mouse_mode_local);
nibble_1 = mouse_stick;
}
#ifdef LINUX_JOYSTICK
@@ -3448,12 +3448,12 @@
else if (keypad_mode == 3)
nibble_1 = keypad_stick;
- if (mouse_mode == 2) {
- mouse_joystick(mouse_mode);
+ if (mouse_mode_local == 2) {
+ mouse_joystick(mouse_mode_local);
nibble_0 = mouse_stick;
}
else if (mouse_mode == 3) {
- mouse_joystick(mouse_mode);
+ mouse_joystick(mouse_mode_local);
nibble_1 = mouse_stick;
}
#ifdef LINUX_JOYSTICK
@@ -3486,7 +3486,7 @@
if (num == keypad_mode) {
trig = keypad_trig;
}
- if (num == mouse_mode) {
+ if (num == mouse_mode_local) {
Window root_return;
Window child_return;
int root_x_return;
@@ -3558,7 +3558,7 @@
{
int pot;
- if (num == (mouse_mode - 4)) {
+ if (num == (mouse_mode_local - 4)) {
Window root_return;
Window child_return;
int root_x_return;
--- End Message ---
--- Begin Message ---
Source: atari800
Source-Version: 1.3.2-2
We believe that the bug you reported is fixed in the latest version of
atari800, which is due to be installed in the Debian FTP archive:
atari800_1.3.2-2.diff.gz
to pool/contrib/a/atari800/atari800_1.3.2-2.diff.gz
atari800_1.3.2-2.dsc
to pool/contrib/a/atari800/atari800_1.3.2-2.dsc
atari800_1.3.2-2_amd64.deb
to pool/contrib/a/atari800/atari800_1.3.2-2_amd64.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Michael Ablassmeier <[EMAIL PROTECTED]> (supplier of updated atari800 package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Mon, 7 Aug 2006 11:35:15 +0200
Source: atari800
Binary: atari800
Architecture: source amd64
Version: 1.3.2-2
Distribution: unstable
Urgency: low
Maintainer: Debian QA Group <[EMAIL PROTECTED]>
Changed-By: Michael Ablassmeier <[EMAIL PROTECTED]>
Description:
atari800 - Atari emulator for X/curses/SDL
Closes: 297011 346876 349122
Changes:
atari800 (1.3.2-2) unstable; urgency=low
.
* QA Upload (Ack NMU; Closes: #349122, #297011, #346876)
* Set Maintainer to QA Group, Orphaned: #379022
* Install menu file to usr/share
* Update debian/copyright
* Conforms to Latest Standards Version 3.7.2
Files:
3cdc6f527eb49f1bdd5f282fc5d8f352 636 contrib/otherosfs optional
atari800_1.3.2-2.dsc
d705c6549e663908c5434572369a6484 8272 contrib/otherosfs optional
atari800_1.3.2-2.diff.gz
480d6caaac0c1090fb0edd73762a5fa7 486454 contrib/otherosfs optional
atari800_1.3.2-2_amd64.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (GNU/Linux)
iD8DBQFE1wzmEFV7g4B8rCURAlqpAKDKTRffG457m7gAQvX4y9fVR0PtHgCffuy1
YXQufj6iUqhU+uDHJ9SkkuY=
=nyBE
-----END PGP SIGNATURE-----
--- End Message ---
