Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B670284E5F for ; Sat, 16 Dec 2023 09:56:38 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id uPf8uJXRJkk4 for ; Sat, 16 Dec 2023 09:56:38 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1522E84D09 for ; Sat, 16 Dec 2023 09:56:38 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 0868AFA42; Sat, 16 Dec 2023 09:56:38 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1702720598231140" MIME-Version: 1.0 Date: Sat, 16 Dec 2023 09:56:38 +0000 From: "Niclas Rosenvik" Subject: CVS commit: pkgsrc/x11/qt6-qtbase To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: nros@netbsd.org X-Mailer: log_accum Message-Id: <20231216095638.0868AFA42@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1702720598231140 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nros Date: Sat Dec 16 09:56:37 UTC 2023 Modified Files: pkgsrc/x11/qt6-qtbase: Makefile PLIST Log Message: qt6-qtbase: fix build on systems that don't have everything for kmsegldevice (X11_TYPE=native on NetBSD 9) To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 pkgsrc/x11/qt6-qtbase/Makefile cvs rdiff -u -r1.10 -r1.11 pkgsrc/x11/qt6-qtbase/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1702720598231140 Content-Disposition: inline Content-Length: 3883 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/qt6-qtbase/Makefile diff -u pkgsrc/x11/qt6-qtbase/Makefile:1.24 pkgsrc/x11/qt6-qtbase/Makefile:1.25 --- pkgsrc/x11/qt6-qtbase/Makefile:1.24 Thu Nov 30 20:11:26 2023 +++ pkgsrc/x11/qt6-qtbase/Makefile Sat Dec 16 09:56:37 2023 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2023/11/30 20:11:26 adam Exp $ +# $NetBSD: Makefile,v 1.25 2023/12/16 09:56:37 nros Exp $ DISTNAME= qtbase-everywhere-src-${QTVERSION} PKGNAME= qt6-qtbase-${QTVERSION} +PKGREVISION= 1 COMMENT= C++ X GUI toolkit CATEGORIES= x11 @@ -64,7 +65,7 @@ CONFIGURE_ARGS+= -no-rpath # avoid @rpat QMAKE_CONF= qmake.conf.mac .endif -PLIST_VARS+= egl x11 +PLIST_VARS+= egl egldevice x11 .include "../../mk/compiler.mk" @@ -245,6 +246,10 @@ PLIST.x11= yes .include "../../graphics/glu/buildlink3.mk" . if !empty(MESALIB_SUPPORTS_EGL:Myes) PLIST.egl= yes +EGL_EXT_FILE= cat ${X11BASE}/include/EGL/eglext.h +. if exists(${X11BASE}/include/EGL/eglext.h) && !empty(EGL_EXT_FILE:sh:MEGL_DRM_MASTER_FD_EXT) +PLIST.egldevice= yes +. endif . endif BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.11 .include "../../x11/libxcb/buildlink3.mk" Index: pkgsrc/x11/qt6-qtbase/PLIST diff -u pkgsrc/x11/qt6-qtbase/PLIST:1.10 pkgsrc/x11/qt6-qtbase/PLIST:1.11 --- pkgsrc/x11/qt6-qtbase/PLIST:1.10 Thu Nov 30 20:11:26 2023 +++ pkgsrc/x11/qt6-qtbase/PLIST Sat Dec 16 09:56:37 2023 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.10 2023/11/30 20:11:26 adam Exp $ +@comment $NetBSD: PLIST,v 1.11 2023/12/16 09:56:37 nros Exp $ lib/pkgconfig/Qt6Concurrent.pc lib/pkgconfig/Qt6Core.pc ${PLIST.dbus}lib/pkgconfig/Qt6DBus.pc @@ -2888,12 +2888,12 @@ ${PLIST.egl}qt6/lib/cmake/Qt6Gui/Qt6QEgl ${PLIST.egl}qt6/lib/cmake/Qt6Gui/Qt6QEglFSIntegrationPluginConfigVersionImpl.cmake ${PLIST.egl}qt6/lib/cmake/Qt6Gui/Qt6QEglFSIntegrationPluginTargets-release.cmake ${PLIST.egl}qt6/lib/cmake/Qt6Gui/Qt6QEglFSIntegrationPluginTargets.cmake -${PLIST.egl}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsEglDeviceIntegrationPluginAdditionalTargetInfo.cmake -${PLIST.egl}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsEglDeviceIntegrationPluginConfig.cmake -${PLIST.egl}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsEglDeviceIntegrationPluginConfigVersion.cmake -${PLIST.egl}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsEglDeviceIntegrationPluginConfigVersionImpl.cmake -${PLIST.egl}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsEglDeviceIntegrationPluginTargets-release.cmake -${PLIST.egl}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsEglDeviceIntegrationPluginTargets.cmake +${PLIST.egldevice}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsEglDeviceIntegrationPluginAdditionalTargetInfo.cmake +${PLIST.egldevice}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsEglDeviceIntegrationPluginConfig.cmake +${PLIST.egldevice}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsEglDeviceIntegrationPluginConfigVersion.cmake +${PLIST.egldevice}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsEglDeviceIntegrationPluginConfigVersionImpl.cmake +${PLIST.egldevice}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsEglDeviceIntegrationPluginTargets-release.cmake +${PLIST.egldevice}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsEglDeviceIntegrationPluginTargets.cmake ${PLIST.egl}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsGbmIntegrationPluginAdditionalTargetInfo.cmake ${PLIST.egl}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsGbmIntegrationPluginConfig.cmake ${PLIST.egl}qt6/lib/cmake/Qt6Gui/Qt6QEglFSKmsGbmIntegrationPluginConfigVersion.cmake @@ -3752,7 +3752,7 @@ qt6/modules/Widgets.json ${PLIST.x11}qt6/modules/XcbQpaPrivate.json qt6/modules/Xml.json ${PLIST.egl}qt6/plugins/egldeviceintegrations/libqeglfs-emu-integration.so -${PLIST.egl}qt6/plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so +${PLIST.egldevice}qt6/plugins/egldeviceintegrations/libqeglfs-kms-egldevice-integration.so ${PLIST.egl}qt6/plugins/egldeviceintegrations/libqeglfs-kms-integration.so ${PLIST.egl}qt6/plugins/egldeviceintegrations/libqeglfs-x11-integration.so qt6/plugins/generic/libqtuiotouchplugin.so --_----------=_1702720598231140--