CVS commit: pkgsrc/multimedia/mpv

["Nia Alarie" <nia%netbsd.org@localhost>]

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


To generate a diff of this commit:
cvs rdiff -u -r1.124 -r1.125 pkgsrc/multimedia/mpv/Makefile
cvs rdiff -u -r1.27 -r1.28 pkgsrc/multimedia/mpv/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/multimedia/mpv/Makefile
diff -u pkgsrc/multimedia/mpv/Makefile:1.124 pkgsrc/multimedia/mpv/Makefile:1.125
--- pkgsrc/multimedia/mpv/Makefile:1.124        Wed Apr 21 11:42:21 2021
+++ pkgsrc/multimedia/mpv/Makefile      Sun Apr 25 06:09:41 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.124 2021/04/21 11:42:21 adam Exp $
+# $NetBSD: Makefile,v 1.125 2021/04/25 06:09:41 nia Exp $
 
 DISTNAME=      mpv-0.33.1
-PKGREVISION=   1
+PKGREVISION=   2
 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/wa
 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

Index: pkgsrc/multimedia/mpv/options.mk
diff -u pkgsrc/multimedia/mpv/options.mk:1.27 pkgsrc/multimedia/mpv/options.mk:1.28
--- pkgsrc/multimedia/mpv/options.mk:1.27       Sat Dec 19 12:17:29 2020
+++ pkgsrc/multimedia/mpv/options.mk    Sun Apr 25 06:09:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.27 2020/12/19 12:17:29 nia Exp $
+# $NetBSD: options.mk,v 1.28 2021/04/25 06:09:41 nia 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