Re: [hatari-users] Re: [hatari-devel] Hatari 2.2.1 has been released

[tuxic@xxxxxxxxx]

On 02/10 02:21, Thomas Huth wrote:
> Am Sun, 10 Feb 2019 14:13:16 +0100
> schrieb tuxic@xxxxxxxxx:
> 
> > On 02/10 01:52, Thomas Huth wrote:
> > > Am Sun, 10 Feb 2019 04:26:28 +0100
> > > schrieb tuxic@xxxxxxxxx:
> [...]
> > > > src/CMakeFiles/hatari.dir/floppy_ipf.c.o /home/user/data/pools/pool05/hatari-2.2.1/src/floppy_ipf.c:64:2:
> > > > error: unknown type name ‘CapsLong’ CapsLong  
> > > 
> > > Does this patch fix the issue for you:
> > > 
> > > diff -r src/floppy_ipf.c
> > > --- a/src/floppy_ipf.c  Sat Feb 09 18:45:35 2019 +0100
> > > +++ b/src/floppy_ipf.c  Sun Feb 10 13:48:35 2019 +0100
> > > @@ -31,6 +31,8 @@
> > >  #ifdef HAVE_CAPSIMAGE
> > >  #if CAPSIMAGE_VERSION == 5
> > >  #include <caps5/CapsLibAll.h>
> > > +#define CapsLong SDWORD
> > > +#define CapsULong UDWORD
> > >  #else
> > >  #include <caps/fdc.h>
> > >  #define CAPS_LIB_RELEASE       4
> > > 
> > > ?
> > > 
> > >  Thomas
> > 
> > Hi Thomas,
> > 
> > thanks for the patch!!! :)
> > 
> > Unfortunately, it does not work:
> > In file included from /usr/local/include/caps5/CapsLibAll.h:7,
> >                  from /home/user/data/pools/pool05/hatari-2.2.1/src/floppy_ipf.c:33:
> > /usr/local/include/caps5/CapsFDC.h:134:22: error: expected ‘)’ before
> > ‘*’ token typedef void (__cdecl *CAPSFDCHOOK)(PCAPSFDC pfdc, UDWORD
> > state); ^~
> 
> If that header does not define __cdecl and still wants to use it, then
> this Caps5 package is definitely broken in Gentoo. Do you know if there
> is any other software in Gentoo which can use this library properly?
> 
> You could try to work around that problem by adding this line before
> the #include <caps5/CapsLibAll.h> :
> 
> #define __cdecl
> 
> ... but I suggest to rather complain to the person instead who provided
> that package.
> 
>  Thomas
> 
> 

Hi Thomas,

....I will remove the GENTOO-specific installation of the capslib then.
Where did the HATARI devs take the capslib from? I want to
compile/install that one on my system...?

Cheers!
Meino