CVS commit: pkgsrc/graphics/MesaLib

["Maya Rashish" <maya%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   maya
Date:           Thu Mar  2 04:40:33 UTC 2017

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

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.133 -r1.134 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.49 -r1.50 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/Makefile
diff -u pkgsrc/graphics/MesaLib/Makefile:1.133 pkgsrc/graphics/MesaLib/Makefile:1.134
--- pkgsrc/graphics/MesaLib/Makefile:1.133      Fri Feb 24 13:48:33 2017
+++ pkgsrc/graphics/MesaLib/Makefile    Thu Mar  2 04:40:33 2017
@@ -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/MesaL
 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"

Index: pkgsrc/graphics/MesaLib/options.mk
diff -u pkgsrc/graphics/MesaLib/options.mk:1.49 pkgsrc/graphics/MesaLib/options.mk:1.50
--- pkgsrc/graphics/MesaLib/options.mk:1.49     Thu Feb 25 13:37:46 2016
+++ pkgsrc/graphics/MesaLib/options.mk  Thu Mar  2 04:40:33 2017
@@ -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 nou
 # 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) ||        \