From nobody Fri Oct 22 17:40:52 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 CCF1C180076B; Fri, 22 Oct 2021 17:40:52 +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 4HbWpr5Tsjz3Gl2; Fri, 22 Oct 2021 17:40:52 +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 9C16F130B5; Fri, 22 Oct 2021 17:40:52 +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 19MHeqre047662; Fri, 22 Oct 2021 17:40:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19MHeqGk047661; Fri, 22 Oct 2021 17:40:52 GMT (envelope-from git) Date: Fri, 22 Oct 2021 17:40:52 GMT Message-Id: <202110221740.19MHeqGk047661@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: 5425bfb16f2f - main - graphics/qt5-wayland: fix build with clang 13 by adding 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5425bfb16f2f14ed7d3ffe138c5ee564b9e554bf Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=5425bfb16f2f14ed7d3ffe138c5ee564b9e554bf commit 5425bfb16f2f14ed7d3ffe138c5ee564b9e554bf Author: Dimitry Andric AuthorDate: 2021-10-19 21:54:48 +0000 Commit: Dimitry Andric CommitDate: 2021-10-22 17:38:48 +0000 graphics/qt5-wayland: fix build with clang 13 by adding During an exp-run for llvm 13 (see bug 258209), it turned out that graphics/qt5-wayland fails to build with clang 13: In file included from main.cpp:32: In file included from ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h:33: ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h:145:40: error: implicit instantiation of undefined template 'std::array' std::array m_planes; ^ /usr/include/c++/v1/__tuple:219:64: note: template is declared here template struct _LIBCPP_TEMPLATE_VIS array; ^ In file included from main.cpp:32: In file included from ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h:33: ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h:148:46: error: implicit instantiation of undefined template 'std::array' std::array m_eglImages = { {EGL_NO_IMAGE_KHR, EGL_NO_IMAGE_KHR, EGL_NO_IMAGE_KHR, EGL_NO_IMAGE_KHR} }; ^ /usr/include/c++/v1/__tuple:219:64: note: template is declared here template struct _LIBCPP_TEMPLATE_VIS array; ^ In file included from main.cpp:32: In file included from ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabufclientbufferintegration.h:33: ../../../../hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h:149:51: error: implicit instantiation of undefined template 'std::array' std::array m_textures = { {nullptr, nullptr, nullptr, nullptr} }; ^ /usr/include/c++/v1/__tuple:219:64: note: template is declared here template struct _LIBCPP_TEMPLATE_VIS array; ^ 3 errors generated. This is because linuxdmabuf.h doesn't include the header. Fix it by adding the include. PR: 259288 Approved by: tcberner (maintainer) MFH: 2021Q4 --- graphics/qt5-wayland/Makefile | 2 +- ...egration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/graphics/qt5-wayland/Makefile b/graphics/qt5-wayland/Makefile index fb2ae1578b82..7ee0e16dc648 100644 --- a/graphics/qt5-wayland/Makefile +++ b/graphics/qt5-wayland/Makefile @@ -1,6 +1,6 @@ PORTNAME= wayland DISTVERSION= ${QT5_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= graphics PKGNAMEPREFIX= qt5- diff --git a/graphics/qt5-wayland/files/patch-src_hardwareintegration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h b/graphics/qt5-wayland/files/patch-src_hardwareintegration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h new file mode 100644 index 000000000000..eae8123a0da4 --- /dev/null +++ b/graphics/qt5-wayland/files/patch-src_hardwareintegration_compositor_linux-dmabuf-unstable-v1_linuxdmabuf.h @@ -0,0 +1,11 @@ +--- src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h.orig 2020-10-27 08:02:11 UTC ++++ src/hardwareintegration/compositor/linux-dmabuf-unstable-v1/linuxdmabuf.h +@@ -44,6 +44,8 @@ + #include + #include + ++#include ++ + // compatibility with libdrm <= 2.4.74 + #ifndef DRM_FORMAT_RESERVED + #define DRM_FORMAT_RESERVED ((1ULL << 56) - 1)