Bug#384312: xawtv: FTBFS (powerpc/ppc64): 'PAGE_MASK' undeclared (first use in this function)

[Aurelien Jarno <aurelien@aurel32.net>]

Aurelien Jarno a écrit :
> On Wed, Aug 23, 2006 at 02:28:42PM +0200, Andreas Jochens wrote:
> > Package: xawtv
> > Version: 3.95-2
> > Severity: serious
> > Tags: patch
> >
> > When building 'xawtv' on powerpc/unstable,
> > I get the following error:
>
> [snip]
>
> > With the attached patch 'xawtv' can be compiled on powerpc.
> >
> > Regards
> > Andreas Jochens
> >
> > diff -urN ../tmp-orig/xawtv-3.95/console/fbtools.c ./console/fbtools.c
> > --- ../tmp-orig/xawtv-3.95/console/fbtools.c	2003-02-14 14:14:04.000000000 +0000
> > +++ ./console/fbtools.c	2006-08-23 10:57:40.000000000 +0000
> > @@ -21,8 +21,6 @@
> >  #include <linux/vt.h>
> >  #include <linux/fb.h>
> >  
> > -#include <asm/page.h>
> > -
> >  #include "fbtools.h"
> >  
> >  /* -------------------------------------------------------------------- */
> > @@ -424,7 +422,7 @@
> >  	goto err;
> >      }
> >  #endif
> > -    fb_mem_offset = (unsigned long)(fb_fix.smem_start) & (~PAGE_MASK);
> > +    fb_mem_offset = (unsigned long)(fb_fix.smem_start) & ~(sysconf(_SC_PAGE_SIZE)-1);
>                                                                       ^^^^^^^^^^^^^
> 								      Are you sure it is correct?

I haven't seen the "-1", so this patch is correct. Sorry.

--
  .''`.  Aurelien Jarno	            | GPG: 1024D/F1BCDB73
 : :' :  Debian developer           | Electrical Engineer
 `. `'   aurel32@debian.org         | aurelien@aurel32.net
   `-    people.debian.org/~aurel32 | www.aurel32.net