Date: Wed, 27 May 2020 20:03:54 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r536713 - in head/www/firefox: . files Message-ID: <202005272003.04RK3sIB022684@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Wed May 27 20:03:54 2020 New Revision: 536713 URL: https://svnweb.freebsd.org/changeset/ports/536713 Log: www/firefox: switch to rc2 - Backport some Wayland fixes Changes: https://hg.mozilla.org/releases/mozilla-release/pushloghtml?startdate=2020-05-26&enddate=2020-05-28 Added: head/www/firefox/files/patch-bug1632456 (contents, props changed) head/www/firefox/files/patch-bug1636072 (contents, props changed) head/www/firefox/files/patch-bug1638010 (contents, props changed) Modified: head/www/firefox/Makefile (contents, props changed) head/www/firefox/distinfo (contents, props changed) Modified: head/www/firefox/Makefile ============================================================================== --- head/www/firefox/Makefile Wed May 27 20:03:43 2020 (r536712) +++ head/www/firefox/Makefile Wed May 27 20:03:54 2020 (r536713) @@ -3,10 +3,11 @@ PORTNAME= firefox DISTVERSION= 77.0 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \ - MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source + MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source DISTFILES= ${DISTNAME}.source${EXTRACT_SUFX} MAINTAINER= gecko@FreeBSD.org Modified: head/www/firefox/distinfo ============================================================================== --- head/www/firefox/distinfo Wed May 27 20:03:43 2020 (r536712) +++ head/www/firefox/distinfo Wed May 27 20:03:54 2020 (r536713) @@ -1,3 +1,3 @@ -TIMESTAMP = 1590430077 -SHA256 (firefox-77.0.source.tar.xz) = df8fc50fa360b10de8076aa5409d6d97f361669d802e90d51651836d1d9ec348 -SIZE (firefox-77.0.source.tar.xz) = 332501524 +TIMESTAMP = 1590598572 +SHA256 (firefox-77.0.source.tar.xz) = d1f3ddc41b1d89150cfcb1528db7054506ebbedb5edd4c8916525b4718056efc +SIZE (firefox-77.0.source.tar.xz) = 329059200 Added: head/www/firefox/files/patch-bug1632456 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug1632456 Wed May 27 20:03:54 2020 (r536713) @@ -0,0 +1,40 @@ +commit 0aaf67da2681 +Author: Martin Stransky <stransky@redhat.com> +Date: Wed May 27 08:37:58 2020 +0000 + + Bug 1632456 [Wayland] Release mVAAPIDeviceContext when FFmpegVideoDecoder::CreateVAAPIDeviceContext() fails, r=jya + + Differential Revision: https://phabricator.services.mozilla.com/D76745 +--- + dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +index 889d1d1ed5b97..1bd144d7375f4 100644 +--- dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp ++++ dom/media/platforms/ffmpeg/FFmpegVideoDecoder.cpp +@@ -175,6 +175,10 @@ bool FFmpegVideoDecoder<LIBAV_VER>::CreateVAAPIDeviceContext() { + if (!mVAAPIDeviceContext) { + return false; + } ++ ++ auto releaseVAAPIcontext = ++ MakeScopeExit([&] { mLib->av_buffer_unref(&mVAAPIDeviceContext); }); ++ + AVHWDeviceContext* hwctx = (AVHWDeviceContext*)mVAAPIDeviceContext->data; + AVVAAPIDeviceContext* vactx = (AVVAAPIDeviceContext*)hwctx->hwctx; + +@@ -195,12 +199,12 @@ bool FFmpegVideoDecoder<LIBAV_VER>::CreateVAAPIDeviceContext() { + } + + vactx->display = mDisplay; +- + if (mLib->av_hwdevice_ctx_init(mVAAPIDeviceContext) < 0) { + return false; + } + + mCodecContext->hw_device_ctx = mLib->av_buffer_ref(mVAAPIDeviceContext); ++ releaseVAAPIcontext.release(); + return true; + } + Added: head/www/firefox/files/patch-bug1636072 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug1636072 Wed May 27 20:03:54 2020 (r536713) @@ -0,0 +1,33 @@ +commit edbe69232a5b +Author: Martin Stransky <stransky@redhat.com> +Date: Tue May 12 09:20:25 2020 +0000 + + Bug 1636072 [Wayland] Don't crash when GetWlBuffer() fails, r=jhorak + + Differential Revision: https://phabricator.services.mozilla.com/D74663 +--- + widget/gtk/WindowSurfaceWayland.cpp | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git widget/gtk/WindowSurfaceWayland.cpp widget/gtk/WindowSurfaceWayland.cpp +index 372158c9f0f33..56f5d3d530853 100644 +--- widget/gtk/WindowSurfaceWayland.cpp ++++ widget/gtk/WindowSurfaceWayland.cpp +@@ -390,10 +390,13 @@ void WindowBackBuffer::Attach(wl_surface* aSurface) { + (void*)GetWlBuffer(), + GetWlBuffer() ? wl_proxy_get_id((struct wl_proxy*)GetWlBuffer()) : -1)); + +- wl_surface_attach(aSurface, GetWlBuffer(), 0, 0); +- wl_surface_commit(aSurface); +- wl_display_flush(WaylandDisplayGetWLDisplay()); +- SetAttached(); ++ wl_buffer* buffer = GetWlBuffer(); ++ if (buffer) { ++ wl_surface_attach(aSurface, buffer, 0, 0); ++ wl_surface_commit(aSurface); ++ wl_display_flush(WaylandDisplayGetWLDisplay()); ++ SetAttached(); ++ } + } + + void WindowBackBufferShm::Detach(wl_buffer* aBuffer) { Added: head/www/firefox/files/patch-bug1638010 ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/www/firefox/files/patch-bug1638010 Wed May 27 20:03:54 2020 (r536713) @@ -0,0 +1,25 @@ +commit 9a89dccd2a85 +Author: Martin Stransky <stransky@redhat.com> +Date: Fri May 15 07:52:39 2020 +0000 + + Bug 1638010 [Wayland] Make WaylandDMABUFTextureData::BorrowDrawTarget() fail when underlying dmabuf surface is not locked, r=sotaro + + Differential Revision: https://phabricator.services.mozilla.com/D75329 +--- + gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp +index bb556d9fcfaf5..da9c9cb6f4d19 100644 +--- gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp ++++ gfx/layers/opengl/WaylandDMABUFTextureClientOGL.cpp +@@ -86,6 +86,9 @@ already_AddRefed<DrawTarget> WaylandDMABUFTextureData::BorrowDrawTarget() { + return nullptr; + } + auto surf = mSurface->GetAsWaylandDMABufSurfaceRGBA(); ++ if (!surf->GetMappedRegion()) { ++ return nullptr; ++ } + return Factory::CreateDrawTargetForData( + mBackend, (unsigned char*)surf->GetMappedRegion(), + IntSize(surf->GetWidth(), surf->GetHeight()),
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005272003.04RK3sIB022684>