diff options
| author | maya <maya> | 2017-03-02 04:40:33 +0000 |
|---|---|---|
| committer | maya <maya> | 2017-03-02 04:40:33 +0000 |
| commit | 3322ebe384d7a2663d508ed2f7e9b040415ab279 (patch) | |
| tree | 4897b1423a2f60abe8322d6ada20deb2197db204 /graphics/MesaLib | |
| parent | 3715c5602f7689ae5acb00f8a0c3fe62e3927842 (diff) | |
| download | pkgsrc-3322ebe384d7a2663d508ed2f7e9b040415ab279.tar.gz | |
MesaLib: pull in vdpau and vaapi only if dri option is selected.
This fixes a PLIST mismatch in the -dri -llvm case, pointed out by
Joern Clausen in PR pkg/52021.
Diffstat (limited to 'graphics/MesaLib')
| -rw-r--r-- | graphics/MesaLib/Makefile | 16 | ||||
| -rw-r--r-- | graphics/MesaLib/options.mk | 17 |
2 files changed, 16 insertions, 17 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index fe1de79d086..087e2fefb5b 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.133 2017/02/24 13:48:33 maya Exp $ +# $NetBSD: Makefile,v 1.134 2017/03/02 04:40:33 maya Exp $ DISTNAME= mesa-11.2.2 PKGNAME= ${DISTNAME:S/mesa/MesaLib/} @@ -105,20 +105,6 @@ INSTALLATION_DIRS+= share/examples/MesaLib post-install: ${INSTALL_DATA} ${WRKSRC}/src/mesa/drivers/dri/common/drirc ${DESTDIR}${PREFIX}/share/examples/MesaLib -PLIST_VARS+= vdpau vaapi - -.include "../../multimedia/libvdpau/available.mk" -.if ${VDPAU_AVAILABLE} == "yes" -PLIST.vdpau= yes -.include "../../multimedia/libvdpau/buildlink3.mk" -.endif - -.include "../../multimedia/libva/available.mk" -.if ${VAAPI_AVAILABLE} == "yes" -PLIST.vaapi= yes -.include "../../multimedia/libva/buildlink3.mk" -.endif - .include "../../x11/libX11/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libxcb/buildlink3.mk" diff --git a/graphics/MesaLib/options.mk b/graphics/MesaLib/options.mk index 88305242b99..88426f2fc89 100644 --- a/graphics/MesaLib/options.mk +++ b/graphics/MesaLib/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.49 2016/02/25 13:37:46 jperkin Exp $ +# $NetBSD: options.mk,v 1.50 2017/03/02 04:40:33 maya Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib PKG_SUPPORTED_OPTIONS= llvm dri @@ -37,7 +37,7 @@ PLIST_VARS+= freedreno ilo i915 i965 nouveau r300 r600 radeonsi \ # classic DRI PLIST_VARS+= dri swrast_dri i915_dri nouveau_dri i965_dri radeon_dri r200_dri # other features -PLIST_VARS+= gbm wayland xatracker +PLIST_VARS+= gbm vaapi vdpau wayland xatracker .if !empty(PKG_OPTIONS:Mdri) @@ -52,6 +52,19 @@ PLIST.gbm= yes CONFIGURE_ARGS+= --enable-gles1 CONFIGURE_ARGS+= --enable-gles2 +# VA-API and VDPAU +.include "../../multimedia/libva/available.mk" +.if ${VAAPI_AVAILABLE} == "yes" +PLIST.vaapi= yes +.include "../../multimedia/libva/buildlink3.mk" +.endif + +.include "../../multimedia/libvdpau/available.mk" +.if ${VDPAU_AVAILABLE} == "yes" +PLIST.vdpau= yes +.include "../../multimedia/libvdpau/buildlink3.mk" +.endif + # Use Thread Local Storage in GLX where it is supported by Mesa and works. .if \ !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) || \ |