Sun Apr 25 06:09:41 2021 UTC ()
mpv: only disable EGL if unavailable in Mesa

reported by mikeqin on IRC


(nia)
diff -r1.124 -r1.125 pkgsrc/multimedia/mpv/Makefile
diff -r1.27 -r1.28 pkgsrc/multimedia/mpv/options.mk
cvs diff -r1.124 -r1.125 pkgsrc/multimedia/mpv/Makefile (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/Makefile 2021/04/21 11:42:21 1.124
+++ pkgsrc/multimedia/mpv/Makefile 2021/04/25 06:09:41 1.125
@@ -1,37 +1,36 @@ @@ -1,37 +1,36 @@
1# $NetBSD: Makefile,v 1.124 2021/04/21 11:42:21 adam Exp $ 1# $NetBSD: Makefile,v 1.125 2021/04/25 06:09:41 nia Exp $
2 2
3DISTNAME= mpv-0.33.1 3DISTNAME= mpv-0.33.1
4PKGREVISION= 1 4PKGREVISION= 2
5CATEGORIES= multimedia 5CATEGORIES= multimedia
6MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/} 6MASTER_SITES= ${MASTER_SITE_GITHUB:=mpv-player/}
7GITHUB_TAG= v${PKGVERSION_NOREV} 7GITHUB_TAG= v${PKGVERSION_NOREV}
8 8
9MAINTAINER= leot@NetBSD.org 9MAINTAINER= leot@NetBSD.org
10HOMEPAGE= https://mpv.io/ 10HOMEPAGE= https://mpv.io/
11COMMENT= Video player based on MPlayer and mplayer2 11COMMENT= Video player based on MPlayer and mplayer2
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1 12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2.1
13 13
14# needs sem_timedwait(3) 14# needs sem_timedwait(3)
15NOT_FOR_PLATFORM= NetBSD-[1-6].*-* 15NOT_FOR_PLATFORM= NetBSD-[1-6].*-*
16 16
17TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils 17TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
18# ${WRKSRC}/bootstrap.py mentions needed version 18# ${WRKSRC}/bootstrap.py mentions needed version
19TOOL_DEPENDS+= waf>=2.0.9:../../devel/waf 19TOOL_DEPENDS+= waf>=2.0.9:../../devel/waf
20 20
21WAF_REPLACE_EXECUTABLE= yes 21WAF_REPLACE_EXECUTABLE= yes
22WAF_CONFIGURE_ARGS+= --bindir=${PREFIX}/bin 22WAF_CONFIGURE_ARGS+= --bindir=${PREFIX}/bin
23WAF_CONFIGURE_ARGS+= --enable-dvdnav 23WAF_CONFIGURE_ARGS+= --enable-dvdnav
24WAF_CONFIGURE_ARGS+= --disable-egl-x11 
25WAF_CONFIGURE_ARGS+= --enable-libmpv-shared 24WAF_CONFIGURE_ARGS+= --enable-libmpv-shared
26 25
27PYTHON_FOR_BUILD_ONLY= yes 26PYTHON_FOR_BUILD_ONLY= yes
28 27
29USE_TOOLS+= perl pkg-config 28USE_TOOLS+= perl pkg-config
30 29
31MAKE_DIRS= ${PKG_SYSCONFDIR}/mpv 30MAKE_DIRS= ${PKG_SYSCONFDIR}/mpv
32INSTALLATION_DIRS= share/examples/mpv 31INSTALLATION_DIRS= share/examples/mpv
33CONF_FILES+= share/examples/mpv/encoding-profiles.conf ${PKG_SYSCONFDIR}/mpv/encoding-profiles.conf 32CONF_FILES+= share/examples/mpv/encoding-profiles.conf ${PKG_SYSCONFDIR}/mpv/encoding-profiles.conf
34 33
35PKGCONFIG_OVERRIDE+= libmpv/mpv.pc.in 34PKGCONFIG_OVERRIDE+= libmpv/mpv.pc.in
36 35
37SUBST_CLASSES+= python 36SUBST_CLASSES+= python
cvs diff -r1.27 -r1.28 pkgsrc/multimedia/mpv/options.mk (expand / switch to unified diff)

--- pkgsrc/multimedia/mpv/options.mk 2020/12/19 12:17:29 1.27
+++ pkgsrc/multimedia/mpv/options.mk 2021/04/25 06:09:41 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.27 2020/12/19 12:17:29 nia Exp $ 1# $NetBSD: options.mk,v 1.28 2021/04/25 06:09:41 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.mpv 3PKG_OPTIONS_VAR= PKG_OPTIONS.mpv
4 4
5 5
6PKG_OPTIONS_OPTIONAL_GROUPS= gl 6PKG_OPTIONS_OPTIONAL_GROUPS= gl
7PKG_OPTIONS_GROUP.gl= opengl rpi 7PKG_OPTIONS_GROUP.gl= opengl rpi
8 8
9# audio outputs 9# audio outputs
10PKG_SUPPORTED_OPTIONS+= alsa jack openal pulseaudio 10PKG_SUPPORTED_OPTIONS+= alsa jack openal pulseaudio
11# video outputs 11# video outputs
12PKG_SUPPORTED_OPTIONS+= caca libdrm x11 12PKG_SUPPORTED_OPTIONS+= caca libdrm x11
13# audio/video outputs 13# audio/video outputs
14PKG_SUPPORTED_OPTIONS+= sdl2 14PKG_SUPPORTED_OPTIONS+= sdl2
@@ -151,26 +151,30 @@ WAF_CONFIGURE_ARGS+= --disable-vdpau @@ -151,26 +151,30 @@ WAF_CONFIGURE_ARGS+= --disable-vdpau
151### libdrm support (video output) 151### libdrm support (video output)
152### 152###
153.if !empty(PKG_OPTIONS:Mlibdrm) 153.if !empty(PKG_OPTIONS:Mlibdrm)
154WAF_CONFIGURE_ARGS+= --enable-drm 154WAF_CONFIGURE_ARGS+= --enable-drm
155.include "../../x11/libdrm/buildlink3.mk" 155.include "../../x11/libdrm/buildlink3.mk"
156.else 156.else
157WAF_CONFIGURE_ARGS+= --disable-drm 157WAF_CONFIGURE_ARGS+= --disable-drm
158.endif 158.endif
159 159
160### 160###
161### OpenGL support (video output) 161### OpenGL support (video output)
162### 162###
163.if !empty(PKG_OPTIONS:Mopengl) 163.if !empty(PKG_OPTIONS:Mopengl)
 164.include "../../graphics/MesaLib/features.mk"
 165. if ${MESALIB_SUPPORTS_EGL:tl} == "no"
 166WAF_CONFIGURE_ARGS+= --disable-egl-x11
 167. endif
164.include "../../graphics/MesaLib/buildlink3.mk" 168.include "../../graphics/MesaLib/buildlink3.mk"
165.elif !empty(PKG_OPTIONS:Mrpi) 169.elif !empty(PKG_OPTIONS:Mrpi)
166BUILD_DEPENDS+= raspberrypi-userland>=20170109:../../misc/raspberrypi-userland 170BUILD_DEPENDS+= raspberrypi-userland>=20170109:../../misc/raspberrypi-userland
167CFLAGS+= "-L${PREFIX}/lib" 171CFLAGS+= "-L${PREFIX}/lib"
168SUBST_CLASSES+= vc 172SUBST_CLASSES+= vc
169SUBST_STAGE.vc= pre-configure 173SUBST_STAGE.vc= pre-configure
170SUBST_MESSAGE.vc= Fixing path to VideoCore libraries. 174SUBST_MESSAGE.vc= Fixing path to VideoCore libraries.
171SUBST_FILES.vc= waftools/checks/custom.py 175SUBST_FILES.vc= waftools/checks/custom.py
172SUBST_SED.vc+= -e 's;opt/vc;${PREFIX};g' 176SUBST_SED.vc+= -e 's;opt/vc;${PREFIX};g'
173.endif 177.endif
174 178
175### 179###
176### Wayland support (video output) 180### Wayland support (video output)