diff options
| author | sevan <sevan@pkgsrc.org> | 2018-12-24 13:56:44 +0000 |
|---|---|---|
| committer | sevan <sevan@pkgsrc.org> | 2018-12-24 13:56:44 +0000 |
| commit | 4d763fb750c41afec5054a969569f62c1c2ee91a (patch) | |
| tree | a7de472e34f9e4e7f97d0aab0c86e17fb4378067 | |
| parent | f9fe8ee960b342083c79e23ae48dd6f3d49acc85 (diff) | |
| download | pkgsrc-4d763fb750c41afec5054a969569f62c1c2ee91a.tar.gz | |
Only include libvdpau_nouveau if nouveau is actually supported otherwise build
succeeds but fails on checking file-check results.
| -rw-r--r-- | graphics/MesaLib/PLIST | 10 | ||||
| -rw-r--r-- | graphics/MesaLib/options.mk | 9 |
2 files changed, 13 insertions, 6 deletions
diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST index cafd3d514d8..a7ee742c936 100644 --- a/graphics/MesaLib/PLIST +++ b/graphics/MesaLib/PLIST @@ -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 diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk index 19207f095e1..61bcd528495 100644 --- a/graphics/MesaLib/options.mk +++ b/graphics/MesaLib/options.mk @@ -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" |