CFT upgrade to xorg 1.18.4 and newer intel/ati DDX

[Pete Wright]

On 02/09/2017 08:57, Andrea Venturoli wrote:
> On 01/24/17 00:55, Baptiste Daroussin wrote:
>> Hi all,
>>
>> This is a call for testing for newer Xorg along with newer drivers: 
>> intel and
>> ati.
>
> Hello.
> Thanks for your work.
>
> I'm willing to test this, since I'm experiencing frequent X lock ups 
> on an Intel-based laptop.
>
> I applied your patch to my port tree and added the following to my 
> poudriere's build list:
> x11-drivers/xf86-video-ati (this is for another PC)
> x11-drivers/xf86-input-keyboard
> x11-drivers/xf86-input-mouse
> x11-drivers/xf86-video-intel
>
> However xf86-input-keyboard and xf86-input-mouse fail with:
> > ...
>> checking for asprintf... (cached) yes
>> checking for XORG... no
>> configure: error: Package requirements (xorg-server >= 1.7 xproto 
>> inputproto) were not met:
>>
>> Package dri3proto was not found in the pkg-config search path.
>> Perhaps you should add the directory containing `dri3proto.pc'
>> to the PKG_CONFIG_PATH environment variable
>> Package 'dri3proto', required by 'xorg-server', not found
>>
>>
>> Consider adjusting the PKG_CONFIG_PATH environment variable if you
>> installed software in a non-standard prefix.
>>
>> Alternatively, you may set the environment variables XORG_CFLAGS
>> and XORG_LIBS to avoid the need to call pkg-config.
>> See the pkg-config man page for more details.
>> ===>  Script "configure" failed unexpectedly.
>

I have run into the same issue, and I have reported this to the 
maintainers.  This diff resolved the issue on my end, which allowed all 
Xorg packages to build:

$ git diff Mk/bsd.xorg.mk
diff --git a/Mk/bsd.xorg.mk b/Mk/bsd.xorg.mk
index 295d7b9112a6..6110936583a3 100644
--- a/Mk/bsd.xorg.mk
+++ b/Mk/bsd.xorg.mk
@@ -59,7 +59,7 @@ USE_XORG+=      xorg-macros

  . if ${XORG_CAT} == "driver"
  USE_XORG+=     xorg-server xproto randrproto xi renderproto xextproto \
-           inputproto kbproto fontsproto videoproto dri2proto 
xf86driproto \
+         inputproto kbproto fontsproto videoproto dri2proto dri3proto 
xf86driproto \
                 presentproto glproto xineramaproto resourceproto 
scrnsaverproto
  # work around a llvm bug on i386, llvm bug #15806
  # reproduced with clang 3.2 (current release) and 3.1


I believe this fix will be included in the upcoming release. basically 
we need to ensure that dri3proto is built along with Xorg as I believe 
some of the newer xorg drivers have a hard dependency on dri3.

HTH,
-pete