[pkgsrc/trunk]: pkgsrc *: Enable Wayland where supported in GTK and Firefox.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc *: Enable Wayland where supported in GTK and Firefox.
From: nia <nia%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 12:43:35 +0000

details:   https://anonhg.NetBSD.org/pkgsrc/rev/60c8e2370d09
branches:  trunk
changeset: 407466:60c8e2370d09
user:      nia <nia%pkgsrc.org@localhost>
date:      Sun Jan 05 17:55:21 2020 +0000

description:
*: Enable Wayland where supported in GTK and Firefox.

Bump PKGREVISIONs

diffstat:

 www/firefox/Makefile      |   3 ++-
 www/firefox/PLIST         |   3 ++-
 www/firefox/options.mk    |  15 +++++++++++++--
 www/firefox68/Makefile    |   3 ++-
 www/firefox68/options.mk  |  10 +++++++---
 www/webkit-gtk/Makefile   |   4 ++--
 www/webkit-gtk/options.mk |   8 ++++++--
 x11/gtk3/Makefile         |   3 ++-
 x11/gtk3/options.mk       |   6 +++++-
 9 files changed, 41 insertions(+), 14 deletions(-)

diffs (178 lines):

diff -r cf1e762dd32a -r 60c8e2370d09 www/firefox/Makefile
--- a/www/firefox/Makefile      Sun Jan 05 17:53:58 2020 +0000
+++ b/www/firefox/Makefile      Sun Jan 05 17:55:21 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.403 2019/12/03 14:21:20 ryoon Exp $
+# $NetBSD: Makefile,v 1.404 2020/01/05 17:55:22 nia Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            71.0
@@ -6,6 +6,7 @@
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz
diff -r cf1e762dd32a -r 60c8e2370d09 www/firefox/PLIST
--- a/www/firefox/PLIST Sun Jan 05 17:53:58 2020 +0000
+++ b/www/firefox/PLIST Sun Jan 05 17:55:21 2020 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.149 2019/12/03 14:21:20 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.150 2020/01/05 17:55:22 nia Exp $
 bin/firefox
 lib/firefox/actors/AudioPlaybackChild.jsm
 lib/firefox/actors/AudioPlaybackParent.jsm
@@ -5106,6 +5106,7 @@
 ${PLIST.ffvpx}lib/firefox/libmozavutil.so
 lib/firefox/libmozgtk.so
 lib/firefox/libmozsqlite3.so
+${PLIST.wayland}lib/firefox68/libmozwayland.so
 lib/firefox/libxul.so
 lib/firefox/localization/en-US/crashreporter/aboutcrashes.ftl
 lib/firefox/localization/en-US/security/certificates/certManager.ftl
diff -r cf1e762dd32a -r 60c8e2370d09 www/firefox/options.mk
--- a/www/firefox/options.mk    Sun Jan 05 17:53:58 2020 +0000
+++ b/www/firefox/options.mk    Sun Jan 05 17:55:21 2020 +0000
@@ -1,12 +1,17 @@
-# $NetBSD: options.mk,v 1.51 2019/12/03 14:21:20 ryoon Exp $
+# $NetBSD: options.mk,v 1.52 2020/01/05 17:55:22 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
 PKG_SUPPORTED_OPTIONS= official-mozilla-branding
 PKG_SUPPORTED_OPTIONS+=        debug debug-info mozilla-jemalloc webrtc
-PKG_SUPPORTED_OPTIONS+=        alsa pulseaudio dbus
+PKG_SUPPORTED_OPTIONS+=        alsa pulseaudio dbus wayland
 PLIST_VARS+=           gnome jemalloc debug
 
+.include "../../devel/wayland/platform.mk"
+.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
+PKG_SUGGESTED_OPTIONS+= wayland
+.endif
+
 .if ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=        pulseaudio mozilla-jemalloc dbus
 .else
@@ -85,3 +90,9 @@
 .else
 CONFIGURE_ARGS+=       --disable-webrtc
 .endif
+
+PLIST_VARS+=           wayland
+.if !empty(PKG_OPTIONS:Mwayland)
+# \todo Instead of using an option, determine if gtk3 was built with wayland.
+PLIST.wayland=         yes
+.endif
diff -r cf1e762dd32a -r 60c8e2370d09 www/firefox68/Makefile
--- a/www/firefox68/Makefile    Sun Jan 05 17:53:58 2020 +0000
+++ b/www/firefox68/Makefile    Sun Jan 05 17:55:21 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2019/12/08 20:09:41 nia Exp $
+# $NetBSD: Makefile,v 1.6 2020/01/05 17:55:22 nia Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            68.3
@@ -6,6 +6,7 @@
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       ${DISTNAME:S/.source//:S/b/beta/:S/esr//:S/firefox-/firefox68-/}
+PKGREVISION=   1
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz
diff -r cf1e762dd32a -r 60c8e2370d09 www/firefox68/options.mk
--- a/www/firefox68/options.mk  Sun Jan 05 17:53:58 2020 +0000
+++ b/www/firefox68/options.mk  Sun Jan 05 17:55:21 2020 +0000
@@ -1,13 +1,17 @@
-# $NetBSD: options.mk,v 1.4 2019/12/22 16:07:48 nia Exp $
+# $NetBSD: options.mk,v 1.5 2020/01/05 17:55:22 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.firefox
 
 PKG_SUPPORTED_OPTIONS= official-mozilla-branding
 PKG_SUPPORTED_OPTIONS+=        debug debug-info mozilla-jemalloc webrtc
-PKG_SUPPORTED_OPTIONS+=        alsa oss pulseaudio dbus
-PKG_SUPPORTED_OPTIONS+=        wayland
+PKG_SUPPORTED_OPTIONS+=        alsa oss pulseaudio dbus wayland
 PLIST_VARS+=           gnome jemalloc debug
 
+.include "../../devel/wayland/platform.mk"
+.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
+PKG_SUGGESTED_OPTIONS+= wayland
+.endif
+
 .if ${OPSYS} == "Linux"
 PKG_SUGGESTED_OPTIONS+=        pulseaudio mozilla-jemalloc dbus
 .else
diff -r cf1e762dd32a -r 60c8e2370d09 www/webkit-gtk/Makefile
--- a/www/webkit-gtk/Makefile   Sun Jan 05 17:53:58 2020 +0000
+++ b/www/webkit-gtk/Makefile   Sun Jan 05 17:55:21 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.176 2019/12/15 15:38:59 taca Exp $
+# $NetBSD: Makefile,v 1.177 2020/01/05 17:55:21 nia Exp $
 
 DISTNAME=      webkitgtk-2.26.2
 PKGNAME=       ${DISTNAME:S/webkitgtk/webkit-gtk/}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    www
 MASTER_SITES=  https://www.webkitgtk.org/releases/
 EXTRACT_SUFX=  .tar.xz
diff -r cf1e762dd32a -r 60c8e2370d09 www/webkit-gtk/options.mk
--- a/www/webkit-gtk/options.mk Sun Jan 05 17:53:58 2020 +0000
+++ b/www/webkit-gtk/options.mk Sun Jan 05 17:55:21 2020 +0000
@@ -1,13 +1,17 @@
-# $NetBSD: options.mk,v 1.19 2019/10/05 14:59:47 nia Exp $
+# $NetBSD: options.mk,v 1.20 2020/01/05 17:55:21 nia Exp $
 #
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.webkit-gtk
 PKG_SUPPORTED_OPTIONS= debug enchant introspection opengl webkit-jit wayland
 PKG_SUGGESTED_OPTIONS= enchant introspection opengl
+.include "../../devel/wayland/platform.mk"
+.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
+PKG_SUGGESTED_OPTIONS+=        wayland
+.endif
 
 PLIST_VARS=    introspection
 
-.include "../../mk/bsd.prefs.mk"
+.include "../../mk/bsd.fast.prefs.mk"
 
 #
 # Platforms that support the webkit-jit option
diff -r cf1e762dd32a -r 60c8e2370d09 x11/gtk3/Makefile
--- a/x11/gtk3/Makefile Sun Jan 05 17:53:58 2020 +0000
+++ b/x11/gtk3/Makefile Sun Jan 05 17:55:21 2020 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.138 2019/12/31 12:21:00 wiz Exp $
+# $NetBSD: Makefile,v 1.139 2020/01/05 17:55:22 nia Exp $
 
 DISTNAME=      gtk+-3.24.13
 PKGNAME=       ${DISTNAME:S/gtk/gtk3/}
+PKGREVISION=   1
 CATEGORIES=    x11 gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/gtk+/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz
diff -r cf1e762dd32a -r 60c8e2370d09 x11/gtk3/options.mk
--- a/x11/gtk3/options.mk       Sun Jan 05 17:53:58 2020 +0000
+++ b/x11/gtk3/options.mk       Sun Jan 05 17:55:21 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.15 2019/08/20 13:55:05 wiz Exp $
+# $NetBSD: options.mk,v 1.16 2020/01/05 17:55:22 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.gtk3
 PKG_SUPPORTED_OPTIONS+=        gtk3-atk-bridge cups debug
@@ -6,6 +6,10 @@
 .if exists(/System/Library/Frameworks/Quartz.framework)
 PKG_SUPPORTED_OPTIONS+=        quartz
 .endif
+.include "../../devel/wayland/platform.mk"
+.if ${PLATFORM_SUPPORTS_WAYLAND} == "yes"
+PKG_SUGGESTED_OPTIONS+=        wayland
+.endif
 PKG_SUGGESTED_OPTIONS= gtk3-atk-bridge x11
 
 .include "../../mk/bsd.options.mk"

Prev by Date: [pkgsrc/trunk]: pkgsrc/devel/py-Deprecated devel/py-Deprecated: Import versio...
Next by Date: [pkgsrc/trunk]: pkgsrc/www firefox[68]: Enable WebRTC by default on NetBSD 9+.
Previous by Thread: [pkgsrc/trunk]: pkgsrc/devel/py-Deprecated devel/py-Deprecated: Import versio...
Next by Thread: [pkgsrc/trunk]: pkgsrc/www firefox[68]: Enable WebRTC by default on NetBSD 9+.
Indexes:

Home | Main Index | Thread Index | Old Index