From owner-svn-ports-all@freebsd.org Fri Mar 30 03:25:21 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9B54AF6B446; Fri, 30 Mar 2018 03:25:21 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49F7B7348D; Fri, 30 Mar 2018 03:25:21 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4445C2335C; Fri, 30 Mar 2018 03:25:21 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w2U3PLlv021040; Fri, 30 Mar 2018 03:25:21 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w2U3PKsC021036; Fri, 30 Mar 2018 03:25:20 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201803300325.w2U3PKsC021036@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 30 Mar 2018 03:25:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r465944 - in branches/2018Q1/www/firefox: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in branches/2018Q1/www/firefox: . files X-SVN-Commit-Revision: 465944 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 30 Mar 2018 03:25:21 -0000 Author: jbeich Date: Fri Mar 30 03:25:20 2018 New Revision: 465944 URL: https://svnweb.freebsd.org/changeset/ports/465944 Log: MFH: r465943 www/firefox: unbreak WebRender on i386 Approved by: ports-secteam blanket Added: branches/2018Q1/www/firefox/files/patch-bug1444798 - copied unchanged from r465943, head/www/firefox/files/patch-bug1444798 branches/2018Q1/www/firefox/files/patch-bug1448770 - copied unchanged from r465943, head/www/firefox/files/patch-bug1448770 Modified: branches/2018Q1/www/firefox/Makefile Directory Properties: branches/2018Q1/ (props changed) Modified: branches/2018Q1/www/firefox/Makefile ============================================================================== --- branches/2018Q1/www/firefox/Makefile Fri Mar 30 03:22:03 2018 (r465943) +++ branches/2018Q1/www/firefox/Makefile Fri Mar 30 03:25:20 2018 (r465944) @@ -3,6 +3,7 @@ PORTNAME= firefox DISTVERSION= 59.0.2 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= www ipv6 MASTER_SITES= https://hg.mozilla.org/releases/mozilla-release/archive/ Copied: branches/2018Q1/www/firefox/files/patch-bug1444798 (from r465943, head/www/firefox/files/patch-bug1444798) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/firefox/files/patch-bug1444798 Fri Mar 30 03:25:20 2018 (r465944, copy of r465943, head/www/firefox/files/patch-bug1444798) @@ -0,0 +1,45 @@ +commit 7871e211ec43 +Author: sotaro +Date: Fri Mar 16 21:03:59 2018 +0900 + + Bug 1444798 - Fix ExternalImageCallback func types r=jrmuizel +--- + gfx/webrender_bindings/src/bindings.rs | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git gfx/webrender_bindings/src/bindings.rs gfx/webrender_bindings/src/bindings.rs +index 8517d7dd33e5..cf885ee713f3 100644 +--- gfx/webrender_bindings/src/bindings.rs ++++ gfx/webrender_bindings/src/bindings.rs +@@ -290,8 +290,8 @@ struct WrExternalImage { + size: usize, + } + +-type LockExternalImageCallback = fn(*mut c_void, WrExternalImageId, u8) -> WrExternalImage; +-type UnlockExternalImageCallback = fn(*mut c_void, WrExternalImageId, u8); ++type LockExternalImageCallback = unsafe extern "C" fn(*mut c_void, WrExternalImageId, u8) -> WrExternalImage; ++type UnlockExternalImageCallback = unsafe extern "C" fn(*mut c_void, WrExternalImageId, u8); + + #[repr(C)] + pub struct WrExternalImageHandler { +@@ -305,8 +305,8 @@ impl ExternalImageHandler for WrExternalImageHandler { + id: ExternalImageId, + channel_index: u8) + -> ExternalImage { +- let image = (self.lock_func)(self.external_image_obj, id.into(), channel_index); + ++ let image = unsafe { (self.lock_func)(self.external_image_obj, id.into(), channel_index) }; + match image.image_type { + WrExternalImageType::NativeTexture => { + ExternalImage { +@@ -341,7 +341,9 @@ impl ExternalImageHandler for WrExternalImageHandler { + fn unlock(&mut self, + id: ExternalImageId, + channel_index: u8) { +- (self.unlock_func)(self.external_image_obj, id.into(), channel_index); ++ unsafe { ++ (self.unlock_func)(self.external_image_obj, id.into(), channel_index); ++ } + } + } + Copied: branches/2018Q1/www/firefox/files/patch-bug1448770 (from r465943, head/www/firefox/files/patch-bug1448770) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ branches/2018Q1/www/firefox/files/patch-bug1448770 Fri Mar 30 03:25:20 2018 (r465944, copy of r465943, head/www/firefox/files/patch-bug1448770) @@ -0,0 +1,27 @@ +Disable GL_EXT_debug_marker due to crashes on x86 with Mesa drivers. + +diff --git gfx/webrender/src/query.rs gfx/webrender/src/query.rs +index 999abc749115..68850ef025e4 100644 +--- gfx/webrender/src/query.rs ++++ gfx/webrender/src/query.rs +@@ -274,17 +274,20 @@ pub struct GpuMarker { + + impl GpuMarker { + fn new(gl: &Rc, message: &str) -> Self { ++#[cfg(not(target_arch = "x86"))] + gl.push_group_marker_ext(message); + GpuMarker { gl: Rc::clone(gl) } + } + + fn fire(gl: &Rc, message: &str) { ++#[cfg(not(target_arch = "x86"))] + gl.insert_event_marker_ext(message); + } + } + + impl Drop for GpuMarker { + fn drop(&mut self) { ++#[cfg(not(target_arch = "x86"))] + self.gl.pop_group_marker_ext(); + } + }