Xorg 1.12

[Gustau Pérez i Querol]

On 15/04/2012 19:30, Pavel Timofeev wrote:
> Hi! Please, help me.
>
> I've just tried new xorg-dev (svn co
> https://trillian.chruetertee.ch/svn/ports/trunk/).
> I replaced libglut by freeglut and rebuilt all dependent ports.
> Then xf86-video-ati-6.14.3 didn't rebuild. I updated it to 6.14.4 and it worked.
> My final problem is:
> ...
> config.status: creating man/Makefile
> config.status: creating xxf86dga.pc
> config.status: creating src/config.h
> config.status: executing depfiles commands
> config.status: executing libtool commands
> ===>   Building for libXxf86dga-1.1.3
> Making all in src
> /usr/bin/make  all-am
>    CC     XF86DGA.lo
> XF86DGA.c: In function 'XF86cleanup':
> XF86DGA.c:651: warning: function might be possible candidate for
> attribute 'noreturn'
>    CC     XF86DGA2.lo
> XF86DGA2.c: In function 'DGAMapPhysical':
> XF86DGA2.c:931: error: cast from pointer to integer of different size
> *** Error code 1
>
> Stop in /usr/ports/x11/libXxf86dga/work/libXxf86dga-1.1.3/src.
> *** Error code 1
>
> Stop in /usr/ports/x11/libXxf86dga/work/libXxf86dga-1.1.3/src.
> *** Error code 1
>
> Stop in /usr/ports/x11/libXxf86dga/work/libXxf86dga-1.1.3.
> *** Error code 1
>
> Stop in /usr/ports/x11/libXxf86dga.
>
> ===>>>  make failed for x11/libXxf86dga
> ===>>>  Aborting update
>
> ===>>>  Update for x11/libXxf86dga failed
> ===>>>  Aborting update
>
> Terminated

    This is easy to solve. This is a bug that only appears on x86. On 
AMD64 libXxf86dga compiles fine w/out the patch, however I haven't 
tested (libXxf86dga on my amd64 machine was compiled without the patch). 
I would say it would work.

    To use the patch, create  x11/libXxf86dga/files and under it place 
the file I'm attaching. Then, just do:

          cd /usr/ports/x11/libXxf86dga && make clean install clean

    Should compile.

    Let us know if it works.

-------------- next part --------------
--- src/XF86DGA2.c.orig	2012-04-17 12:09:57.027347017 +0200
+++ src/XF86DGA2.c	2012-04-17 12:10:09.989342899 +0200
@@ -928,7 +928,7 @@
     if ((pMap->fd = open(name, O_RDWR)) < 0)
 	return False;
     pMap->virtual = mmap(NULL, size, PROT_READ | PROT_WRITE,
-			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)base);
+			MAP_FILE | MAP_SHARED, pMap->fd, (off_t)(unsigned long)base);
     if (pMap->virtual == (void *)-1)
 	return False;
     mprotect(pMap->virtual, size, PROT_READ | PROT_WRITE);