From 0d05e9a54a5fbac93bcad8aad16cbd5f5b1fba2f Mon Sep 17 00:00:00 2001 From: maya Date: Fri, 17 Mar 2017 09:10:14 +0000 Subject: revert libvdpau/libva changes, this doesn't work as expected. --- multimedia/libva/available.mk | 10 +--------- multimedia/libvdpau/available.mk | 10 +--------- 2 files changed, 2 insertions(+), 18 deletions(-) (limited to 'multimedia') diff --git a/multimedia/libva/available.mk b/multimedia/libva/available.mk index f2b57203a6d..2d7703a9b9a 100644 --- a/multimedia/libva/available.mk +++ b/multimedia/libva/available.mk @@ -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 diff --git a/multimedia/libvdpau/available.mk b/multimedia/libvdpau/available.mk index 6ac52fe1dfe..cc5fac4da43 100644 --- a/multimedia/libvdpau/available.mk +++ b/multimedia/libvdpau/available.mk @@ -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 -- cgit v1.2.3