Mesalib 19 dependency on NetBSD 7.2-STABLE for cairo

[Mike Pumford <mpumford%mudcovered.org.uk@localhost>]

My last 2 7.2-STABLE amd64 pkgsrc runs have failed building rrdtool 
because all of a sudden cairo is now dependent on MesaLib-19 which 
doesn't build.

I'm building with X11_TYPE=native so I wasn't really expecting a pkgsrc 
mesalib. My guess is that something has gone wrong in the x11-links 
package but I can't puzzle out what. This seems like an unexpectedly 
large build dependency for a tool that doesn't even use X.

Dependency output from cairo:

=> Checksum SHA1 OK for cairo-1.16.0.tar.xz
=> Checksum RMD160 OK for cairo-1.16.0.tar.xz
=> Checksum SHA512 OK for cairo-1.16.0.tar.xz
===> Installing dependencies for cairo-1.16.0
==========================================================================
The supported build options for cairo are:

        x11 xcb

The currently selected options are:

        x11 xcb

You can select which build options to use by setting PKG_DEFAULT_OPTIONS
or the following variable.  Its current value is shown:

        PKG_OPTIONS.cairo (not defined)

==========================================================================
=> Tool dependency libtool-base>=2.4.2nb9: found libtool-base-2.4.6nb2
=> Tool dependency pkgconf-[0-9]*: found pkgconf-1.6.0
=> Tool dependency checkperms>=1.1: found checkperms-1.12
=> Build dependency x11-links>=1.29: found x11-links-1.29
=> Build dependency cwrappers>=20150314: found cwrappers-20180325
=> Full dependency MesaLib>=7.11.2: NOT found
=> Verifying package-install for ../../graphics/MesaLib
=> Bootstrap dependency digest>=20010302: found digest-20190127


Final build failure in mesalib:
Run-time dependency expat found: YES 2.2.1
Library m found: YES
Message: libdrm 2.4.97 needed because amdgpu has the highest requirement
Dependency libdrm_intel found: NO found '2.4.59' but need: '>=2.4.97'
Run-time dependency libdrm_intel found: NO (tried cmake)

meson.build:1209:4: ERROR: Invalid version of dependency, need 
'libdrm_intel' ['>=2.4.97'] found '2.4.59'.

A full log can be found at 
/pkg_comp/obj/pkgsrc/graphics/MesaLib/default/mesa-19.1.4/output/meson-logs/meson-log.txt
*** Error code 1

Any suggestions on how to go about fixing this?

Mike