Tue May 25 09:26:32 2021 UTC ()
x11/qt5-qtbase: depend on libdrm explicitly if MesaLib does DRI

On systems with DRI and a libdrm present in the host, it will be
picked up anyway, so let's ensure that the dependency is properly
handled.


(thor)
diff -r1.109 -r1.110 pkgsrc/x11/qt5-qtbase/Makefile
cvs diff -r1.109 -r1.110 pkgsrc/x11/qt5-qtbase/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/qt5-qtbase/Makefile 2021/05/24 19:56:04 1.109
+++ pkgsrc/x11/qt5-qtbase/Makefile 2021/05/25 09:26:32 1.110
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.109 2021/05/24 19:56:04 wiz Exp $ 1# $NetBSD: Makefile,v 1.110 2021/05/25 09:26:32 thor Exp $
2 2
3DISTNAME= qtbase-everywhere-src-${QTVERSION} 3DISTNAME= qtbase-everywhere-src-${QTVERSION}
4PKGNAME= qt5-qtbase-${QTVERSION} 4PKGNAME= qt5-qtbase-${QTVERSION}
5PKGREVISION= 5 5PKGREVISION= 5
6COMMENT= C++ X GUI toolkit 6COMMENT= C++ X GUI toolkit
7 7
8.include "../../x11/qt5-qtbase/Makefile.common" 8.include "../../x11/qt5-qtbase/Makefile.common"
9 9
10HAS_CONFIGURE= yes 10HAS_CONFIGURE= yes
11CONFIGURE_ARGS+= -prefix "${QTPREFIX}" 11CONFIGURE_ARGS+= -prefix "${QTPREFIX}"
12CONFIGURE_ARGS+= -I "${PREFIX}/include" 12CONFIGURE_ARGS+= -I "${PREFIX}/include"
13CONFIGURE_ARGS+= -L "${PREFIX}/lib" 13CONFIGURE_ARGS+= -L "${PREFIX}/lib"
14CONFIGURE_ARGS+= -opensource -confirm-license 14CONFIGURE_ARGS+= -opensource -confirm-license
@@ -239,26 +239,30 @@ post-install: @@ -239,26 +239,30 @@ post-install:
239.include "../../devel/zlib/buildlink3.mk" 239.include "../../devel/zlib/buildlink3.mk"
240.include "../../fonts/harfbuzz/buildlink3.mk" 240.include "../../fonts/harfbuzz/buildlink3.mk"
241.include "../../graphics/freetype2/buildlink3.mk" 241.include "../../graphics/freetype2/buildlink3.mk"
242.include "../../graphics/png/buildlink3.mk" 242.include "../../graphics/png/buildlink3.mk"
243.include "../../security/openssl/buildlink3.mk" 243.include "../../security/openssl/buildlink3.mk"
244.include "../../textproc/icu/buildlink3.mk" 244.include "../../textproc/icu/buildlink3.mk"
245.include "../../www/libproxy/buildlink3.mk" 245.include "../../www/libproxy/buildlink3.mk"
246.if ${OPSYS} != "Darwin" 246.if ${OPSYS} != "Darwin"
247.include "../../fonts/fontconfig/buildlink3.mk" 247.include "../../fonts/fontconfig/buildlink3.mk"
248.include "../../graphics/glu/buildlink3.mk" 248.include "../../graphics/glu/buildlink3.mk"
249. if !empty(MESALIB_SUPPORTS_EGL:Myes) 249. if !empty(MESALIB_SUPPORTS_EGL:Myes)
250PLIST.egl= yes 250PLIST.egl= yes
251. endif 251. endif
 252. if !empty(MESALIB_SUPPORTS_DRI:Myes)
 253CONFIGURE_ARGS+= -kms
 254.include "../../x11/libdrm/buildlink3.mk"
 255. endif
252BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.11 256BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.11
253.include "../../x11/libxcb/buildlink3.mk" 257.include "../../x11/libxcb/buildlink3.mk"
254.include "../../x11/xcb-util/buildlink3.mk" 258.include "../../x11/xcb-util/buildlink3.mk"
255.include "../../x11/xcb-util-image/buildlink3.mk" 259.include "../../x11/xcb-util-image/buildlink3.mk"
256.include "../../x11/xcb-util-keysyms/buildlink3.mk" 260.include "../../x11/xcb-util-keysyms/buildlink3.mk"
257.include "../../x11/xcb-util-renderutil/buildlink3.mk" 261.include "../../x11/xcb-util-renderutil/buildlink3.mk"
258.include "../../x11/xcb-util-wm/buildlink3.mk" 262.include "../../x11/xcb-util-wm/buildlink3.mk"
259.include "../../x11/libSM/buildlink3.mk" 263.include "../../x11/libSM/buildlink3.mk"
260.include "../../x11/libX11/buildlink3.mk" 264.include "../../x11/libX11/buildlink3.mk"
261.include "../../x11/libXext/buildlink3.mk" 265.include "../../x11/libXext/buildlink3.mk"
262.include "../../x11/libXcursor/buildlink3.mk" 266.include "../../x11/libXcursor/buildlink3.mk"
263.include "../../x11/libXft/buildlink3.mk" 267.include "../../x11/libXft/buildlink3.mk"
264.include "../../x11/libXi/buildlink3.mk" 268.include "../../x11/libXi/buildlink3.mk"