From nobody Mon Nov 29 13:39:19 2021 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 321F618BAA87; Mon, 29 Nov 2021 13:39:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4J2mfb5W0bz3Bvk; Mon, 29 Nov 2021 13:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9D0032352D; Mon, 29 Nov 2021 13:39:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1ATDdJTw092282; Mon, 29 Nov 2021 13:39:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ATDdJ5e092281; Mon, 29 Nov 2021 13:39:19 GMT (envelope-from git) Date: Mon, 29 Nov 2021 13:39:19 GMT Message-Id: <202111291339.1ATDdJ5e092281@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 354f1aceba71 - main - www/wpebackend-fdo: unbreak the build on i386 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 354f1aceba7173b0f212482c2e44fdf2dafb514a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638193159; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OezOcvOZvnWL8Ed/p/ZJjFVYqoE0NpYzvl0cnI231MY=; b=f5DlFikX8wleqeOMQJx/wO1IdewiJUsYcCWd29fjP22LUqetMGy95ORquQ8c/lq+ORNmtU L7WCkr2hU/ekb9U3iCVxHtlpZhW9MunrsDgG5UPI4Slo4N6HEa1w8OlHEhatO4Aq8n/nOz guNuopS8MtW1LK1uSY0wyaLLThH2OYXr1oKRSE9InWFcFI2rwPyynPyV0GM8LDiNfqBb5h GtQuCxu2tfoTzzA/tH/tTGWla8yh8hZoG7rvyUP/qX10iUJnOz10BSrkjC/4d5awRAwOxX 6lAVjWVyCXOboln8wLqohnZRa46BH51ZVgEjjbZ8+MY7c0G+VMio4TKRndMD2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638193159; a=rsa-sha256; cv=none; b=oSZKxYCmfDlP/OEnMFICzy73qLVYc0r+pR4kt0J0RYON1FeRi7ilSX9iJ8zhZea865fFUZ LZBbOx+3TRR3kmf+uKmCaDwJLYBBML/DMSfDn3aLJqCF3x7RjFmZ1Nd0QB436QfY57lEcU sA724j99fhqb+mj1Vc1kTvtgUxJhmlXW86QO6OxY0Qen+L6AgaDVp6jus0Lt4BCMP6qukV mWk4BHhOO9pd7uWjk64vZDg6emSRa0tZ/e+fBL0qnhW8RuupC+aWXnNXFN5JsyFbm78zpW XFQRoG1FMmsznQ/upGJSAfAQpU9DTCoVFcutf7VDroos/Jb+mjEzZ+RHOBgg0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=354f1aceba7173b0f212482c2e44fdf2dafb514a commit 354f1aceba7173b0f212482c2e44fdf2dafb514a Author: Alexey Dokuchaev AuthorDate: 2021-11-29 13:38:32 +0000 Commit: Alexey Dokuchaev CommitDate: 2021-11-29 13:38:32 +0000 www/wpebackend-fdo: unbreak the build on i386 error: non-constant-expression cannot be narrowed from type 'std::__1::array::value_type' (aka 'unsigned int') to 'int' in initializer list [-Wc++11-narrowing] --- .../files/patch-src_egl-client-dmabuf-pool.cpp | 62 ++++++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/www/wpebackend-fdo/files/patch-src_egl-client-dmabuf-pool.cpp b/www/wpebackend-fdo/files/patch-src_egl-client-dmabuf-pool.cpp new file mode 100644 index 000000000000..3cb1d630610e --- /dev/null +++ b/www/wpebackend-fdo/files/patch-src_egl-client-dmabuf-pool.cpp @@ -0,0 +1,62 @@ +--- src/egl-client-dmabuf-pool.cpp.orig 2021-10-18 22:13:13 UTC ++++ src/egl-client-dmabuf-pool.cpp +@@ -182,10 +182,10 @@ void TargetDmabufPool::frameWillRender() + uint32_t modifier_lo = bufferData.modifiers[0] & 0xFFFFFFFF; + std::array planeAttributes = { + EGL_DMA_BUF_PLANE0_FD_EXT, bufferData.fds[0], +- EGL_DMA_BUF_PLANE0_PITCH_EXT, bufferData.strides[0], +- EGL_DMA_BUF_PLANE0_OFFSET_EXT, bufferData.offsets[0], +- EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT, modifier_hi, +- EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT, modifier_lo, ++ EGL_DMA_BUF_PLANE0_PITCH_EXT, static_cast(bufferData.strides[0]), ++ EGL_DMA_BUF_PLANE0_OFFSET_EXT, static_cast(bufferData.offsets[0]), ++ EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT, static_cast(modifier_hi), ++ EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT, static_cast(modifier_lo), + }; + + std::copy(planeAttributes.begin(), planeAttributes.end(), +@@ -198,10 +198,10 @@ void TargetDmabufPool::frameWillRender() + uint32_t modifier_lo = bufferData.modifiers[1] & 0xFFFFFFFF; + std::array planeAttributes = { + EGL_DMA_BUF_PLANE1_FD_EXT, bufferData.fds[1], +- EGL_DMA_BUF_PLANE1_PITCH_EXT, bufferData.strides[1], +- EGL_DMA_BUF_PLANE1_OFFSET_EXT, bufferData.offsets[1], +- EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT, modifier_hi, +- EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT, modifier_lo, ++ EGL_DMA_BUF_PLANE1_PITCH_EXT, static_cast(bufferData.strides[1]), ++ EGL_DMA_BUF_PLANE1_OFFSET_EXT, static_cast(bufferData.offsets[1]), ++ EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT, static_cast(modifier_hi), ++ EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT, static_cast(modifier_lo), + }; + + std::copy(planeAttributes.begin(), planeAttributes.end(), +@@ -214,10 +214,10 @@ void TargetDmabufPool::frameWillRender() + uint32_t modifier_lo = bufferData.modifiers[2] & 0xFFFFFFFF; + std::array planeAttributes = { + EGL_DMA_BUF_PLANE2_FD_EXT, bufferData.fds[2], +- EGL_DMA_BUF_PLANE2_PITCH_EXT, bufferData.strides[2], +- EGL_DMA_BUF_PLANE2_OFFSET_EXT, bufferData.offsets[2], +- EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT, modifier_hi, +- EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT, modifier_lo, ++ EGL_DMA_BUF_PLANE2_PITCH_EXT, static_cast(bufferData.strides[2]), ++ EGL_DMA_BUF_PLANE2_OFFSET_EXT, static_cast(bufferData.offsets[2]), ++ EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT, static_cast(modifier_hi), ++ EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT, static_cast(modifier_lo), + }; + + std::copy(planeAttributes.begin(), planeAttributes.end(), +@@ -230,10 +230,10 @@ void TargetDmabufPool::frameWillRender() + uint32_t modifier_lo = bufferData.modifiers[3] & 0xFFFFFFFF; + std::array planeAttributes = { + EGL_DMA_BUF_PLANE3_FD_EXT, bufferData.fds[3], +- EGL_DMA_BUF_PLANE3_PITCH_EXT, bufferData.strides[3], +- EGL_DMA_BUF_PLANE3_OFFSET_EXT, bufferData.offsets[3], +- EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT, modifier_hi, +- EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT, modifier_lo, ++ EGL_DMA_BUF_PLANE3_PITCH_EXT, static_cast(bufferData.strides[3]), ++ EGL_DMA_BUF_PLANE3_OFFSET_EXT, static_cast(bufferData.offsets[3]), ++ EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT, static_cast(modifier_hi), ++ EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT, static_cast(modifier_lo), + }; + + std::copy(planeAttributes.begin(), planeAttributes.end(),