Sat Jan 26 21:28:29 2019 UTC ()
MesaLib18: don't need the llvm toolchain, just the lib. Bump rev.


(tnn)
diff -r1.15 -r1.16 pkgsrc/graphics/MesaLib18/Makefile
diff -r1.10 -r1.11 pkgsrc/graphics/MesaLib18/options.mk
cvs diff -r1.15 -r1.16 pkgsrc/graphics/MesaLib18/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib18/Attic/Makefile 2019/01/19 23:21:43 1.15
+++ pkgsrc/graphics/MesaLib18/Attic/Makefile 2019/01/26 21:28:29 1.16
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1# $NetBSD: Makefile,v 1.15 2019/01/19 23:21:43 tnn Exp $ 1# $NetBSD: Makefile,v 1.16 2019/01/26 21:28:29 tnn Exp $
2 2
3DISTNAME= mesa-18.3.2 3DISTNAME= mesa-18.3.2
 4PKGREVISION= 1
4PKGNAME= ${DISTNAME:S/mesa/MesaLib/} 5PKGNAME= ${DISTNAME:S/mesa/MesaLib/}
5CATEGORIES= graphics x11 6CATEGORIES= graphics x11
6MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/ 7MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/
7# MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/ 8# MASTER_SITES= ftp://ftp.freedesktop.org/pub/mesa/${PKGVERSION_NOREV}/
8EXTRACT_SUFX= .tar.xz 9EXTRACT_SUFX= .tar.xz
9 10
10MAINTAINER= pkgsrc-users@NetBSD.org 11MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= https://www.mesa3d.org/ 12HOMEPAGE= https://www.mesa3d.org/
12COMMENT= The Mesa 3D Graphics Library 13COMMENT= The Mesa 3D Graphics Library
13LICENSE= mit 14LICENSE= mit
14 15
15GNU_CONFIGURE= yes 16GNU_CONFIGURE= yes
16USE_TOOLS+= autoconf automake autoreconf bison pkg-config gmake flex 17USE_TOOLS+= autoconf automake autoreconf bison pkg-config gmake flex
cvs diff -r1.10 -r1.11 pkgsrc/graphics/MesaLib18/Attic/options.mk (expand / switch to unified diff)

--- pkgsrc/graphics/MesaLib18/Attic/options.mk 2019/01/19 21:54:03 1.10
+++ pkgsrc/graphics/MesaLib18/Attic/options.mk 2019/01/26 21:28:29 1.11
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: options.mk,v 1.10 2019/01/19 21:54:03 tnn Exp $ 1# $NetBSD: options.mk,v 1.11 2019/01/26 21:28:29 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib 3PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
4PKG_SUPPORTED_OPTIONS= llvm dri 4PKG_SUPPORTED_OPTIONS= llvm dri
5PKG_SUGGESTED_OPTIONS= 5PKG_SUGGESTED_OPTIONS=
6 6
7PKG_SUPPORTED_OPTIONS+= glx-tls xvmc debug 7PKG_SUPPORTED_OPTIONS+= glx-tls xvmc debug
8PKG_SUPPORTED_OPTIONS+= vdpau vaapi 8PKG_SUPPORTED_OPTIONS+= vdpau vaapi
9PKG_SUPPORTED_OPTIONS+= osmesa 9PKG_SUPPORTED_OPTIONS+= osmesa
10PKG_SUPPORTED_OPTIONS+= glesv1 glesv2 10PKG_SUPPORTED_OPTIONS+= glesv1 glesv2
11PKG_SUPPORTED_OPTIONS+= xa 11PKG_SUPPORTED_OPTIONS+= xa
12PKG_SUPPORTED_OPTIONS+= noatexit 12PKG_SUPPORTED_OPTIONS+= noatexit
13PKG_SUPPORTED_OPTIONS+= vulkan 13PKG_SUPPORTED_OPTIONS+= vulkan
14 14
@@ -238,29 +238,28 @@ PLIST.xatracker= yes @@ -238,29 +238,28 @@ PLIST.xatracker= yes
238# AMD Radeon r300 238# AMD Radeon r300
239PLIST.r300= yes 239PLIST.r300= yes
240GALLIUM_DRIVERS+= r300 240GALLIUM_DRIVERS+= r300
241# AMD Canary Islands GPUs 241# AMD Canary Islands GPUs
242PLIST.radeonsi= yes 242PLIST.radeonsi= yes
243GALLIUM_DRIVERS+= radeonsi 243GALLIUM_DRIVERS+= radeonsi
244CONFIGURE_ARGS+= --enable-llvm 244CONFIGURE_ARGS+= --enable-llvm
245CONFIGURE_ARGS+= --enable-llvm-shared-libs 245CONFIGURE_ARGS+= --enable-llvm-shared-libs
246 246
247.if !exists(/usr/include/libelf.h) 247.if !exists(/usr/include/libelf.h)
248.include "../../devel/libelf/buildlink3.mk" 248.include "../../devel/libelf/buildlink3.mk"
249.endif 249.endif
250 250
251# XXX update libLLVM to use it instead 251BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=7.0
252#BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=5.0 252.include "../../lang/libLLVM/buildlink3.mk"
253.include "../../lang/llvm/buildlink3.mk" 
254CONFIGURE_ENV+= ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH} 253CONFIGURE_ENV+= ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH}
255.else # !llvm 254.else # !llvm
256CONFIGURE_ARGS+= --disable-xa 255CONFIGURE_ARGS+= --disable-xa
257CONFIGURE_ARGS+= --disable-llvm 256CONFIGURE_ARGS+= --disable-llvm
258CONFIGURE_ARGS+= --disable-llvm-shared-libs 257CONFIGURE_ARGS+= --disable-llvm-shared-libs
259.endif # llvm 258.endif # llvm
260 259
261CONFIGURE_ARGS+= --with-gallium-drivers=${GALLIUM_DRIVERS:ts,} 260CONFIGURE_ARGS+= --with-gallium-drivers=${GALLIUM_DRIVERS:ts,}
262CONFIGURE_ARGS+= --with-dri-drivers=${DRI_DRIVERS:ts,} 261CONFIGURE_ARGS+= --with-dri-drivers=${DRI_DRIVERS:ts,}
263CONFIGURE_ARGS+= --with-vulkan-drivers=${VULKAN_DRIVERS:ts,} 262CONFIGURE_ARGS+= --with-vulkan-drivers=${VULKAN_DRIVERS:ts,}
264 263
265.else # !dri 264.else # !dri
266CONFIGURE_ARGS+= --with-gallium-drivers= 265CONFIGURE_ARGS+= --with-gallium-drivers=