[pkgsrc/trunk]: pkgsrc/graphics/MesaLib Only include libvdpau_nouveau if nouv...

[sevan <sevan%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3b23273a7486
branches:  trunk
changeset: 389264:3b23273a7486
user:      sevan <sevan%pkgsrc.org@localhost>
date:      Mon Dec 24 13:56:44 2018 +0000

description:
Only include libvdpau_nouveau if nouveau is actually supported otherwise build
succeeds but fails on checking file-check results.

diffstat:

 graphics/MesaLib/PLIST      |  10 +++++-----
 graphics/MesaLib/options.mk |   9 ++++++++-
 2 files changed, 13 insertions(+), 6 deletions(-)

diffs (62 lines):

diff -r b3e1879161bf -r 3b23273a7486 graphics/MesaLib/PLIST
--- a/graphics/MesaLib/PLIST    Mon Dec 24 02:30:45 2018 +0000
+++ b/graphics/MesaLib/PLIST    Mon Dec 24 13:56:44 2018 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.37 2018/09/03 11:22:18 wiz Exp $
+@comment $NetBSD: PLIST,v 1.38 2018/12/24 13:56:44 sevan Exp $
 ${PLIST.dri}include/EGL/egl.h
 ${PLIST.dri}include/EGL/eglext.h
 ${PLIST.dri}include/EGL/eglextchromium.h
@@ -63,10 +63,10 @@
 ${PLIST.dri}lib/pkgconfig/glesv2.pc
 ${PLIST.wayland}lib/pkgconfig/wayland-egl.pc
 ${PLIST.xatracker}lib/pkgconfig/xatracker.pc
-${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so
-${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1
-${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1.0
-${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1.0.0
+${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so
+${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1
+${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1.0
+${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1.0.0
 ${PLIST.vdpau}lib/vdpau/libvdpau_r300.so
 ${PLIST.vdpau}lib/vdpau/libvdpau_r300.so.1
 ${PLIST.vdpau}lib/vdpau/libvdpau_r300.so.1.0
diff -r b3e1879161bf -r 3b23273a7486 graphics/MesaLib/options.mk
--- a/graphics/MesaLib/options.mk       Mon Dec 24 02:30:45 2018 +0000
+++ b/graphics/MesaLib/options.mk       Mon Dec 24 13:56:44 2018 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.62 2018/06/20 12:28:42 maya Exp $
+# $NetBSD: options.mk,v 1.63 2018/12/24 13:56:44 sevan Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.MesaLib
 PKG_SUPPORTED_OPTIONS=         llvm dri
@@ -124,9 +124,12 @@
 PLIST.r600=            yes
 GALLIUM_DRIVERS+=      r600
 
+# FreeBSD lacks nouveau support (there are official binaries from Nvidia)
+.if ${OPSYS} != "FreeBSD"
 # nVidia
 PLIST.nouveau=         yes
 GALLIUM_DRIVERS+=      nouveau
+.endif
 
 # classic DRI radeon
 PLIST.radeon_dri=      yes
@@ -136,11 +139,15 @@
 PLIST.r200_dri=                yes
 DRI_DRIVERS+=          r200
 
+# FreeBSD lacks nouveau support (there are official binaries from Nvidia)
+.if ${OPSYS} != "FreeBSD"
 # classic DRI nouveau
 PLIST.nouveau_dri=     yes
 DRI_DRIVERS+=          nouveau
 .endif
 
+.endif
+
 .if ${OPSYS} == "Darwin"
 CONFIGURE_ARGS+=       --with-egl-platforms=x11
 #.elif ${OPSYS} == "Linux"