kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

PR pkg/50243: PLIST fix when X11_TYPE=modular and PKG_OPTIONS.MesaLib=-dri

Browse source 
ok gdt@
This commit is contained in:
tnn 2015-09-16 12:28:53 +00:00
parent 7e6174f35a
commit 02c5285498
4 changed files with 21 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
graphics/MesaLib/buildlink3.mk
View file

@ -1,4 +1,4 @@
# $NetBSD: buildlink3.mk,v 1.52 2015/04/25 11:19:18 tnn Exp $
# $NetBSD: buildlink3.mk,v 1.53 2015/09/16 12:28:53 tnn Exp $
BUILDLINK_TREE+= MesaLib
@ -35,6 +35,13 @@ PKG_BUILD_OPTIONS.MesaLib+= dri
. include "../../graphics/MesaLib/dri.mk"
.endif
.if ${X11_TYPE} == "modular" && !empty(PKG_BUILD_OPTIONS.MesaLib:Mdri) || \
${X11_TYPE} == "native" && exists(${X11BASE}/include/EGL/egl.h)
MESALIB_SUPPORTS_EGL= yes
.else
MESALIB_SUPPORTS_EGL= no
.endif
.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
.include "../../devel/pthread-stublib/buildlink3.mk"
.endif

12
graphics/libepoxy/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2015/09/14 18:20:12 tron Exp $
# $NetBSD: Makefile,v 1.10 2015/09/16 12:28:53 tnn Exp $
DISTNAME= libepoxy-1.3.1
PKGREVISION= 1
@ -26,12 +26,7 @@ pre-configure:
.include "../../mk/bsd.prefs.mk"
PLIST_VARS+= egl
.if ${X11_TYPE} == "modular" || exists(${X11BASE}/include/EGL/egl.h)
PLIST.egl= yes
CONFIGURE_ENV+= PKGSRC_BUILD_EGL=yes
.else
CONFIGURE_ENV+= PKGSRC_BUILD_EGL=no
.endif
CONFIGURE_ENV+= PKGSRC_BUILD_EGL=${MESALIB_SUPPORTS_EGL}
# This could be garbage collected, but it seems likely that there will
# be more glx issues, so it seems easier to leave it.
@ -46,5 +41,8 @@ PLIST.glx= yes
.include "../../lang/python/tool.mk"
.include "../../devel/xorg-util-macros/buildlink3.mk"
.include "../../graphics/MesaLib/buildlink3.mk"
.if !empty(MESALIB_SUPPORTS_EGL:Myes)
PLIST.egl= yes
.endif
.include "../../x11/libX11/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"

8
multimedia/libva/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.8 2015/04/28 06:56:18 tnn Exp $
# $NetBSD: Makefile,v 1.9 2015/09/16 12:28:53 tnn Exp $
#
DISTNAME= libva-1.1.0
@ -34,14 +34,14 @@ PKGCONFIG_OVERRIDE+= libva-x11.pc.in
PKGCONFIG_OVERRIDE+= libva.pc.in
PLIST_VARS+= egl
.if ${X11_TYPE} == "modular" || exists(${X11BASE}/include/EGL/egl.h)
PLIST.egl= yes
.endif
pre-configure:
cd ${WRKSRC} && autoreconf -i
.include "../../graphics/MesaLib/buildlink3.mk"
.if !empty(MESALIB_SUPPORTS_EGL:Myes)
PLIST.egl= yes
.endif
.include "../../x11/libXfixes/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"

8
x11/qt5-qtbase/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.25 2015/07/04 16:18:42 joerg Exp $
# $NetBSD: Makefile,v 1.26 2015/09/16 12:28:53 tnn Exp $
DISTNAME= qtbase-opensource-src-${QTVERSION}
PKGNAME= qt5-qtbase-${QTVERSION}
@ -52,9 +52,6 @@ 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"
@ -186,6 +183,9 @@ post-install:
.include "../../textproc/icu/buildlink3.mk"
.if ${OPSYS} != "Darwin"
.include "../../graphics/glu/buildlink3.mk"
.if !empty(MESALIB_SUPPORTS_EGL:Myes)
PLIST.egl= yes
.endif
.include "../../x11/libxcb/buildlink3.mk"
.include "../../x11/xcb-util/buildlink3.mk"
.include "../../x11/xcb-util-image/buildlink3.mk"