XFree86 4.4 - an attempt on upgrading ports

[Dejan Lesjak]

On Thursday 15 of April 2004 19:30, Tilman Linneweh wrote:
> My first problem was fixed with this patch:
> http://people.freebsd.org/~arved/stuff/patch-programs-Xserver-include-serve
>rmd.h (Although I am not quite sure it is correct)
>
> The error I am currently getting is this one:
>
> cc -O -pipe -ansi -pedantic -Wno-system-headers -Dasm=__asm     -Wall
> -Wpointer-arith -Wundef    -fno-merge-constants
> -I/usr/home/arved/ports/X/xfree44-ports/x11-servers/XFree86-4-Server/work/x
>c/programs/Xserver/fb
> -I/usr/home/arved/ports/X/xfree44-ports/x11-servers/XFree86-4-Server/work/x
>c/programs/Xserver/mi
> -I/usr/home/arved/ports/X/xfree44-ports/x11-servers/XFree86-4-Server/work/x
>c/programs/Xserver/include        
> -I/usr/home/arved/ports/X/xfree44-ports/x11-servers/XFree86-4-Server/work/x
>c/exports/include/X11       
> -I/usr/home/arved/ports/X/xfree44-ports/x11-servers/XFree86-4-Server/work/x
>c/include/fonts
> -I/usr/home/arved/ports/X/xfree44-ports/x11-servers/XFree86-4-Server/work/x
>c/programs/Xserver/hw/xfree86/common             
> -I/usr/home/arved/ports/X/xfree44-ports/x11-servers/XFree86-4-Server/work/x
>c/programs/Xserver/render
> -I/usr/home/arved/ports/X/xfree44-ports/x11-servers/XFree86-4-Server/work/x
>c/include/extensions
> -I/usr/home/arved/ports/X/xfree44-ports/x11-servers/XFree86-4-Server/work/x
>c/programs/Xserver/Xext 
> -I/usr/home/arved/ports/X/xfree44-ports/x11-servers/XFree86-4-Server!
> /work/xc
> -I/usr/home/arved/ports/X/xfree44-ports/x11-servers/XFree86-4-Server/work/x
>c/exports/include  -I/usr/X11R6/include -DCSRG_BASED -DSHAPE -DXINPUT -DXKB
> -DLBX -DXAPPGROUP    -DXCSECURITY -DTOGCUP   -DXF86BIGFONT -DDPMSExtension 
>    -DPANORAMIX   -DRENDER -DRANDR -DGCCUSESGAS -DAVOID_GLYPHBLT -DPIXPRIV
> -DSINGLEDEPTH         -DXFreeXDGA -DXvExtension                            
>    -DXFree86LOADER  -DXFree86Server                               
> -DXF86VIDMODE                          -DXvMCExtension                     
>     -DSMART_SCHEDULE                       -DBUILDDEBUG -DXResExtension    
>                         -DX_BYTE_ORDER=X_LITTLE_ENDIAN -D_XSERVER64
> -DNDEBUG   -DFUNCPROTO=15 -DNARROWPROTO  -DIN_MODULE -DXFree86Module    -c
> fbblt.c fbblt.c: In function `fbBlt':
> fbblt.c:164: error: duplicate case value
> fbblt.c:164: error: previously used here
> fbblt.c:164: error: duplicate case value
> fbblt.c:164: error: previously used here
> fbblt.c:172: error: duplicate case value
> fbblt.c:172: error: previously used here
> fbblt.c:172: error: duplicate case value
> fbblt.c:172: error: previously used here
> fbblt.c:288: error: duplicate case value
> fbblt.c:288: error: previously used here
> fbblt.c:288: error: duplicate case value
> fbblt.c:288: error: previously used here
> fbblt.c:300: error: duplicate case value
> fbblt.c:300: error: previously used here
> fbblt.c:300: error: duplicate case value
> fbblt.c:300: error: previously used here
> *** Error code 1
>
> Stop in
> /usr/home/arved/ports/X/xfree44-ports/x11-servers/XFree86-4-Server/work/xc/
>programs/Xserver/fb.
>
> I have not even found the case statement yet, so I am clueless how to
> fix this one :-(.
>
> regards

I see. Judging from this patch and xfree cvs commit message here:
http://www.mail-archive.com/cvs-commit%40xfree86.org/msg03444.html
this could be fixed by taking some diffs from xfree cvs. If this is true, this 
patch:
http://www.ijs.si/software/stuff/xfree-server-patches/patch-programs-Xserver-fb-fb.h
should get you past your next error, and I'll extract other patches from this 
commit. If not, though, you can try same change from your patch to 
programs/Xserver/fb/fb.h on line 109.

Hope this helps...

Dejan