Index: branches/2018Q2/www/firefox/Makefile =================================================================== --- branches/2018Q2/www/firefox/Makefile (revision 466272) +++ branches/2018Q2/www/firefox/Makefile (revision 466273) @@ -1,70 +1,70 @@ # Created by: Alan Eldridge # $FreeBSD$ PORTNAME= firefox DISTVERSION= 59.0.2 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= https://hg.mozilla.org/releases/mozilla-release/archive/ DISTNAME= ${MASTER_SITES:M*hg*:S,/archive/,,:T}-239e434d6d2b8e1e2b697c3416d1e96d48fe98e5 DISTFILES= ${DISTNAME:C/.*-//}${EXTRACT_SUFX} DIST_SUBDIR= firefox MAINTAINER= gecko@FreeBSD.org COMMENT= Web browser based on the browser portion of Mozilla BUILD_DEPENDS= nspr>=4.18:devel/nspr \ nss>=3.35:security/nss \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=1.7.4:print/harfbuzz \ graphite2>=1.3.10:graphics/graphite2 \ png>=1.6.34:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.21.0:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip # soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l USE_GECKO= gecko CONFLICTS_INSTALL= firefox-esr MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -cairo -soundtouch USE_GL= gl USES= tar:bz2 FIREFOX_ICON= ${MOZILLA}.png FIREFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default48.png FIREFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/${MOZILLA}-snap/${MOZILLA}.desktop MOZ_OPTIONS= --enable-application=browser \ --enable-official-branding OPTIONS_EXCLUDE= BUNDLED_CAIRO .include "${.CURDIR}/../../www/firefox/Makefile.options" post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e '/^Icon/s/=.*/=${FIREFOX_ICON:R}/' \ ${FIREFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${FIREFOX_DESKTOP} ${STAGEDIR}${PREFIX}/share/applications/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${FIREFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${FIREFOX_ICON} .include Index: branches/2018Q2/www/firefox/files/patch-bug1411481 =================================================================== --- branches/2018Q2/www/firefox/files/patch-bug1411481 (nonexistent) +++ branches/2018Q2/www/firefox/files/patch-bug1411481 (revision 466273) @@ -0,0 +1,85 @@ +commit 57a55d1c2d33 +Author: sotaro +Date: Wed Mar 21 08:59:38 2018 +0900 + + Bug 1411481- Enable SkiaGL canvas usage on Mac r=jrmuizel +--- + dom/canvas/CanvasRenderingContext2D.cpp | 3 ++- + gfx/thebes/gfxPlatform.cpp | 3 ++- + gfx/thebes/gfxPlatform.h | 2 +- + gfx/thebes/gfxWindowsPlatform.cpp | 7 +++++++ + gfx/thebes/gfxWindowsPlatform.h | 2 ++ + 5 files changed, 14 insertions(+), 3 deletions(-) + +diff --git dom/canvas/CanvasRenderingContext2D.cpp dom/canvas/CanvasRenderingContext2D.cpp +index ef3f868bdbf7..8666564b4d0c 100644 +--- dom/canvas/CanvasRenderingContext2D.cpp ++++ dom/canvas/CanvasRenderingContext2D.cpp +@@ -1438,7 +1438,8 @@ CanvasRenderingContext2D::AllowOpenGLCanvas() const + // HTMLCanvasElement::GetCompositorBackendType would return LAYERS_NONE + // as well, so it wouldn't help much. + +- return (mCompositorBackend == LayersBackend::LAYERS_OPENGL) && ++ return (mCompositorBackend == LayersBackend::LAYERS_OPENGL || ++ mCompositorBackend == LayersBackend::LAYERS_WR) && + gfxPlatform::GetPlatform()->AllowOpenGLCanvas(); + } + +diff --git gfx/thebes/gfxPlatform.cpp gfx/thebes/gfxPlatform.cpp +index b9beea68d8c5..82635f9ab3ce 100644 +--- gfx/thebes/gfxPlatform.cpp ++++ gfx/thebes/gfxPlatform.cpp +@@ -1386,7 +1386,8 @@ bool gfxPlatform::AllowOpenGLCanvas() + // so we let content process always assume correct compositor backend. + // The callers have to do the right thing. + bool correctBackend = !XRE_IsParentProcess() || +- ((mCompositorBackend == LayersBackend::LAYERS_OPENGL) && ++ ((mCompositorBackend == LayersBackend::LAYERS_OPENGL || ++ mCompositorBackend == LayersBackend::LAYERS_WR) && + (GetContentBackendFor(mCompositorBackend) == BackendType::SKIA)); + + if (gfxPrefs::CanvasAzureAccelerated() && correctBackend) { +diff --git gfx/thebes/gfxPlatform.h gfx/thebes/gfxPlatform.h +index c988eb1168a8..3bbf2b763f26 100644 +--- gfx/thebes/gfxPlatform.h ++++ gfx/thebes/gfxPlatform.h +@@ -286,7 +286,7 @@ public: + /// asking for it, we will examine the commands in the first few seconds + /// of the canvas usage, and potentially change to accelerated or + /// non-accelerated canvas. +- bool AllowOpenGLCanvas(); ++ virtual bool AllowOpenGLCanvas(); + virtual void InitializeSkiaCacheLimits(); + + static bool AsyncPanZoomEnabled(); +diff --git gfx/thebes/gfxWindowsPlatform.cpp gfx/thebes/gfxWindowsPlatform.cpp +index 9ba6f40c6cc0..4d65791d075f 100644 +--- gfx/thebes/gfxWindowsPlatform.cpp ++++ gfx/thebes/gfxWindowsPlatform.cpp +@@ -509,6 +509,13 @@ gfxWindowsPlatform::UpdateRenderMode() + } + } + ++bool ++gfxWindowsPlatform::AllowOpenGLCanvas() ++{ ++ // OpenGL canvas is not supported on windows ++ return false; ++} ++ + mozilla::gfx::BackendType + gfxWindowsPlatform::GetContentBackendFor(mozilla::layers::LayersBackend aLayers) + { +diff --git gfx/thebes/gfxWindowsPlatform.h gfx/thebes/gfxWindowsPlatform.h +index 47048de8f5f5..47ec0e9e5547 100644 +--- gfx/thebes/gfxWindowsPlatform.h ++++ gfx/thebes/gfxWindowsPlatform.h +@@ -174,6 +174,8 @@ public: + void SchedulePaintIfDeviceReset() override; + void CheckForContentOnlyDeviceReset(); + ++ bool AllowOpenGLCanvas() override; ++ + mozilla::gfx::BackendType GetContentBackendFor(mozilla::layers::LayersBackend aLayers) override; + + mozilla::gfx::BackendType GetPreferredCanvasBackend() override; Property changes on: branches/2018Q2/www/firefox/files/patch-bug1411481 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q2/www/firefox/files/patch-bug1447519 =================================================================== --- branches/2018Q2/www/firefox/files/patch-bug1447519 (nonexistent) +++ branches/2018Q2/www/firefox/files/patch-bug1447519 (revision 466273) @@ -0,0 +1,22 @@ +Enable SkiaGL by default on OpenGL compositing platforms + +diff --git modules/libpref/init/all.js modules/libpref/init/all.js +index 93e56b00a961..61a2174c3384 100644 +--- modules/libpref/init/all.js ++++ modules/libpref/init/all.js +@@ -882,15 +882,9 @@ pref("gfx.font_rendering.opentype_svg.enabled", true); + pref("gfx.canvas.azure.backends", "direct2d1.1,skia,cairo"); + pref("gfx.content.azure.backends", "direct2d1.1,skia,cairo"); + #else +-#ifdef XP_MACOSX + pref("gfx.content.azure.backends", "skia"); + pref("gfx.canvas.azure.backends", "skia"); +-// Accelerated cg canvas where available (10.7+) + pref("gfx.canvas.azure.accelerated", true); +-#else +-pref("gfx.canvas.azure.backends", "skia"); +-pref("gfx.content.azure.backends", "skia"); +-#endif + #endif + + pref("gfx.canvas.skiagl.dynamic-cache", true); Property changes on: branches/2018Q2/www/firefox/files/patch-bug1447519 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q2/www/waterfox/Makefile =================================================================== --- branches/2018Q2/www/waterfox/Makefile (revision 466272) +++ branches/2018Q2/www/waterfox/Makefile (revision 466273) @@ -1,74 +1,74 @@ # $FreeBSD$ PORTNAME= waterfox DISTVERSION= 56.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= www ipv6 MAINTAINER= jbeich@FreeBSD.org COMMENT= Distilled fork of Firefox DEPRECATED= Temporary experiment EXPIRATION_DATE=2018-05-16 BUILD_DEPENDS= nspr>=4.16:devel/nspr \ nss>=3.32.1:security/nss \ icu>=59.1,1:devel/icu \ libevent>=2.1.8:devel/libevent \ harfbuzz>=1.4.7:print/harfbuzz \ graphite2>=1.3.10:graphics/graphite2 \ png>=1.6.31:graphics/png \ libvorbis>=1.3.5,3:audio/libvorbis \ libvpx>=1.5.0:multimedia/libvpx \ sqlite3>=3.19.3:databases/sqlite3 \ ${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR} \ v4l_compat>0:multimedia/v4l_compat \ autoconf-2.13:devel/autoconf213 \ yasm:devel/yasm \ zip:archivers/zip # soundtouch>=1.9.0:audio/soundtouch \ LIB_DEPENDS= libv4l2.so:multimedia/libv4l USE_GITHUB= yes GH_ACCOUNT= MrAlex94 GH_PROJECT= Waterfox USE_GECKO= gecko MOZ_PKGCONFIG_FILES= # empty USE_MOZILLA= -soundtouch MOZILLA_NAME= Waterfox USE_GL= gl WATERFOX_ICON= ${MOZILLA}.png WATERFOX_ICON_SRC= ${PREFIX}/lib/${MOZILLA}/browser/chrome/icons/default/default256.png WATERFOX_DESKTOP= ${MOZSRC}/taskcluster/docker/firefox-snap/firefox.desktop MOZ_OPTIONS= --enable-application=browser \ --with-app-name=${MOZILLA} \ --with-app-basename=${MOZILLA_NAME} \ --with-distribution-id=org.${MOZILLA}project OPTIONS_DEFAULT= BUNDLED_CAIRO .include "${.CURDIR}/../../www/firefox/Makefile.options" post-patch: @${REINPLACE_CMD} -e 's/%u/%U/' -e '/X-MultipleArgs/d' \ -e 's/firefox/${MOZILLA}/' \ -e 's/Firefox/${MOZILLA_NAME}/' \ ${WATERFOX_DESKTOP} @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/browser/app/nsBrowserApp.cpp pre-configure: (cd ${WRKSRC} && ${LOCALBASE}/bin/autoconf-2.13) (cd ${WRKSRC}/js/src/ && ${LOCALBASE}/bin/autoconf-2.13) post-install: ${INSTALL_DATA} ${WATERFOX_DESKTOP} \ ${STAGEDIR}${PREFIX}/share/applications/${MOZILLA}.desktop ${MKDIR} ${STAGEDIR}${PREFIX}/share/pixmaps ${LN} -sf ${WATERFOX_ICON_SRC} ${STAGEDIR}${PREFIX}/share/pixmaps/${WATERFOX_ICON} .include Index: branches/2018Q2/www/waterfox/files/patch-bug1447519 =================================================================== --- branches/2018Q2/www/waterfox/files/patch-bug1447519 (nonexistent) +++ branches/2018Q2/www/waterfox/files/patch-bug1447519 (revision 466273) @@ -0,0 +1,22 @@ +Enable SkiaGL by default on OpenGL compositing platforms + +diff --git modules/libpref/init/all.js modules/libpref/init/all.js +index 93e56b00a961..61a2174c3384 100644 +--- modules/libpref/init/all.js ++++ modules/libpref/init/all.js +@@ -882,15 +882,9 @@ pref("gfx.font_rendering.opentype_svg.enabled", true); + pref("gfx.canvas.azure.backends", "direct2d1.1,skia,cairo"); + pref("gfx.content.azure.backends", "direct2d1.1,skia,cairo"); + #else +-#ifdef XP_MACOSX + pref("gfx.content.azure.backends", "skia"); + pref("gfx.canvas.azure.backends", "skia"); +-// Accelerated cg canvas where available (10.7+) + pref("gfx.canvas.azure.accelerated", true); +-#else +-pref("gfx.canvas.azure.backends", "skia"); +-pref("gfx.content.azure.backends", "skia"); +-#endif + #endif + + pref("gfx.canvas.skiagl.dynamic-cache", true); Property changes on: branches/2018Q2/www/waterfox/files/patch-bug1447519 ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: branches/2018Q2 =================================================================== --- branches/2018Q2 (revision 466272) +++ branches/2018Q2 (revision 466273) Property changes on: branches/2018Q2 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r466270