[fuse-emulator-devel] [ fuse-emulator-Patches-1712260 ] Changes for Amiga port

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Patches item #1712260, was opened at 2007-05-04 04:40
Message generated for change (Comment added) made by fredm
You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=596650&aid=1712260&group_id=91293

Please note that this message will contain a full copy of the comment thread,
including the initial issue submission, for this request,
not just the latest update.
Category: None
Group: v0.8
Status: Open
Resolution: None
Priority: 5
Private: No
Submitted By: Chris Young (chris_y)
Assigned to: Fredrick Meunier (fredm)
Summary: Changes for Amiga port

Initial Comment:
Changes required for Amiga port.  Some of these patches involve commenting out code and will need to be changed to #ifndef AMIGA etc.

These are for the OS4 clib2-based port, further changes are necessary for newlib.

----------------------------------------------------------------------

>Comment By: Fredrick Meunier (fredm)
Date: 2008-01-27 08:31

Message:
Logged In: YES 
user_id=11017
Originator: NO

Applied libspectrum.c patch.

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2008-01-08 08:08

Message:
Logged In: YES 
user_id=990796
Originator: YES

Minor change to libspectrum.c.
If this doesn't compile on MorphOS then it will need #ifdef'ing around the
two variants.

File Added: libspectrum.c.diff

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-11-18 10:51

Message:
Logged In: YES 
user_id=990796
Originator: YES

I have no idea!  I spotted the MorphOS patch by accident and discovered it
fixed the sound problem I was getting.  I assume the SDL port has the same
base on Amiga/MorphOS  and the low level audio code doesn't like that size
buffer.

----------------------------------------------------------------------

Comment By: Fredrick Meunier (fredm)
Date: 2007-11-18 10:41

Message:
Logged In: YES 
user_id=11017
Originator: NO

Applied SDL sound patch, why is the use of a power of two sound buffer a
problem on the Amiga (and MorphOS I guess)?

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-11-18 08:18

Message:
Logged In: YES 
user_id=990796
Originator: YES

SDL sound fix.
File Added: sdlsound.c.diff

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-09-23 21:14

Message:
Logged In: YES 
user_id=990796
Originator: YES

I have no idea what the MorphOS guys did to this, but I've managed to fix
it up so it compiles again.  Code is a lot neater too, and it should still
compile on MorphOS.
Attached diff for libspectrum.c

The libspectrum.la file is missing -lmyglib from dependency_libs, not sure
where this comes from.

File Added: libspectrum.c.diff

----------------------------------------------------------------------

Comment By: Philip Kendall (pak21)
Date: 2007-07-31 00:17

Message:
Logged In: YES 
user_id=29214
Originator: NO

Anything here we still need to deal with? Assigning to Fred as he's been
handling this so far.

----------------------------------------------------------------------

Comment By: Fredrick Meunier (fredm)
Date: 2007-06-15 19:44

Message:
Logged In: YES 
user_id=11017
Originator: NO

Applied utils.c patch.

----------------------------------------------------------------------

Comment By: Fredrick Meunier (fredm)
Date: 2007-06-15 19:33

Message:
Logged In: YES 
user_id=11017
Originator: NO

Applied utils.c patch.

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-06-15 06:25

Message:
Logged In: YES 
user_id=990796
Originator: YES

Attached an additional patch for utils.c to stop a slash being added
between the temp path and the filename.
(eg. so it creates t:tempfile rather than t:/tempfile)

File Added: utils.c.diff

----------------------------------------------------------------------

Comment By: Fredrick Meunier (fredm)
Date: 2007-06-08 07:13

Message:
Logged In: YES 
user_id=11017
Originator: NO

Applied ASL patch.

----------------------------------------------------------------------

Comment By: Fredrick Meunier (fredm)
Date: 2007-06-05 07:50

Message:
Logged In: YES 
user_id=11017
Originator: NO

Thanks for the updated patch. Yes, the libspectrum patch has been applied.

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-06-05 00:02

Message:
Logged In: YES 
user_id=990796
Originator: YES

Here is a patch for a "universal" filesel.c which replaces the file
selector with an ASL requester when compiled on the Amiga.

Has the libspectrum patch been applied?
File Added: filesel.c.diff

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-06-04 22:26

Message:
Logged In: YES 
user_id=990796
Originator: YES

Now compiling without errors.

----------------------------------------------------------------------

Comment By: Fredrick Meunier (fredm)
Date: 2007-06-04 22:15

Message:
Logged In: YES 
user_id=11017
Originator: NO

Thanks, here is a second attempt, how does it look?
File Added: amiga_getopt2.patch

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-06-04 21:47

Message:
Logged In: YES 
user_id=990796
Originator: YES

getopt patch won't compile, error in settings.pl:

gmake[2]: Entering directory `/Files/Projects/fuse/fuse-0.8.0'
if gcc -DHAVE_CONFIG_H -I. -I. -I. -I/SDK/local/clib2/include/libxml2
-DFUSEDATADIR="\"/usr/local/share/fuse\""    -g -O2
-I/SDK/local/clib2/include/SDL -D_GNU_SOURCE=1 -Wall -MT settings.o -MD -MP
-MF ".deps/settings.Tpo" -c -o settings.o settings.c; \
        then mv -f ".deps/settings.Tpo" ".deps/settings.Po"; else rm -f
".deps/settings.Tpo"; exit 1; fi
settings.pl: In function 'settings_command_line':
settings.pl:326: error: array type has incomplete element type
settings.pl:326: warning: unused variable 'long_options'

----------------------------------------------------------------------

Comment By: Fredrick Meunier (fredm)
Date: 2007-06-04 20:57

Message:
Logged In: YES 
user_id=11017
Originator: NO

Could you have a go at making a unified filesel.c that will compile in a
non-Amiga system so I can check it in? I'd also prefer if you could try and
match  the coding guidelines in fuse/hacking/coding_style.txt so the code
has a more even style.

----------------------------------------------------------------------

Comment By: Fredrick Meunier (fredm)
Date: 2007-06-04 20:09

Message:
Logged In: YES 
user_id=11017
Originator: NO

could you try the attached patch for disabling getopt_long?
File Added: amiga_getopt.patch

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-06-04 02:09

Message:
Logged In: YES 
user_id=990796
Originator: YES

This is a replacement for widget/filesel.c that uses ASL instead.
File Added: filesel.c

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-05-28 21:07

Message:
Logged In: YES 
user_id=990796
Originator: YES

File Added: libspectrum.h.in.diff

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-05-28 21:06

Message:
Logged In: YES 
user_id=990796
Originator: YES

This is a enhancement patch for libspectrum 0.3.0.  It enables the Amiga
version to decompress files with xfdmaster.library.

File Added: libspectrum.c.diff

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-05-27 02:54

Message:
Logged In: YES 
user_id=990796
Originator: YES

Sounds easiest, if it's not needed.

----------------------------------------------------------------------

Comment By: Fredrick Meunier (fredm)
Date: 2007-05-27 00:15

Message:
Logged In: YES 
user_id=11017
Originator: NO

I think the getopt problem is related to this one
<http://osdir.com/ml/lib.gnulib.bugs/2004-06/msg00038.html>.

It seem that uClibc uses GNU getopt but not getopt_long leading to the
multiple definition, and I think that you are using a similar C library on
the Amiga and getting a related problem.

There seems to be a newer version of the replacement routines in gnulib,
which seem to try harder not to clash with the built-in getopt, they seem
to require gettext though.

Maybe we should just omit getopt_long support for amiga?

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-05-24 05:35

Message:
Logged In: YES 
user_id=990796
Originator: YES

It's not defined.  config.log attached.

/* Define to 1 if you have the `getopt_long' function. */
/* #undef HAVE_GETOPT_LONG */

File Added: config.log

----------------------------------------------------------------------

Comment By: Fredrick Meunier (fredm)
Date: 2007-05-23 22:33

Message:
Logged In: YES 
user_id=11017
Originator: NO

could you let us know what the value of HAVE_GETOPT_LONG is in config.h
and attach your config.log? It looks like you have getopt but not
getopt_long and the code may not be looking for that case? I think the
simplest thing may be to redefine the built-in optind, getopt, opterr and
optopt if we don't have getopt_long.

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-05-22 04:39

Message:
Logged In: YES 
user_id=990796
Originator: YES

Looks like the getopt problem only shows up when you try and compile
something other than getopt.c :)

SDK:clib2/lib/libc.a(unistd_getopt.o)(.sdata+0x0): multiple definition of
`optind'
compat/libcompat.a(getopt.o)(.sdata+0x8):/Files/Projects/fuse/fuse-0.8.0/compat/getopt.c:313:
first defined here
SDK:clib2/lib/libc.a(unistd_getopt.o)(.sdata+0x4): multiple definition of
`opterr'
compat/libcompat.a(getopt.o)(.sdata+0x4):/Files/Projects/fuse/fuse-0.8.0/compat/getopt.c:316:
first defined here
SDK:clib2/lib/libc.a(unistd_getopt.o)(.text+0x0): In function `getopt':
: multiple definition of `getopt'
compat/libcompat.a(getopt.o)(.text+0xe98):/Files/Projects/fuse/fuse-0.8.0/compat/getopt.c:1204:
first defined here
gcc:ppc-amigaos/bin/ld: Warning: size of symbol `getopt' changed from 16
in SDK:clib2/lib/libc.a(unistd_getopt.o) to 680 in
SDK:clib2/lib/libc.a(unistd_getopt.o)
SDK:clib2/lib/libc.a(unistd_getopt.o)(.sbss+0x4): multiple definition of
`optopt'
compat/libcompat.a(getopt.o)(.sdata+0x0):/Files/Projects/fuse/fuse-0.8.0/compat/getopt.c:313:
first defined here

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-05-19 20:43

Message:
Logged In: YES 
user_id=990796
Originator: YES

I've just reverted the changes back to the original, and it is compiling. 
I'm sure that was one of the first changes I made so I'm not sure what is
going on here.  For now, I would leave it alone as it seems to be working.

----------------------------------------------------------------------

Comment By: Fredrick Meunier (fredm)
Date: 2007-05-19 11:12

Message:
Logged In: YES 
user_id=11017
Originator: NO

I've applied the debugger part, what's the problem with getopt? I take it
you have getopt, but not getopt_long?

----------------------------------------------------------------------

Comment By: Fredrick Meunier (fredm)
Date: 2007-05-19 10:51

Message:
Logged In: YES 
user_id=11017
Originator: NO

I've applied utils.c, we use the temp path when converting .scl TR-DOS
images for use in Fuse. More to come.

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-05-19 03:32

Message:
Logged In: YES 
user_id=990796
Originator: YES

I think that was a bit of commenting out that should have been reversed,
as libgen.h is available and the code compiles with the header.

I have spotted a temp dir path in the same file that needs fixing (quick
hack - new diff attached), but I can't test any fix as I have no idea when
fuse needs the temp directory.

File Added: utils.c.diff

----------------------------------------------------------------------

Comment By: Fredrick Meunier (fredm)
Date: 2007-05-17 21:06

Message:
Logged In: YES 
user_id=11017
Originator: NO

Why do you comment out libgen,h in utils.c? Shouldn't the configure check
have found that there were no libgen.h?

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-05-06 04:55

Message:
Logged In: YES 
user_id=990796
Originator: YES

File Added: utils.c.diff

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-05-06 04:55

Message:
Logged In: YES 
user_id=990796
Originator: YES

debugger/commandl.l change has only been tested as far as compiling.

File Added: debugger_commandl.l.diff

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-05-06 04:54

Message:
Logged In: YES 
user_id=990796
Originator: YES

File Added: compat_getopt.h.diff

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-05-06 04:53

Message:
Logged In: YES 
user_id=990796
Originator: YES

File Added: compat_getopt.c.diff

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-05-04 04:41

Message:
Logged In: YES 
user_id=990796
Originator: YES

File Added: utils.c.diff

----------------------------------------------------------------------

Comment By: Chris Young (chris_y)
Date: 2007-05-04 04:41

Message:
Logged In: YES 
user_id=990796
Originator: YES

File Added: debugger_commandl.l.diff

----------------------------------------------------------------------

You can respond by visiting: 
https://sourceforge.net/tracker/?func=detail&atid=596650&aid=1712260&group_id=91293