pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/graphics/MesaLib18 more MesaLib18 fixes ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/f66db9b04cb0
branches: trunk
changeset: 318050:f66db9b04cb0
user: tnn <tnn%pkgsrc.org@localhost>
date: Fri Jan 18 14:43:59 2019 +0000
description:
more MesaLib18 fixes ...
- Someone has commented out the i915 driver. (Why?) Put it back.
- can build with python3
- remove & coalesce unused PLIST vars
- Add option toggle for vulkan (probs only relevant on Linux for now)
diffstat:
graphics/MesaLib18/Makefile | 7 ++++---
graphics/MesaLib18/PLIST | 13 +++++++++----
graphics/MesaLib18/options.mk | 33 ++++++++++++++++++++-------------
3 files changed, 33 insertions(+), 20 deletions(-)
diffs (155 lines):
diff -r 017ae0f60adf -r f66db9b04cb0 graphics/MesaLib18/Makefile
--- a/graphics/MesaLib18/Makefile Fri Jan 18 14:39:55 2019 +0000
+++ b/graphics/MesaLib18/Makefile Fri Jan 18 14:43:59 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2019/01/18 13:32:47 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2019/01/18 14:43:59 tnn Exp $
DISTNAME= mesa-18.3.2
PKGNAME= ${DISTNAME:S/mesa/MesaLib/}
@@ -70,9 +70,10 @@
.endif
PYTHON_FOR_BUILD_ONLY= yes
-PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 37 # as of 11.2.2
BUILD_DEPENDS+= ${PYPKGPREFIX}-mako-[0-9]*:../../devel/py-mako
-CONFIGURE_ENV+= ac_cv_prog_PYTHON2=${PYTHONBIN}
+# needed to build vulkan support
+BUILD_DEPENDS+= ${PYPKGPREFIX}-cElementTree-[0-9]*:../../textproc/py-cElementTree
+CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
.include "../../lang/python/tool.mk"
# Handle platforms without exp2
diff -r 017ae0f60adf -r f66db9b04cb0 graphics/MesaLib18/PLIST
--- a/graphics/MesaLib18/PLIST Fri Jan 18 14:39:55 2019 +0000
+++ b/graphics/MesaLib18/PLIST Fri Jan 18 14:43:59 2019 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2019/01/10 22:30:10 tnn Exp $
+@comment $NetBSD: PLIST,v 1.3 2019/01/18 14:43:59 tnn Exp $
${PLIST.dri}include/EGL/egl.h
${PLIST.dri}include/EGL/eglext.h
${PLIST.dri}include/EGL/eglextchromium.h
@@ -27,20 +27,21 @@
${PLIST.glesv2}include/GLES3/gl3platform.h
${PLIST.dri}include/KHR/khrplatform.h
${PLIST.gbm}include/gbm.h
+${PLIST.vulkan}include/vulkan/vulkan_intel.h
${PLIST.xatracker}include/xa_composite.h
${PLIST.xatracker}include/xa_context.h
${PLIST.xatracker}include/xa_tracker.h
@comment ${PLIST.vaapi}lib/dri/gallium_drv_video.la
@comment ${PLIST.vaapi}lib/dri/gallium_drv_video.so
-${PLIST.i915_dri}lib/dri/i915_dri.so
-${PLIST.i965_dri}lib/dri/i965_dri.so
+${PLIST.i915}lib/dri/i915_dri.so
+${PLIST.i965}lib/dri/i965_dri.so
@comment ${PLIST.ilo}lib/dri/ilo_dri.so
${PLIST.freedreno}lib/dri/kgsl_dri.so
${PLIST.swrast}lib/dri/kms_swrast_dri.so
${PLIST.freedreno}lib/dri/msm_dri.so
${PLIST.nouveau}lib/dri/nouveau_dri.so
${PLIST.nouveau_dri}lib/dri/nouveau_vieux_dri.so
-${PLIST.r200_dri}lib/dri/r200_dri.so
+${PLIST.r200}lib/dri/r200_dri.so
${PLIST.r300}lib/dri/r300_dri.so
${PLIST.r600}lib/dri/r600_dri.so
${PLIST.radeon_dri}lib/dri/radeon_dri.so
@@ -96,4 +97,8 @@
${PLIST.vaapi}lib/dri/r600_drv_video.so
@comment ${PLIST.vdpau}lib/dri/radeonsi_drv_video.la
${PLIST.vaapi}lib/dri/radeonsi_drv_video.so
+${PLIST.vulkan}lib/libvulkan_intel.la
+${PLIST.vulkan}lib/libvulkan_radeon.la
+${PLIST.vulkan}share/vulkan/icd.d/intel_icd.${MACHINE_ARCH}.json
+${PLIST.vulkan}share/vulkan/icd.d/radeon_icd.${MACHINE_ARCH}.json
share/examples/mesa/00-mesa-defaults.conf
diff -r 017ae0f60adf -r f66db9b04cb0 graphics/MesaLib18/options.mk
--- a/graphics/MesaLib18/options.mk Fri Jan 18 14:39:55 2019 +0000
+++ b/graphics/MesaLib18/options.mk Fri Jan 18 14:43:59 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2019/01/18 13:32:47 tnn Exp $
+# $NetBSD: options.mk,v 1.5 2019/01/18 14:43:59 tnn Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
PKG_SUPPORTED_OPTIONS= llvm dri
@@ -12,6 +12,7 @@
PKG_SUPPORTED_OPTIONS+= xa
PKG_SUPPORTED_OPTIONS+= noatexit
PKG_SUPPORTED_OPTIONS+= libelf
+PKG_SUPPORTED_OPTIONS+= vulkan
# PKG_SUGGESTED_OPTIONS+= xvmc
PKG_SUGGESTED_OPTIONS+= vdpau vaapi
@@ -58,10 +59,10 @@
.include "../../mk/bsd.options.mk"
# gallium
-PLIST_VARS+= freedreno ilo i915 i965 nouveau r300 r600 radeonsi \
- swrast svga vc4 virgl
+PLIST_VARS+= freedreno i915 i965 nouveau r300 r600 radeonsi \
+ swrast svga vc4 virgl vulkan
# classic DRI
-PLIST_VARS+= dri swrast_dri i915_dri nouveau_dri i965_dri radeon_dri r200_dri
+PLIST_VARS+= dri swrast_dri nouveau_dri radeon_dri r200
# other features
PLIST_VARS+= gbm vaapi vdpau wayland xatracker
PLIST_VARS+= osmesa xvmc
@@ -130,6 +131,7 @@
DRI_DRIVERS= #
GALLIUM_DRIVERS= #
+VULKAN_DRIVERS= #
# Software rasterizer
PLIST.swrast_dri= yes
@@ -147,17 +149,20 @@
# Intel chipsets, x86 only
PLIST.i915= yes
-# GALLIUM_DRIVERS+= i915
-PLIST.i915_dri= yes
+GALLIUM_DRIVERS+= i915
DRI_DRIVERS+= i915
-# ilo is being phased out in favor of Vulkan
-# Experimental Intel driver
-# PLIST.ilo= yes
-# GALLIUM_DRIVERS+= ilo
+PLIST.i965= yes
+DRI_DRIVERS+= i965
+
+.endif
-PLIST.i965_dri= yes
-DRI_DRIVERS+= i965
+# Vulkan support
+.if !empty(PKG_OPTIONS:Mvulkan)
+VULKAN_DRIVERS+= intel
+VULKAN_DRIVERS+= radeon
+PLIST.intel_vulkan= yes
+PLIST.radeon_vulkan= yes
.endif
# ARM drivers
@@ -201,7 +206,7 @@
DRI_DRIVERS+= radeon
# classic DRI r200
-PLIST.r200_dri= yes
+PLIST.r200= yes
DRI_DRIVERS+= r200
# FreeBSD lacks nouveau support (there are official binaries from Nvidia)
@@ -271,10 +276,12 @@
CONFIGURE_ARGS+= --with-gallium-drivers=${GALLIUM_DRIVERS:ts,}
CONFIGURE_ARGS+= --with-dri-drivers=${DRI_DRIVERS:ts,}
+CONFIGURE_ARGS+= --with-vulkan-drivers=${VULKAN_DRIVERS:ts,}
.else # !dri
CONFIGURE_ARGS+= --with-gallium-drivers=
CONFIGURE_ARGS+= --with-dri-drivers=
+CONFIGURE_ARGS+= --with-vulkan-drivers=
CONFIGURE_ARGS+= --disable-dri
CONFIGURE_ARGS+= --disable-dri3
CONFIGURE_ARGS+= --disable-egl
Home |
Main Index |
Thread Index |
Old Index