diff options
| author | wiz <wiz@pkgsrc.org> | 2015-04-27 10:38:04 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2015-04-27 10:38:04 +0000 |
| commit | 364216ea3b2708045b03c41755b0dad9fc999664 (patch) | |
| tree | 302dcabb0c05a12ad0f6a189faa0e17f06138a39 | |
| parent | a080096879b736e2acd23f91692ea31c0d816303 (diff) | |
| download | pkgsrc-364216ea3b2708045b03c41755b0dad9fc999664.tar.gz | |
Make latest egl file additions optional depending on the use of X.org
from pkgsrc or the existence of a particular header file.
Suggested by tnn.
| -rw-r--r-- | x11/qt5-qtbase/Makefile | 7 | ||||
| -rw-r--r-- | x11/qt5-qtbase/PLIST | 10 |
2 files changed, 11 insertions, 6 deletions
diff --git a/x11/qt5-qtbase/Makefile b/x11/qt5-qtbase/Makefile index 393d2f8f701..3c0e59e799d 100644 --- a/x11/qt5-qtbase/Makefile +++ b/x11/qt5-qtbase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2015/04/25 14:25:17 tnn Exp $ +# $NetBSD: Makefile,v 1.22 2015/04/27 10:38:04 wiz Exp $ DISTNAME= qtbase-opensource-src-${QTVERSION} PKGNAME= qt5-qtbase-${QTVERSION} @@ -50,6 +50,11 @@ CONFIGURE_ARGS+= -reduce-relocations QMAKE_CONF= qmake.conf.mac .endif +PLIST_VARS+= egl +.if ${X11_TYPE} == "modular" || exists(${X11BASE}/include/EGL/egl.h) +PLIST.egl= yes +.endif + .include "../../mk/compiler.mk" .if ${OPSYS} == "SunOS" diff --git a/x11/qt5-qtbase/PLIST b/x11/qt5-qtbase/PLIST index 6eccd53d560..03cf9a37ca4 100644 --- a/x11/qt5-qtbase/PLIST +++ b/x11/qt5-qtbase/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2015/04/27 08:36:02 wiz Exp $ +@comment $NetBSD: PLIST,v 1.6 2015/04/27 10:38:04 wiz Exp $ lib/pkgconfig/Qt5Bootstrap.pc lib/pkgconfig/Qt5Concurrent.pc lib/pkgconfig/Qt5Core.pc @@ -2277,11 +2277,11 @@ qt5/lib/cmake/Qt5Gui/Qt5GuiConfigExtras.cmake qt5/lib/cmake/Qt5Gui/Qt5GuiConfigVersion.cmake ${PLIST.mac}qt5/lib/cmake/Qt5Gui/Qt5Gui_QCocoaIntegrationPlugin.cmake ${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QComposePlatformInputContextPlugin.cmake -qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake +${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QEglFSIntegrationPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QGifPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QICOPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QJpegPlugin.cmake -qt5/lib/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake +${PLIST.egl}qt5/lib/cmake/Qt5Gui/Qt5Gui_QMinimalEglIntegrationPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QMinimalIntegrationPlugin.cmake ${PLIST.unix}qt5/lib/cmake/Qt5Gui/Qt5Gui_QXcbIntegrationPlugin.cmake qt5/lib/cmake/Qt5Gui/Qt5Gui_QOffscreenIntegrationPlugin.cmake @@ -2833,9 +2833,9 @@ qt5/plugins/imageformats/libqico.la qt5/plugins/imageformats/libqjpeg.la ${PLIST.unix}qt5/plugins/platforminputcontexts/libcomposeplatforminputcontextplugin.la ${PLIST.mac}qt5/plugins/platforms/libqcocoa.la -qt5/plugins/platforms/libqeglfs.la +${PLIST.egl}qt5/plugins/platforms/libqeglfs.la qt5/plugins/platforms/libqminimal.la -qt5/plugins/platforms/libqminimalegl.la +${PLIST.egl}qt5/plugins/platforms/libqminimalegl.la qt5/plugins/platforms/libqoffscreen.la ${PLIST.unix}qt5/plugins/platforms/libqxcb.la ${PLIST.mac}qt5/plugins/printsupport/libcocoaprintersupport.la |