Mon Jun 29 11:53:09 2020 UTC ()
Detect if gtk3 was built with Wayland properly in Mozilla packages.

thanks jperkin for the hint.


(nia)
diff -r1.22 -r1.23 pkgsrc/mail/thunderbird/options.mk
diff -r1.171 -r1.172 pkgsrc/www/firefox/mozilla-common.mk
diff -r1.54 -r1.55 pkgsrc/www/firefox/options.mk
diff -r1.12 -r1.13 pkgsrc/www/firefox68/mozilla-common.mk
diff -r1.8 -r1.9 pkgsrc/www/firefox68/options.mk
cvs diff -r1.22 -r1.23 pkgsrc/mail/thunderbird/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/options.mk 2020/06/15 15:44:22 1.22
+++ pkgsrc/mail/thunderbird/options.mk 2020/06/29 11:53:09 1.23
@@ -1,29 +1,24 @@ @@ -1,29 +1,24 @@
1# $NetBSD: options.mk,v 1.22 2020/06/15 15:44:22 nia Exp $ 1# $NetBSD: options.mk,v 1.23 2020/06/29 11:53:09 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.thunderbird 3PKG_OPTIONS_VAR= PKG_OPTIONS.thunderbird
4 4
5PKG_SUPPORTED_OPTIONS= alsa dbus debug mozilla-jemalloc \ 5PKG_SUPPORTED_OPTIONS= alsa dbus debug mozilla-jemalloc \
6 official-mozilla-branding pulseaudio \ 6 official-mozilla-branding pulseaudio \
7 mozilla-lightning wayland 7 mozilla-lightning
8PKG_SUGGESTED_OPTIONS+= mozilla-lightning 8PKG_SUGGESTED_OPTIONS+= mozilla-lightning
9 9
10PLIST_VARS+= branding nobranding debug jemalloc 10PLIST_VARS+= branding nobranding debug jemalloc
11 11
12.include "../../devel/wayland/platform.mk" 
13.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes" 
14PKG_SUGGESTED_OPTIONS+= wayland 
15.endif 
16 
17.if ${OPSYS} == "Linux" 12.if ${OPSYS} == "Linux"
18PKG_SUGGESTED_OPTIONS+= alsa pulseaudio mozilla-jemalloc dbus 13PKG_SUGGESTED_OPTIONS+= alsa pulseaudio mozilla-jemalloc dbus
19.else 14.else
20PKG_SUGGESTED_OPTIONS+= dbus 15PKG_SUGGESTED_OPTIONS+= dbus
21.endif 16.endif
22 17
23.include "../../mk/bsd.options.mk" 18.include "../../mk/bsd.options.mk"
24 19
25.if !empty(PKG_OPTIONS:Malsa) 20.if !empty(PKG_OPTIONS:Malsa)
26CONFIGURE_ARGS+= --enable-alsa 21CONFIGURE_ARGS+= --enable-alsa
27.include "../../audio/alsa-lib/buildlink3.mk" 22.include "../../audio/alsa-lib/buildlink3.mk"
28.else 23.else
29CONFIGURE_ARGS+= --disable-alsa 24CONFIGURE_ARGS+= --disable-alsa
@@ -70,19 +65,13 @@ CONFIGURE_ARGS+= --disable-dbus @@ -70,19 +65,13 @@ CONFIGURE_ARGS+= --disable-dbus
70.endif 65.endif
71 66
72.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) 67.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
73CONFIGURE_ARGS+= --enable-official-branding 68CONFIGURE_ARGS+= --enable-official-branding
74PLIST.branding= yes 69PLIST.branding= yes
75LICENSE= mozilla-trademark-license 70LICENSE= mozilla-trademark-license
76RESTRICTED= Trademark holder prohibits distribution of modified versions. 71RESTRICTED= Trademark holder prohibits distribution of modified versions.
77NO_BIN_ON_CDROM= ${RESTRICTED} 72NO_BIN_ON_CDROM= ${RESTRICTED}
78NO_BIN_ON_FTP= ${RESTRICTED} 73NO_BIN_ON_FTP= ${RESTRICTED}
79.else 74.else
80CONFIGURE_ARGS+= --disable-official-branding 75CONFIGURE_ARGS+= --disable-official-branding
81PLIST.nobranding= yes 76PLIST.nobranding= yes
82.endif 77.endif
83 
84PLIST_VARS+= wayland 
85.if !empty(PKG_OPTIONS:Mwayland) 
86# \todo Instead of using an option, determine if gtk3 was built with wayland. 
87PLIST.wayland= yes 
88.endif 
cvs diff -r1.171 -r1.172 pkgsrc/www/firefox/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/mozilla-common.mk 2020/06/17 17:54:26 1.171
+++ pkgsrc/www/firefox/mozilla-common.mk 2020/06/29 11:53:09 1.172
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.171 2020/06/17 17:54:26 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.172 2020/06/29 11:53:09 nia Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6 6
7.include "../../mk/bsd.prefs.mk" 7.include "../../mk/bsd.prefs.mk"
8 8
9# Python 2.7 and Python 3.6 or later are required simultaneously. 9# Python 2.7 and Python 3.6 or later are required simultaneously.
10PYTHON_VERSIONS_ACCEPTED= 27 10PYTHON_VERSIONS_ACCEPTED= 27
11PYTHON_FOR_BUILD_ONLY= tool 11PYTHON_FOR_BUILD_ONLY= tool
12.if !empty(PYTHON_VERSION_DEFAULT:M3[6789]) 12.if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
13TOOL_DEPENDS+= python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT} 13TOOL_DEPENDS+= python${PYTHON_VERSION_DEFAULT}-[0-9]*:../../lang/python${PYTHON_VERSION_DEFAULT}
14ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./} 14ALL_ENV+= PYTHON3=${LOCALBASE}/bin/python${PYTHON_VERSION_DEFAULT:S/3/3./}
@@ -259,14 +259,18 @@ RUST_REQ= 1.41.0 @@ -259,14 +259,18 @@ RUST_REQ= 1.41.0
259.include "../../lang/rust/rust.mk" 259.include "../../lang/rust/rust.mk"
260# webrtc option requires internal libvpx 260# webrtc option requires internal libvpx
261#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0 261#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
262#.include "../../multimedia/libvpx/buildlink3.mk" 262#.include "../../multimedia/libvpx/buildlink3.mk"
263.include "../../net/libIDL/buildlink3.mk" 263.include "../../net/libIDL/buildlink3.mk"
264# textproc/hunspell 1.3 is too old 264# textproc/hunspell 1.3 is too old
265#.include "../../textproc/hunspell/buildlink3.mk" 265#.include "../../textproc/hunspell/buildlink3.mk"
266.include "../../multimedia/ffmpeg4/buildlink3.mk" 266.include "../../multimedia/ffmpeg4/buildlink3.mk"
267.include "../../x11/libXt/buildlink3.mk" 267.include "../../x11/libXt/buildlink3.mk"
268BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2 268BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
269.include "../../x11/pixman/buildlink3.mk" 269.include "../../x11/pixman/buildlink3.mk"
270.include "../../x11/gtk2/buildlink3.mk" 270.include "../../x11/gtk2/buildlink3.mk"
271.include "../../x11/gtk3/buildlink3.mk" 271.include "../../x11/gtk3/buildlink3.mk"
 272PLIST_VARS+= wayland
 273.if ${PKG_BUILD_OPTIONS.gtk3:Mx11}
 274PLIST.wayland= yes
 275.endif
272.include "../../lang/python/pyversion.mk" 276.include "../../lang/python/pyversion.mk"
cvs diff -r1.54 -r1.55 pkgsrc/www/firefox/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox/options.mk 2020/02/27 15:53:33 1.54
+++ pkgsrc/www/firefox/options.mk 2020/06/29 11:53:09 1.55
@@ -1,27 +1,22 @@ @@ -1,27 +1,22 @@
1# $NetBSD: options.mk,v 1.54 2020/02/27 15:53:33 nia Exp $ 1# $NetBSD: options.mk,v 1.55 2020/06/29 11:53:09 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4 4
5PKG_SUPPORTED_OPTIONS= official-mozilla-branding 5PKG_SUPPORTED_OPTIONS= official-mozilla-branding
6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc 6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
7PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus wayland 7PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus
8PLIST_VARS+= jemalloc debug 8PLIST_VARS+= jemalloc debug
9 9
10.include "../../devel/wayland/platform.mk" 
11.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes" 
12PKG_SUGGESTED_OPTIONS+= wayland 
13.endif 
14 
15.if ${OPSYS} == "Linux" 10.if ${OPSYS} == "Linux"
16PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc 11PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc
17.else 12.else
18PKG_SUGGESTED_OPTIONS+= dbus 13PKG_SUGGESTED_OPTIONS+= dbus
19.endif 14.endif
20 15
21.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) 16.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
22PKG_SUGGESTED_OPTIONS+= webrtc 17PKG_SUGGESTED_OPTIONS+= webrtc
23.endif 18.endif
24 19
25.include "../../mk/bsd.options.mk" 20.include "../../mk/bsd.options.mk"
26 21
27.if !empty(PKG_OPTIONS:Malsa) 22.if !empty(PKG_OPTIONS:Malsa)
@@ -82,19 +77,13 @@ NO_BIN_ON_FTP= ${RESTRICTED} @@ -82,19 +77,13 @@ NO_BIN_ON_FTP= ${RESTRICTED}
82#PLIST.branding= yes 77#PLIST.branding= yes
83.else 78.else
84#PLIST.nobranding= yes 79#PLIST.nobranding= yes
85.endif 80.endif
86 81
87PLIST_VARS+= webrtc 82PLIST_VARS+= webrtc
88.if !empty(PKG_OPTIONS:Mwebrtc) 83.if !empty(PKG_OPTIONS:Mwebrtc)
89.include "../../graphics/libv4l/buildlink3.mk" 84.include "../../graphics/libv4l/buildlink3.mk"
90CONFIGURE_ARGS+= --enable-webrtc 85CONFIGURE_ARGS+= --enable-webrtc
91PLIST.webrtc= yes 86PLIST.webrtc= yes
92.else 87.else
93CONFIGURE_ARGS+= --disable-webrtc 88CONFIGURE_ARGS+= --disable-webrtc
94.endif 89.endif
95 
96PLIST_VARS+= wayland 
97.if !empty(PKG_OPTIONS:Mwayland) 
98# \todo Instead of using an option, determine if gtk3 was built with wayland. 
99PLIST.wayland= yes 
100.endif 
cvs diff -r1.12 -r1.13 pkgsrc/www/firefox68/Attic/mozilla-common.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox68/Attic/mozilla-common.mk 2020/06/17 17:57:25 1.12
+++ pkgsrc/www/firefox68/Attic/mozilla-common.mk 2020/06/29 11:53:09 1.13
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: mozilla-common.mk,v 1.12 2020/06/17 17:57:25 nia Exp $ 1# $NetBSD: mozilla-common.mk,v 1.13 2020/06/29 11:53:09 nia Exp $
2# 2#
3# common Makefile fragment for mozilla packages based on gecko 2.0. 3# common Makefile fragment for mozilla packages based on gecko 2.0.
4# 4#
5# used by www/firefox/Makefile 5# used by www/firefox/Makefile
6 6
7GCC_REQD+= 6.1 7GCC_REQD+= 6.1
8 8
9.include "../../mk/bsd.prefs.mk" 9.include "../../mk/bsd.prefs.mk"
10 10
11# Python 2.7 and Python 3.6 or later are required simultaneously. 11# Python 2.7 and Python 3.6 or later are required simultaneously.
12PYTHON_VERSIONS_ACCEPTED= 27 12PYTHON_VERSIONS_ACCEPTED= 27
13PYTHON_FOR_BUILD_ONLY= tool 13PYTHON_FOR_BUILD_ONLY= tool
14.if !empty(PYTHON_VERSION_DEFAULT:M3[6789]) 14.if !empty(PYTHON_VERSION_DEFAULT:M3[6789])
@@ -225,14 +225,18 @@ RUST_REQ= 1.34.0 @@ -225,14 +225,18 @@ RUST_REQ= 1.34.0
225.include "../../lang/rust/rust.mk" 225.include "../../lang/rust/rust.mk"
226# webrtc option requires internal libvpx 226# webrtc option requires internal libvpx
227#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0 227#BUILDLINK_API_DEPENDS.libvpx+= libvpx>=1.3.0
228#.include "../../multimedia/libvpx/buildlink3.mk" 228#.include "../../multimedia/libvpx/buildlink3.mk"
229.include "../../net/libIDL/buildlink3.mk" 229.include "../../net/libIDL/buildlink3.mk"
230# textproc/hunspell 1.3 is too old 230# textproc/hunspell 1.3 is too old
231#.include "../../textproc/hunspell/buildlink3.mk" 231#.include "../../textproc/hunspell/buildlink3.mk"
232.include "../../multimedia/ffmpeg4/buildlink3.mk" 232.include "../../multimedia/ffmpeg4/buildlink3.mk"
233.include "../../x11/libXt/buildlink3.mk" 233.include "../../x11/libXt/buildlink3.mk"
234BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2 234BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
235.include "../../x11/pixman/buildlink3.mk" 235.include "../../x11/pixman/buildlink3.mk"
236.include "../../x11/gtk2/buildlink3.mk" 236.include "../../x11/gtk2/buildlink3.mk"
237.include "../../x11/gtk3/buildlink3.mk" 237.include "../../x11/gtk3/buildlink3.mk"
 238PLIST_VARS+= wayland
 239.if ${PKG_BUILD_OPTIONS.gtk3:Mx11}
 240PLIST.wayland= yes
 241.endif
238.include "../../lang/python/pyversion.mk" 242.include "../../lang/python/pyversion.mk"
cvs diff -r1.8 -r1.9 pkgsrc/www/firefox68/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/www/firefox68/Attic/options.mk 2020/03/12 19:39:35 1.8
+++ pkgsrc/www/firefox68/Attic/options.mk 2020/06/29 11:53:09 1.9
@@ -1,27 +1,22 @@ @@ -1,27 +1,22 @@
1# $NetBSD: options.mk,v 1.8 2020/03/12 19:39:35 nia Exp $ 1# $NetBSD: options.mk,v 1.9 2020/06/29 11:53:09 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox 3PKG_OPTIONS_VAR= PKG_OPTIONS.firefox
4 4
5PKG_SUPPORTED_OPTIONS= official-mozilla-branding 5PKG_SUPPORTED_OPTIONS= official-mozilla-branding
6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc 6PKG_SUPPORTED_OPTIONS+= debug debug-info mozilla-jemalloc webrtc
7PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus wayland 7PKG_SUPPORTED_OPTIONS+= alsa pulseaudio dbus
8PLIST_VARS+= jemalloc debug 8PLIST_VARS+= jemalloc debug
9 9
10.include "../../devel/wayland/platform.mk" 
11.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes" 
12PKG_SUGGESTED_OPTIONS+= wayland 
13.endif 
14 
15.if ${OPSYS} == "Linux" 10.if ${OPSYS} == "Linux"
16PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc 11PKG_SUGGESTED_OPTIONS+= pulseaudio mozilla-jemalloc dbus webrtc
17.else 12.else
18PKG_SUGGESTED_OPTIONS+= dbus 13PKG_SUGGESTED_OPTIONS+= dbus
19.endif 14.endif
20 15
21.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*) 16.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
22PKG_SUGGESTED_OPTIONS+= webrtc 17PKG_SUGGESTED_OPTIONS+= webrtc
23.endif 18.endif
24 19
25.include "../../mk/bsd.options.mk" 20.include "../../mk/bsd.options.mk"
26 21
27.if !empty(PKG_OPTIONS:Malsa) 22.if !empty(PKG_OPTIONS:Malsa)
@@ -92,19 +87,13 @@ NO_BIN_ON_FTP= ${RESTRICTED} @@ -92,19 +87,13 @@ NO_BIN_ON_FTP= ${RESTRICTED}
92PLIST.branding= yes 87PLIST.branding= yes
93.else 88.else
94PLIST.nobranding= yes 89PLIST.nobranding= yes
95.endif 90.endif
96 91
97PLIST_VARS+= webrtc 92PLIST_VARS+= webrtc
98.if !empty(PKG_OPTIONS:Mwebrtc) 93.if !empty(PKG_OPTIONS:Mwebrtc)
99.include "../../graphics/libv4l/buildlink3.mk" 94.include "../../graphics/libv4l/buildlink3.mk"
100CONFIGURE_ARGS+= --enable-webrtc 95CONFIGURE_ARGS+= --enable-webrtc
101PLIST.webrtc= yes 96PLIST.webrtc= yes
102.else 97.else
103CONFIGURE_ARGS+= --disable-webrtc 98CONFIGURE_ARGS+= --disable-webrtc
104.endif 99.endif
105 
106PLIST_VARS+= wayland 
107.if !empty(PKG_OPTIONS:Mwayland) 
108# \todo Instead of using an option, determine if gtk3 was built with wayland. 
109PLIST.wayland= yes 
110.endif