Fri Aug 23 11:37:48 2019 UTC ()
MesaLib: resolving some build failures when built without LLVM


(nia)
diff -r1.152 -r1.153 pkgsrc/graphics/MesaLib/Makefile
diff -r1.67 -r1.68 pkgsrc/graphics/MesaLib/options.mk
cvs diff -r1.152 -r1.153 pkgsrc/graphics/MesaLib/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/Makefile 2019/08/22 17:24:01 1.152
+++ pkgsrc/graphics/MesaLib/Makefile 2019/08/23 11:37:48 1.153
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.152 2019/08/22 17:24:01 nia Exp $ 1# $NetBSD: Makefile,v 1.153 2019/08/23 11:37:48 nia Exp $
2 2
3DISTNAME= mesa-19.1.4 3DISTNAME= mesa-19.1.4
4PKGNAME= ${DISTNAME:S/mesa/MesaLib/} 4PKGNAME= ${DISTNAME:S/mesa/MesaLib/}
5CATEGORIES= graphics x11 5CATEGORIES= graphics x11
6MASTER_SITES= https://mesa.freedesktop.org/archive/ 6MASTER_SITES= https://mesa.freedesktop.org/archive/
7EXTRACT_SUFX= .tar.xz 7EXTRACT_SUFX= .tar.xz
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.mesa3d.org/ 10HOMEPAGE= https://www.mesa3d.org/
11COMMENT= Open source OpenGL implementation 11COMMENT= Open source OpenGL implementation
12LICENSE= mit 12LICENSE= mit
13 13
14USE_TOOLS+= pkg-config 14USE_TOOLS+= pkg-config
@@ -68,22 +68,24 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-cElement @@ -68,22 +68,24 @@ BUILD_DEPENDS+= ${PYPKGPREFIX}-cElement
68pre-configure: 68pre-configure:
69 touch ${WRKSRC}/src/glx/apple_dummy.cpp 69 touch ${WRKSRC}/src/glx/apple_dummy.cpp
70 70
71DRIRC_DIR= ${PKG_SYSCONFDIR}/drirc.d 71DRIRC_DIR= ${PKG_SYSCONFDIR}/drirc.d
72EGDIR= ${PREFIX}/share/examples/mesa 72EGDIR= ${PREFIX}/share/examples/mesa
73OWN_DIRS+= ${DRIRC_DIR} 73OWN_DIRS+= ${DRIRC_DIR}
74INSTALLATION_DIRS+= ${EGDIR} 74INSTALLATION_DIRS+= ${EGDIR}
75CONF_FILES+= ${EGDIR}/00-mesa-defaults.conf \ 75CONF_FILES+= ${EGDIR}/00-mesa-defaults.conf \
76 ${DRIRC_DIR}/00-mesa-defaults.conf 76 ${DRIRC_DIR}/00-mesa-defaults.conf
77 77
78post-install: 78post-install:
79 ${INSTALL_DATA} ${WRKSRC}/src/util/00-mesa-defaults.conf ${DESTDIR}${EGDIR} 79 ${INSTALL_DATA} ${WRKSRC}/src/util/00-mesa-defaults.conf ${DESTDIR}${EGDIR}
80 80
 81# LLVM detection
 82TOOL_DEPENDS+= ${PYPKGPREFIX}-meson>=0.51.1nb3:../../devel/py-meson
 83
81.include "../../devel/py-meson/build.mk" 84.include "../../devel/py-meson/build.mk"
82.include "../../devel/zlib/buildlink3.mk" 85.include "../../devel/zlib/buildlink3.mk"
83.include "../../textproc/expat/buildlink3.mk" 86.include "../../textproc/expat/buildlink3.mk"
84.include "../../x11/libXrandr/buildlink3.mk" 87.include "../../x11/libXrandr/buildlink3.mk"
85.include "../../x11/libX11/buildlink3.mk" 88.include "../../x11/libX11/buildlink3.mk"
86.include "../../x11/libXext/buildlink3.mk" 89.include "../../x11/libXext/buildlink3.mk"
87.include "../../x11/libxcb/buildlink3.mk" 90.include "../../x11/libxcb/buildlink3.mk"
88.include "../../x11/libxshmfence/buildlink3.mk" 
89.include "../../mk/bsd.pkg.mk" 91.include "../../mk/bsd.pkg.mk"
cvs diff -r1.67 -r1.68 pkgsrc/graphics/MesaLib/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib/options.mk 2019/08/23 11:07:37 1.67
+++ pkgsrc/graphics/MesaLib/options.mk 2019/08/23 11:37:48 1.68
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.67 2019/08/23 11:07:37 nia Exp $ 1# $NetBSD: options.mk,v 1.68 2019/08/23 11:37:48 nia Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib 3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
4PKG_SUPPORTED_OPTIONS= llvm dri wayland 4PKG_SUPPORTED_OPTIONS= llvm dri wayland
5PKG_SUGGESTED_OPTIONS= 5PKG_SUGGESTED_OPTIONS=
6 6
7PKG_SUPPORTED_OPTIONS+= vdpau vaapi 7PKG_SUPPORTED_OPTIONS+= vdpau vaapi
8PKG_SUPPORTED_OPTIONS+= osmesa 8PKG_SUPPORTED_OPTIONS+= osmesa
9PKG_SUPPORTED_OPTIONS+= glesv1 glesv2 9PKG_SUPPORTED_OPTIONS+= glesv1 glesv2
10PKG_SUPPORTED_OPTIONS+= gallium-xa 10PKG_SUPPORTED_OPTIONS+= gallium-xa
11PKG_SUPPORTED_OPTIONS+= gallium-xvmc 11PKG_SUPPORTED_OPTIONS+= gallium-xvmc
12PKG_SUPPORTED_OPTIONS+= vulkan 12PKG_SUPPORTED_OPTIONS+= vulkan
13 13
14PKG_SUGGESTED_OPTIONS+= vdpau vaapi 14PKG_SUGGESTED_OPTIONS+= vdpau vaapi
@@ -218,26 +218,27 @@ MESON_ARGS+= -Dgallium-xa=false @@ -218,26 +218,27 @@ MESON_ARGS+= -Dgallium-xa=false
218# AMD Radeon r300 218# AMD Radeon r300
219PLIST.r300= yes 219PLIST.r300= yes
220GALLIUM_DRIVERS+= r300 220GALLIUM_DRIVERS+= r300
221# AMD Canary Islands GPUs 221# AMD Canary Islands GPUs
222PLIST.radeonsi= yes 222PLIST.radeonsi= yes
223GALLIUM_DRIVERS+= radeonsi 223GALLIUM_DRIVERS+= radeonsi
224MESON_ARGS+= -Dllvm=true 224MESON_ARGS+= -Dllvm=true
225 225
226BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=7.0 226BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=7.0
227. include "../../devel/libelf/buildlink3.mk" 227. include "../../devel/libelf/buildlink3.mk"
228. include "../../lang/libLLVM/buildlink3.mk" 228. include "../../lang/libLLVM/buildlink3.mk"
229. else # !llvm 229. else # !llvm
230MESON_ARGS+= -Dgallium-xa=false 230MESON_ARGS+= -Dgallium-xa=false
 231MESON_ARGS+= -Dgallium-vdpau=false
231MESON_ARGS+= -Dllvm=false 232MESON_ARGS+= -Dllvm=false
232. endif # llvm 233. endif # llvm
233PLIST_SUBST+= GLVER="1.2.0" 234PLIST_SUBST+= GLVER="1.2.0"
234MESON_ARGS+= -Dgallium-drivers=${GALLIUM_DRIVERS:ts,} 235MESON_ARGS+= -Dgallium-drivers=${GALLIUM_DRIVERS:ts,}
235MESON_ARGS+= -Ddri-drivers=${DRI_DRIVERS:ts,} 236MESON_ARGS+= -Ddri-drivers=${DRI_DRIVERS:ts,}
236MESON_ARGS+= -Dvulkan-drivers=${VULKAN_DRIVERS:ts,} 237MESON_ARGS+= -Dvulkan-drivers=${VULKAN_DRIVERS:ts,}
237MESON_ARGS+= -Dplatforms=${EGL_PLATFORMS:ts,} 238MESON_ARGS+= -Dplatforms=${EGL_PLATFORMS:ts,}
238.else # !dri 239.else # !dri
239PLIST_SUBST+= GLVER="1.6.0" 240PLIST_SUBST+= GLVER="1.6.0"
240MESON_ARGS+= -Dgallium-drivers= 241MESON_ARGS+= -Dgallium-drivers=
241MESON_ARGS+= -Ddri-drivers= 242MESON_ARGS+= -Ddri-drivers=
242MESON_ARGS+= -Dvulkan-drivers= 243MESON_ARGS+= -Dvulkan-drivers=
243MESON_ARGS+= -Ddri3=false 244MESON_ARGS+= -Ddri3=false