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 (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,79 +1,78 @@ @@ -1,79 +1,78 @@
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
38SUBST_SED.python+= -e "s,python,python${PYVERSSUFFIX}," 37SUBST_SED.python+= -e "s,python,python${PYVERSSUFFIX},"
39SUBST_SED.python+= -e "s,rst2man,rst2man-${PYVERSSUFFIX}," 38SUBST_SED.python+= -e "s,rst2man,rst2man-${PYVERSSUFFIX},"
40SUBST_FILES.python+= wscript 39SUBST_FILES.python+= wscript
41SUBST_STAGE.python= pre-configure 40SUBST_STAGE.python= pre-configure
42SUBST_MESSAGE.python= Fix Python command names. 41SUBST_MESSAGE.python= Fix Python command names.
43 42
44.include "../../mk/bsd.prefs.mk" 43.include "../../mk/bsd.prefs.mk"
45 44
46# 45#
47# At some point this should be consolidated into mk/platform/Darwin.mk, it is 46# At some point this should be consolidated into mk/platform/Darwin.mk, it is
48# here temporarily while any issues are ironed out and it can be made generic 47# here temporarily while any issues are ironed out and it can be made generic
49# for Swift handling. 48# for Swift handling.
50# 49#
51# On newer macOS releases there are a couple of swift compat static libraries 50# On newer macOS releases there are a couple of swift compat static libraries
52# that need to be added to the search path. 51# that need to be added to the search path.
53# 52#
54.if ${OPSYS} == "Darwin" 53.if ${OPSYS} == "Darwin"
55XCODE_DIR!= xcode-select -p 2>/dev/null || ${TRUE} 54XCODE_DIR!= xcode-select -p 2>/dev/null || ${TRUE}
56. if exists(${XCODE_DIR}/usr/lib/swift/macosx) 55. if exists(${XCODE_DIR}/usr/lib/swift/macosx)
57BUILDLINK_PASSTHRU_DIRS+= ${XCODE_DIR}/usr/lib/swift/macosx 56BUILDLINK_PASSTHRU_DIRS+= ${XCODE_DIR}/usr/lib/swift/macosx
58. elif exists(${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx) 57. elif exists(${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx)
59BUILDLINK_PASSTHRU_DIRS+= ${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx 58BUILDLINK_PASSTHRU_DIRS+= ${XCODE_DIR}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx
60. endif 59. endif
61.endif 60.endif
62 61
63post-install: 62post-install:
64 cd ${DESTDIR}${PREFIX} && ${MV} etc/mpv/encoding-profiles.conf share/examples/mpv 63 cd ${DESTDIR}${PREFIX} && ${MV} etc/mpv/encoding-profiles.conf share/examples/mpv
65 64
66.include "options.mk" 65.include "options.mk"
67.include "../../converters/libiconv/buildlink3.mk" 66.include "../../converters/libiconv/buildlink3.mk"
68.include "../../devel/waf/waf.mk" 67.include "../../devel/waf/waf.mk"
69.include "../../devel/zlib/buildlink3.mk" 68.include "../../devel/zlib/buildlink3.mk"
70.include "../../graphics/lcms2/buildlink3.mk" 69.include "../../graphics/lcms2/buildlink3.mk"
71.include "../../lang/python/application.mk" 70.include "../../lang/python/application.mk"
72.include "../../multimedia/libass/buildlink3.mk" 71.include "../../multimedia/libass/buildlink3.mk"
73.include "../../multimedia/libdvdnav/buildlink3.mk" 72.include "../../multimedia/libdvdnav/buildlink3.mk"
74.include "../../multimedia/ffmpeg4/buildlink3.mk" 73.include "../../multimedia/ffmpeg4/buildlink3.mk"
75.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 74.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
76.include "../../sysutils/desktop-file-utils/desktopdb.mk" 75.include "../../sysutils/desktop-file-utils/desktopdb.mk"
77.include "../../mk/jpeg.buildlink3.mk" 76.include "../../mk/jpeg.buildlink3.mk"
78.include "../../mk/atomic64.mk" 77.include "../../mk/atomic64.mk"
79.include "../../mk/bsd.pkg.mk" 78.include "../../mk/bsd.pkg.mk"
cvs diff -r1.27 -r1.28 pkgsrc/multimedia/mpv/options.mk (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,199 +1,203 @@ @@ -1,199 +1,203 @@
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
15# misc 15# misc
16PKG_SUPPORTED_OPTIONS+= bluray lua 16PKG_SUPPORTED_OPTIONS+= bluray lua
17 17
18PKG_SUGGESTED_OPTIONS= bluray lua sdl2 18PKG_SUGGESTED_OPTIONS= bluray lua sdl2
19PKG_SUGGESTED_OPTIONS.Linux+= alsa pulseaudio 19PKG_SUGGESTED_OPTIONS.Linux+= alsa pulseaudio
20 20
21.include "../../mk/bsd.fast.prefs.mk" 21.include "../../mk/bsd.fast.prefs.mk"
22 22
23.if ${OPSYS} != "Darwin" 23.if ${OPSYS} != "Darwin"
24PKG_SUGGESTED_OPTIONS+= opengl libdrm x11 24PKG_SUGGESTED_OPTIONS+= opengl libdrm x11
25.endif 25.endif
26 26
27.include "../../multimedia/libva/available.mk" 27.include "../../multimedia/libva/available.mk"
28 28
29.if ${VAAPI_AVAILABLE} == "yes" 29.if ${VAAPI_AVAILABLE} == "yes"
30PKG_SUPPORTED_OPTIONS+= vaapi 30PKG_SUPPORTED_OPTIONS+= vaapi
31PKG_SUGGESTED_OPTIONS+= vaapi 31PKG_SUGGESTED_OPTIONS+= vaapi
32.endif 32.endif
33 33
34.include "../../multimedia/libvdpau/available.mk" 34.include "../../multimedia/libvdpau/available.mk"
35 35
36.if ${VDPAU_AVAILABLE} == "yes" 36.if ${VDPAU_AVAILABLE} == "yes"
37PKG_SUPPORTED_OPTIONS+= vdpau 37PKG_SUPPORTED_OPTIONS+= vdpau
38PKG_SUGGESTED_OPTIONS+= vdpau 38PKG_SUGGESTED_OPTIONS+= vdpau
39.endif 39.endif
40 40
41.if ${OPSYS} == "Linux" 41.if ${OPSYS} == "Linux"
42PKG_SUPPORTED_OPTIONS+= wayland 42PKG_SUPPORTED_OPTIONS+= wayland
43PKG_SUGGESTED_OPTIONS+= wayland 43PKG_SUGGESTED_OPTIONS+= wayland
44.endif 44.endif
45 45
46.include "../../mk/bsd.options.mk" 46.include "../../mk/bsd.options.mk"
47 47
48### 48###
49### alsa support (audio output) 49### alsa support (audio output)
50### 50###
51.if !empty(PKG_OPTIONS:Malsa) 51.if !empty(PKG_OPTIONS:Malsa)
52WAF_CONFIGURE_ARGS+= --enable-alsa 52WAF_CONFIGURE_ARGS+= --enable-alsa
53.include "../../audio/alsa-lib/buildlink3.mk" 53.include "../../audio/alsa-lib/buildlink3.mk"
54.else 54.else
55WAF_CONFIGURE_ARGS+= --disable-alsa 55WAF_CONFIGURE_ARGS+= --disable-alsa
56.endif 56.endif
57 57
58### 58###
59### libbluray support 59### libbluray support
60### 60###
61.if !empty(PKG_OPTIONS:Mbluray) 61.if !empty(PKG_OPTIONS:Mbluray)
62WAF_CONFIGURE_ARGS+= --enable-libbluray 62WAF_CONFIGURE_ARGS+= --enable-libbluray
63.include "../../multimedia/libbluray/buildlink3.mk" 63.include "../../multimedia/libbluray/buildlink3.mk"
64.else 64.else
65WAF_CONFIGURE_ARGS+= --disable-libbluray 65WAF_CONFIGURE_ARGS+= --disable-libbluray
66.endif 66.endif
67 67
68### 68###
69### caca support (video output) 69### caca support (video output)
70### 70###
71.if !empty(PKG_OPTIONS:Mcaca) 71.if !empty(PKG_OPTIONS:Mcaca)
72WAF_CONFIGURE_ARGS+= --enable-caca 72WAF_CONFIGURE_ARGS+= --enable-caca
73.include "../../graphics/libcaca/buildlink3.mk" 73.include "../../graphics/libcaca/buildlink3.mk"
74.else 74.else
75WAF_CONFIGURE_ARGS+= --disable-caca 75WAF_CONFIGURE_ARGS+= --disable-caca
76.endif 76.endif
77 77
78### 78###
79### lua support 79### lua support
80### 80###
81.if !empty(PKG_OPTIONS:Mlua) 81.if !empty(PKG_OPTIONS:Mlua)
82WAF_CONFIGURE_ARGS+= --enable-lua 82WAF_CONFIGURE_ARGS+= --enable-lua
83LUA_VERSIONS_ACCEPTED= 52 51 83LUA_VERSIONS_ACCEPTED= 52 51
84.include "../../lang/lua/buildlink3.mk" 84.include "../../lang/lua/buildlink3.mk"
85.else 85.else
86WAF_CONFIGURE_ARGS+= --disable-lua 86WAF_CONFIGURE_ARGS+= --disable-lua
87.endif 87.endif
88 88
89### 89###
90### JACK support (audio output) 90### JACK support (audio output)
91### 91###
92.if !empty(PKG_OPTIONS:Mjack) 92.if !empty(PKG_OPTIONS:Mjack)
93WAF_CONFIGURE_ARGS+= --enable-jack 93WAF_CONFIGURE_ARGS+= --enable-jack
94.include "../../audio/jack/buildlink3.mk" 94.include "../../audio/jack/buildlink3.mk"
95.else 95.else
96WAF_CONFIGURE_ARGS+= --disable-jack 96WAF_CONFIGURE_ARGS+= --disable-jack
97.endif 97.endif
98 98
99 99
100### 100###
101### OpenAL support (audio output) 101### OpenAL support (audio output)
102### 102###
103.if !empty(PKG_OPTIONS:Mopenal) 103.if !empty(PKG_OPTIONS:Mopenal)
104WAF_CONFIGURE_ARGS+= --enable-openal 104WAF_CONFIGURE_ARGS+= --enable-openal
105.include "../../audio/openal-soft/buildlink3.mk" 105.include "../../audio/openal-soft/buildlink3.mk"
106.else 106.else
107WAF_CONFIGURE_ARGS+= --disable-openal 107WAF_CONFIGURE_ARGS+= --disable-openal
108.endif 108.endif
109 109
110### 110###
111### PulseAudio support (audio output) 111### PulseAudio support (audio output)
112### 112###
113.if !empty(PKG_OPTIONS:Mpulseaudio) 113.if !empty(PKG_OPTIONS:Mpulseaudio)
114WAF_CONFIGURE_ARGS+= --enable-pulse 114WAF_CONFIGURE_ARGS+= --enable-pulse
115.include "../../audio/pulseaudio/buildlink3.mk" 115.include "../../audio/pulseaudio/buildlink3.mk"
116.else 116.else
117WAF_CONFIGURE_ARGS+= --disable-pulse 117WAF_CONFIGURE_ARGS+= --disable-pulse
118.endif 118.endif
119 119
120### 120###
121### SDL2 support (audio and video output) 121### SDL2 support (audio and video output)
122### 122###
123.if !empty(PKG_OPTIONS:Msdl2) 123.if !empty(PKG_OPTIONS:Msdl2)
124WAF_CONFIGURE_ARGS+= --enable-sdl2 124WAF_CONFIGURE_ARGS+= --enable-sdl2
125.include "../../devel/SDL2/buildlink3.mk" 125.include "../../devel/SDL2/buildlink3.mk"
126.else 126.else
127WAF_CONFIGURE_ARGS+= --disable-sdl2 127WAF_CONFIGURE_ARGS+= --disable-sdl2
128.endif 128.endif
129 129
130### 130###
131### VAAPI support (video output) 131### VAAPI support (video output)
132### 132###
133.if !empty(PKG_OPTIONS:Mvaapi) 133.if !empty(PKG_OPTIONS:Mvaapi)
134WAF_CONFIGURE_ARGS+= --enable-vaapi 134WAF_CONFIGURE_ARGS+= --enable-vaapi
135.include "../../multimedia/libva/buildlink3.mk" 135.include "../../multimedia/libva/buildlink3.mk"
136.else 136.else
137WAF_CONFIGURE_ARGS+= --disable-vaapi 137WAF_CONFIGURE_ARGS+= --disable-vaapi
138.endif 138.endif
139 139
140### 140###
141### VDPAU support (video output) 141### VDPAU support (video output)
142### 142###
143.if !empty(PKG_OPTIONS:Mvdpau) 143.if !empty(PKG_OPTIONS:Mvdpau)
144WAF_CONFIGURE_ARGS+= --enable-vdpau 144WAF_CONFIGURE_ARGS+= --enable-vdpau
145.include "../../multimedia/libvdpau/buildlink3.mk" 145.include "../../multimedia/libvdpau/buildlink3.mk"
146.else 146.else
147WAF_CONFIGURE_ARGS+= --disable-vdpau 147WAF_CONFIGURE_ARGS+= --disable-vdpau
148.endif 148.endif
149 149
150### 150###
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)
177### 181###
178.if !empty(PKG_OPTIONS:Mwayland) 182.if !empty(PKG_OPTIONS:Mwayland)
179WAF_CONFIGURE_ARGS+= --enable-wayland 183WAF_CONFIGURE_ARGS+= --enable-wayland
180.include "../../devel/wayland/buildlink3.mk" 184.include "../../devel/wayland/buildlink3.mk"
181.include "../../devel/wayland-protocols/buildlink3.mk" 185.include "../../devel/wayland-protocols/buildlink3.mk"
182.include "../../x11/libxkbcommon/buildlink3.mk" 186.include "../../x11/libxkbcommon/buildlink3.mk"
183.else 187.else
184WAF_CONFIGURE_ARGS+= --disable-wayland 188WAF_CONFIGURE_ARGS+= --disable-wayland
185.endif 189.endif
186 190
187### 191###
188### X11 support (video output) 192### X11 support (video output)
189### 193###
190.if !empty(PKG_OPTIONS:Mx11) 194.if !empty(PKG_OPTIONS:Mx11)
191WAF_CONFIGURE_ARGS+= --enable-x11 195WAF_CONFIGURE_ARGS+= --enable-x11
192.include "../../x11/libXinerama/buildlink3.mk" 196.include "../../x11/libXinerama/buildlink3.mk"
193.include "../../x11/libXrandr/buildlink3.mk" 197.include "../../x11/libXrandr/buildlink3.mk"
194.include "../../x11/libXScrnSaver/buildlink3.mk" 198.include "../../x11/libXScrnSaver/buildlink3.mk"
195.include "../../x11/libXv/buildlink3.mk" 199.include "../../x11/libXv/buildlink3.mk"
196.include "../../x11/libXxf86vm/buildlink3.mk" 200.include "../../x11/libXxf86vm/buildlink3.mk"
197.else 201.else
198WAF_CONFIGURE_ARGS+= --disable-x11 202WAF_CONFIGURE_ARGS+= --disable-x11
199.endif 203.endif