CVS commit: pkgsrc/multimedia

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

Module Name:    pkgsrc
Committed By:   maya
Date:           Fri Mar 17 09:10:14 UTC 2017

Modified Files:
        pkgsrc/multimedia/libva: available.mk
        pkgsrc/multimedia/libvdpau: available.mk

Log Message:
revert libvdpau/libva changes, this doesn't work as expected.


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/multimedia/libva/available.mk
cvs rdiff -u -r1.7 -r1.8 pkgsrc/multimedia/libvdpau/available.mk

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

Modified files:

Index: pkgsrc/multimedia/libva/available.mk
diff -u pkgsrc/multimedia/libva/available.mk:1.10 pkgsrc/multimedia/libva/available.mk:1.11
--- pkgsrc/multimedia/libva/available.mk:1.10   Thu Mar 16 23:07:28 2017
+++ pkgsrc/multimedia/libva/available.mk        Fri Mar 17 09:10:14 2017
@@ -1,21 +1,14 @@
-# $NetBSD: available.mk,v 1.10 2017/03/16 23:07:28 maya Exp $
+# $NetBSD: available.mk,v 1.11 2017/03/17 09:10:14 maya Exp $
 
 
 .include "../../mk/bsd.prefs.mk"
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.libva
-PKG_SUPPORTED_OPTIONS+=        x11
-PKG_SUGGESTED_OPTIONS= x11
-
-.include "../../mk/bsd.options.mk"
-
 # At the moment VAAPI is available only for XXX.  The following
 # condition is here to NOT list these platforms in multiple places,
 # i.e. in mplayer, xine, xbmc etc.  Have a look at buildlink3.mk too.
 
 VAAPI_AVAILABLE=       no
 
-.if !empty(PKG_OPTIONS:Mx11)
 # The following should be kept up-to-date!
 .if ${OPSYS} == "DragonFly"
 VAAPI_AVAILABLE=       yes
@@ -26,4 +19,3 @@ VAAPI_AVAILABLE=      yes
 .elif ${OPSYS} == "Linux"
 VAAPI_AVAILABLE=       yes
 .endif
-.endif

Index: pkgsrc/multimedia/libvdpau/available.mk
diff -u pkgsrc/multimedia/libvdpau/available.mk:1.7 pkgsrc/multimedia/libvdpau/available.mk:1.8
--- pkgsrc/multimedia/libvdpau/available.mk:1.7 Thu Mar 16 23:07:28 2017
+++ pkgsrc/multimedia/libvdpau/available.mk     Fri Mar 17 09:10:14 2017
@@ -1,17 +1,9 @@
-# $NetBSD: available.mk,v 1.7 2017/03/16 23:07:28 maya Exp $
+# $NetBSD: available.mk,v 1.8 2017/03/17 09:10:14 maya Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.libvdpau
-PKG_SUPPORTED_OPTIONS+=        x11
-PKG_SUGGESTED_OPTIONS= x11
-
-.include "../../mk/bsd.options.mk"
-
 VDPAU_AVAILABLE=       no
 
-.if !empty(PKG_OPTIONS:Mx11)
 .if ${OPSYS} != "Darwin" && (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
 VDPAU_AVAILABLE=       yes
 .endif
-.endif