[pkgsrc/trunk]: pkgsrc/www/firefox Update to 57.0.2

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/www/firefox Update to 57.0.2
From: ryoon <ryoon%pkgsrc.org@localhost>
Date: Wed, 15 Jan 2020 08:24:28 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a4ee0b0647d
branches:  trunk
changeset: 372542:0a4ee0b0647d
user:      ryoon <ryoon%pkgsrc.org@localhost>
date:      Sun Dec 10 00:45:09 2017 +0000

description:
Update to 57.0.2

* Move gtk3 part to mozilla-common.mk
* Add a option for Widevine CDM support

Changelog:
For Windows only.

diffstat:

 www/firefox/Makefile                                                                      |   4 +-
 www/firefox/distinfo                                                                      |  14 +++++----
 www/firefox/mozilla-common.mk                                                             |   5 ++-
 www/firefox/options.mk                                                                    |  12 +++++---
 www/firefox/patches/patch-toolkit_modules_GMPUtils.jsm                                    |  14 ++++++++++
 www/firefox/patches/patch-toolkit_moz.configure                                           |  13 +++++++-
 www/firefox/patches/patch-toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js |  14 ++++++++++
 7 files changed, 60 insertions(+), 16 deletions(-)

diffs (168 lines):

diff -r 4312a96bcc40 -r 0a4ee0b0647d www/firefox/Makefile
--- a/www/firefox/Makefile      Sat Dec 09 22:39:28 2017 +0000
+++ b/www/firefox/Makefile      Sun Dec 10 00:45:09 2017 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.314 2017/12/04 15:17:55 ryoon Exp $
+# $NetBSD: Makefile,v 1.315 2017/12/10 00:45:09 ryoon Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            57.0
-MOZ_BRANCH_MINOR=      .1
+MOZ_BRANCH_MINOR=      .2
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
 PKGNAME=       firefox-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
diff -r 4312a96bcc40 -r 0a4ee0b0647d www/firefox/distinfo
--- a/www/firefox/distinfo      Sat Dec 09 22:39:28 2017 +0000
+++ b/www/firefox/distinfo      Sun Dec 10 00:45:09 2017 +0000
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.302 2017/12/04 15:17:55 ryoon Exp $
+$NetBSD: distinfo,v 1.303 2017/12/10 00:45:09 ryoon Exp $
 
-SHA1 (firefox-57.0.1.source.tar.xz) = 55931b5768520997b3fe4544d4e34ced1dcdba1f
-RMD160 (firefox-57.0.1.source.tar.xz) = 2e0ad1cdee4954f98abcfeb9bc28f263a291bddf
-SHA512 (firefox-57.0.1.source.tar.xz) = 8cbfe0ad2c0f935dbc3a0ac4e855c489c83bf8c4506815dbae6e27f5d6a262ecf19ac82b6e81d52782559834fa14403116ecbf3acc8e3bc56b6c319e68316edd
-Size (firefox-57.0.1.source.tar.xz) = 251048924 bytes
+SHA1 (firefox-57.0.2.source.tar.xz) = 2edcb2fade6cc4ed9339825bad1bdad381da7824
+RMD160 (firefox-57.0.2.source.tar.xz) = 798fad0cecceac45db490dd79fb25b0ecb1ec83b
+SHA512 (firefox-57.0.2.source.tar.xz) = e66402c182fae579dc645de1570a2eba4f95953f608de668da07a1ee4f371041cbdb3e01ce6e4708d8fa3b6b3ebe5b79e03e48ced3605f66cb09ac49abf3bbcd
+Size (firefox-57.0.2.source.tar.xz) = 248772480 bytes
 SHA1 (patch-aa) = a2b7c767773f462452701237b2b06c9a4f01d1b5
 SHA1 (patch-build_gyp.mozbuild) = bb3a2f8c1cad0e9cfdaefa721c5992cba2e2bf50
 SHA1 (patch-build_moz.configure_init.configure) = 5ec8da6b5aad7682a88b010a99e19f5d4403e6db
@@ -76,7 +76,9 @@
 SHA1 (patch-toolkit_components_terminator_nsTerminator.cpp) = 5b6d2e5c9f685d32894898d3ef3aec09a1a1e5ce
 SHA1 (patch-toolkit_crashreporter_google-breakpad_src_third_party_curl_curlbuild.h) = 0730c0c5d8e0865aa8a2f311b27559a3f6793a52
 SHA1 (patch-toolkit_library_moz.build) = 34e757ad08ebaee1cbc69993ec0f6774d41a14a2
-SHA1 (patch-toolkit_moz.configure) = 3dd9df2ac5c3f942b7f2616c2fae6bd36d3437e7
+SHA1 (patch-toolkit_modules_GMPUtils.jsm) = 85883d2064f7bb135913ee2019200a1caf48efe7
+SHA1 (patch-toolkit_moz.configure) = 264962a7bb3c25c2dd6f3d2bd41510a41cccbdc9
+SHA1 (patch-toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js) = 73dcf54a069b806807d9c9ddf54f66bc347c3c33
 SHA1 (patch-toolkit_xre_glxtest.cpp) = cf048491778610454b914400e53072afedd96e7b
 SHA1 (patch-toolkit_xre_nsEmbedFunctions.cpp) = 4a6ae13adfdfc63d50c1a53ee71aad1ee82e6131
 SHA1 (patch-xpcom_base_nscore.h) = d7c96eda884d7f370442749c43caba50da61bbe4
diff -r 4312a96bcc40 -r 0a4ee0b0647d www/firefox/mozilla-common.mk
--- a/www/firefox/mozilla-common.mk     Sat Dec 09 22:39:28 2017 +0000
+++ b/www/firefox/mozilla-common.mk     Sun Dec 10 00:45:09 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.101 2017/11/16 01:04:38 ryoon Exp $
+# $NetBSD: mozilla-common.mk,v 1.102 2017/12/10 00:45:09 ryoon Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -47,6 +47,7 @@
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/components/loop/run-all-loop-tests.sh
 CHECK_PORTABILITY_SKIP+=${MOZILLA_DIR}browser/extensions/loop/run-all-loop-tests.sh
 
+CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk3
 CONFIGURE_ARGS+=       --enable-pie
 CONFIGURE_ARGS+=       --disable-tests
 CONFIGURE_ARGS+=       --with-pthreads
@@ -202,3 +203,5 @@
 .include "../../x11/libXt/buildlink3.mk"
 BUILDLINK_API_DEPENDS.pixman+= pixman>=0.25.2
 .include "../../x11/pixman/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../x11/gtk3/buildlink3.mk"
diff -r 4312a96bcc40 -r 0a4ee0b0647d www/firefox/options.mk
--- a/www/firefox/options.mk    Sat Dec 09 22:39:28 2017 +0000
+++ b/www/firefox/options.mk    Sun Dec 10 00:45:09 2017 +0000
@@ -1,10 +1,11 @@
-# $NetBSD: options.mk,v 1.43 2017/10/17 03:39:04 ryoon Exp $
+# $NetBSD: options.mk,v 1.44 2017/12/10 00:45:09 ryoon 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+=        widevinecdm
 PLIST_VARS+=           gnome jemalloc debug
 
 .if ${OPSYS} == "Linux"
@@ -17,10 +18,6 @@
 
 .include "../../mk/bsd.options.mk"
 
-CONFIGURE_ARGS+=       --enable-default-toolkit=cairo-gtk3
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../x11/gtk3/buildlink3.mk"
-
 .if !empty(PKG_OPTIONS:Malsa)
 CONFIGURE_ARGS+=       --enable-alsa
 .include "../../audio/alsa-lib/buildlink3.mk"
@@ -103,3 +100,8 @@
 .else
 CONFIGURE_ARGS+=       --disable-webrtc
 .endif
+
+# Enable Google widevine CDM. This requires external libwidevinecdm.so.
+.if !empty(PKG_OPTIONS:Mwidevinecdm)
+CONFIGURE_ARGS+=       --enable-eme=widevine
+.endif
diff -r 4312a96bcc40 -r 0a4ee0b0647d www/firefox/patches/patch-toolkit_modules_GMPUtils.jsm
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-toolkit_modules_GMPUtils.jsm    Sun Dec 10 00:45:09 2017 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-toolkit_modules_GMPUtils.jsm,v 1.5 2017/12/10 00:45:09 ryoon Exp $
+
+--- toolkit/modules/GMPUtils.jsm.orig  2017-09-14 20:16:01.000000000 +0000
++++ toolkit/modules/GMPUtils.jsm
+@@ -74,7 +74,8 @@ this.GMPUtils = {
+       // Mac OSX, and Linux.
+       return AppConstants.isPlatformAndVersionAtLeast("win", "6") ||
+              AppConstants.platform == "macosx" ||
+-             AppConstants.platform == "linux";
++             AppConstants.platform == "linux" ||
++             AppConstants.platform == "netbsd";
+     }
+ 
+     return true;
diff -r 4312a96bcc40 -r 0a4ee0b0647d www/firefox/patches/patch-toolkit_moz.configure
--- a/www/firefox/patches/patch-toolkit_moz.configure   Sat Dec 09 22:39:28 2017 +0000
+++ b/www/firefox/patches/patch-toolkit_moz.configure   Sun Dec 10 00:45:09 2017 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-toolkit_moz.configure,v 1.7 2017/11/16 01:04:38 ryoon Exp $
+$NetBSD: patch-toolkit_moz.configure,v 1.8 2017/12/10 00:45:09 ryoon Exp $
 
 * skia part: support bigendian architectures
 
---- toolkit/moz.configure.orig 2017-09-15 04:15:40.000000000 +0000
+--- toolkit/moz.configure.orig 2017-11-02 16:16:34.000000000 +0000
 +++ toolkit/moz.configure
 @@ -317,6 +317,26 @@ def freetype2_combined_info(fontconfig_i
  add_old_configure_assignment('_HAVE_FREETYPE2',
@@ -31,6 +31,15 @@
  # Apple platform decoder support
  # ==============================================================
  @depends(toolkit)
+@@ -418,7 +438,7 @@ option('--enable-eme',
+ def enable_eme(value, target):
+     # Widevine EME by default enabled on desktop Windows, MacOS and Linux,
+     # x86 and x64 builds.
+-    if (target.kernel in ('Darwin', 'WINNT', 'Linux') and
++    if (target.kernel in ('Darwin', 'WINNT', 'Linux', 'NetBSD') and
+         target.os not in ('Android', 'iOS') and
+         target.cpu in ('x86', 'x86_64')):
+         return value
 @@ -940,11 +960,11 @@ include('nss.configure')
  # ==============================================================
  option('--disable-skia', help='Disable use of Skia')
diff -r 4312a96bcc40 -r 0a4ee0b0647d www/firefox/patches/patch-toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/www/firefox/patches/patch-toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js Sun Dec 10 00:45:09 2017 +0000
@@ -0,0 +1,14 @@
+$NetBSD: patch-toolkit_mozapps_extensions_test_browser_browser__gmpProvider.js,v 1.3 2017/12/10 00:45:09 ryoon Exp $
+
+--- toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js.orig        2017-09-14 20:16:02.000000000 +0000
++++ toolkit/mozapps/extensions/test/browser/browser_gmpProvider.js
+@@ -371,7 +371,8 @@ add_task(async function testEmeSupport()
+     } else if (addon.id == GMPScope.WIDEVINE_ID) {
+       if (AppConstants.isPlatformAndVersionAtLeast("win", "6") ||
+           AppConstants.platform == "macosx" ||
+-          AppConstants.platform == "linux") {
++          AppConstants.platform == "linux" ||
++          AppConstants.platform == "netbsd") {
+         Assert.ok(item, "Widevine supported, found add-on element.");
+       } else {
+         Assert.ok(!item,
Prev by Date: [pkgsrc/trunk]: pkgsrc/pkgtools/pkg_comp Fix typo in reference to pkgbuild-user.
Next by Date: [pkgsrc/trunk]: pkgsrc/textproc/ruby-nokogiri Actually take maintainership (m...
Previous by Thread: [pkgsrc/trunk]: pkgsrc/pkgtools/pkg_comp Fix typo in reference to pkgbuild-user.
Next by Thread: [pkgsrc/trunk]: pkgsrc/textproc/ruby-nokogiri Actually take maintainership (m...
Indexes:
Home | Main Index | Thread Index | Old Index