CVS commit: pkgsrc/graphics/MesaLib

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Feb 24 13:48:33 UTC 2017

Modified Files:
        pkgsrc/graphics/MesaLib: Makefile PLIST

Log Message:
MesaLib: split out VA-API and VDPAU availability check

so if libva is unavailable on your platform, VDPAU can still be used.
if I didn't break your build before, this change should be cosmetic.


To generate a diff of this commit:
cvs rdiff -u -r1.132 -r1.133 pkgsrc/graphics/MesaLib/Makefile
cvs rdiff -u -r1.34 -r1.35 pkgsrc/graphics/MesaLib/PLIST

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.132 pkgsrc/graphics/MesaLib/Makefile:1.133
--- pkgsrc/graphics/MesaLib/Makefile:1.132      Fri Feb 24 00:16:55 2017
+++ pkgsrc/graphics/MesaLib/Makefile    Fri Feb 24 13:48:33 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2017/02/24 00:16:55 maya Exp $
+# $NetBSD: Makefile,v 1.133 2017/02/24 13:48:33 maya Exp $
 
 DISTNAME=      mesa-11.2.2
 PKGNAME=       ${DISTNAME:S/mesa/MesaLib/}
@@ -105,11 +105,17 @@ 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"
-PLIST_VARS+=   vdpau
 .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
 

Index: pkgsrc/graphics/MesaLib/PLIST
diff -u pkgsrc/graphics/MesaLib/PLIST:1.34 pkgsrc/graphics/MesaLib/PLIST:1.35
--- pkgsrc/graphics/MesaLib/PLIST:1.34  Fri Feb 24 00:16:55 2017
+++ pkgsrc/graphics/MesaLib/PLIST       Fri Feb 24 13:48:33 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2017/02/24 00:16:55 maya Exp $
+@comment $NetBSD: PLIST,v 1.35 2017/02/24 13:48:33 maya Exp $
 ${PLIST.dri}include/EGL/egl.h
 ${PLIST.dri}include/EGL/eglext.h
 ${PLIST.dri}include/EGL/eglextchromium.h
@@ -79,5 +79,5 @@ ${PLIST.vdpau}lib/vdpau/libvdpau_radeons
 ${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1
 ${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1.0
 ${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1.0.0
-${PLIST.vdpau}lib/dri/gallium_drv_video.la
-${PLIST.vdpau}lib/dri/gallium_drv_video.so
+${PLIST.vaapi}lib/dri/gallium_drv_video.la
+${PLIST.vaapi}lib/dri/gallium_drv_video.so