avifile will not compile on -current

[Stanislav Sedov]

On Fri, 22 Sep 2006 19:43:30 -0300
Rainer Alves <rainer.alves at gmail.com> mentioned:

> Kevin Oberman wrote:
> > avifile has not built on current since the update of gcc to the latest
> > 3.4.6 fixes back on Aug. 25.
> 
> It also doesn't compile here, for 2 reasons:
> 1) since `pcvt` was removed from CURRENT around May or so, avifile no 
> longer finds the header "pcvt_ioctl.h" and the build breaks here:
> 
> cc -DHAVE_CONFIG_H -I. -I. -I../../include -I/usr/local/include 
> -I/usr/local/include -I/usr/X11R6/include -D_GETOPT_H -Wall -Wno-unused 
> -I../../include -O2 -fno-strict-aliasing -pipe -D_LARGEFILE_SOURCE 
> -D_FILE_OFFSET_BITS=64 -pipe -c ports.c  -fPIC -DPIC -o .libs/ports.o
> In file included from ports.c:73:
> sysdep/pci_freebsd.c:11:32: machine/pcvt_ioctl.h: No such file or directory
> 
> The fix is trivial: the replacement of "machine/pcvt_ioctl.h" by 
> "sys/kbio.h" (which also contains KDENABIO from the defunct pcvt).
> 
> 
> 2) As for the error you pointed out, here is a quick patch which fixes 
> things for me:
> 
> --- ReadFile.cpp.orig   Fri Sep 22 19:40:20 2006
> +++ ReadFile.cpp        Fri Sep 22 19:41:19 2006
> @@ -8,7 +8,7 @@
> 
>   AVM_BEGIN_NAMESPACE;
> 
> -avm::IReadFile::~IReadFile() {}
> +IReadFile::~IReadFile() {}
> 
>   class ReadFile: public IReadFile
>   {
> @@ -125,7 +125,7 @@
>   };
> 
> 
> -avm::IReadFile* avm::CreateReadFile(const char* name, unsigned int flags)
> +IReadFile* CreateReadFile(const char* name, unsigned int flags)
>   {
>       ReadFile* r = new ReadFile(name, flags);
>       return r;
> 
> 

Committed.

Thanks for a patch.

-- 
Stanislav Sedov              <stas at FreeBSD.org>          [[Россия, Москва]]
PGP id: 0xEB269581           http://people.freebsd.org/~stas/stas.key.asc
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 187 bytes
Desc: not available
Url : http://lists.freebsd.org/pipermail/freebsd-ports/attachments/20060923/51fee15c/signature.pgp