CVS commit: pkgsrc/graphics/MesaLib

["Sevan Janiyan" <sevan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   sevan
Date:           Mon Dec 24 13:56:44 UTC 2018

Modified Files:
        pkgsrc/graphics/MesaLib: PLIST options.mk

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


To generate a diff of this commit:
cvs rdiff -u -r1.37 -r1.38 pkgsrc/graphics/MesaLib/PLIST
cvs rdiff -u -r1.62 -r1.63 pkgsrc/graphics/MesaLib/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/MesaLib/PLIST
diff -u pkgsrc/graphics/MesaLib/PLIST:1.37 pkgsrc/graphics/MesaLib/PLIST:1.38
--- pkgsrc/graphics/MesaLib/PLIST:1.37  Mon Sep  3 11:22:18 2018
+++ pkgsrc/graphics/MesaLib/PLIST       Mon Dec 24 13:56:44 2018
@@ -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/glesv1_cm.pc
 ${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

Index: pkgsrc/graphics/MesaLib/options.mk
diff -u pkgsrc/graphics/MesaLib/options.mk:1.62 pkgsrc/graphics/MesaLib/options.mk:1.63
--- pkgsrc/graphics/MesaLib/options.mk:1.62     Wed Jun 20 12:28:42 2018
+++ pkgsrc/graphics/MesaLib/options.mk  Mon Dec 24 13:56:44 2018
@@ -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.vc4=         yes
 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 @@ DRI_DRIVERS+=             radeon
 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"