From 36421754883eece3f24cf51e77fc0edf8014e7dc Mon Sep 17 00:00:00 2001 From: bsiegert Date: Fri, 21 May 2021 14:59:01 +0000 Subject: Pullup ticket #6456 - requested by nia multimedia/mpv: performance fix Revisions pulled up: - multimedia/mpv/Makefile 1.125 - multimedia/mpv/options.mk 1.28 --- Module Name: pkgsrc Committed By: nia Date: Sun Apr 25 06:09:41 UTC 2021 Modified Files: pkgsrc/multimedia/mpv: Makefile options.mk Log Message: mpv: only disable EGL if unavailable in Mesa reported by mikeqin on IRC --- multimedia/mpv/Makefile | 5 ++--- multimedia/mpv/options.mk | 6 +++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/multimedia/mpv/Makefile b/multimedia/mpv/Makefile index 73f383cfec7..cc0474d3e19 100644 --- a/multimedia/mpv/Makefile +++ b/multimedia/mpv/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.122 2021/02/07 06:30:34 ryoon Exp $ +# $NetBSD: Makefile,v 1.122.2.1 2021/05/21 14:59:01 bsiegert Exp $ DISTNAME= mpv-0.33.0 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= multimedia MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/} GITHUB_TAG= v${PKGVERSION_NOREV} @@ -21,7 +21,6 @@ TOOL_DEPENDS+= waf>=2.0.9:../../devel/waf WAF_REPLACE_EXECUTABLE= yes WAF_CONFIGURE_ARGS+= --bindir=${PREFIX}/bin WAF_CONFIGURE_ARGS+= --enable-dvdnav -WAF_CONFIGURE_ARGS+= --disable-egl-x11 WAF_CONFIGURE_ARGS+= --enable-libmpv-shared PYTHON_FOR_BUILD_ONLY= yes diff --git a/multimedia/mpv/options.mk b/multimedia/mpv/options.mk index cad4fdb625e..4c049750e90 100644 --- a/multimedia/mpv/options.mk +++ b/multimedia/mpv/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.27 2020/12/19 12:17:29 nia Exp $ +# $NetBSD: options.mk,v 1.27.4.1 2021/05/21 14:59:01 bsiegert Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mpv @@ -161,6 +161,10 @@ WAF_CONFIGURE_ARGS+= --disable-drm ### OpenGL support (video output) ### .if !empty(PKG_OPTIONS:Mopengl) +.include "../../graphics/MesaLib/features.mk" +. if ${MESALIB_SUPPORTS_EGL:tl} == "no" +WAF_CONFIGURE_ARGS+= --disable-egl-x11 +. endif .include "../../graphics/MesaLib/buildlink3.mk" .elif !empty(PKG_OPTIONS:Mrpi) BUILD_DEPENDS+= raspberrypi-userland>=20170109:../../misc/raspberrypi-userland -- cgit v1.2.3