diff options
| author | tnn <tnn@pkgsrc.org> | 2022-08-02 20:36:51 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2022-08-02 20:36:51 +0000 |
| commit | a7691c31334e4ef7c94dd4cf6c6132d8ae420ea4 (patch) | |
| tree | 3e1a0ddf3e272e363055ce1edfdc1b2483aa6166 | |
| parent | 7f6335fb954b8b42bb7359ab0c6c4315f8466437 (diff) | |
| download | pkgsrc-a7691c31334e4ef7c94dd4cf6c6132d8ae420ea4.tar.gz | |
MesaLib: fix PLIST.xa; PLIST_VARS should not be conditionally assigned
| -rw-r--r-- | graphics/MesaLib/Makefile | 12 | ||||
| -rw-r--r-- | graphics/MesaLib/PLIST | 16 |
2 files changed, 15 insertions, 13 deletions
diff --git a/graphics/MesaLib/Makefile b/graphics/MesaLib/Makefile index 346227b0f0c..1e2ca4ef746 100644 --- a/graphics/MesaLib/Makefile +++ b/graphics/MesaLib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.201 2022/07/25 09:49:06 he Exp $ +# $NetBSD: Makefile,v 1.202 2022/08/02 20:36:51 tnn Exp $ DISTNAME= mesa-21.3.9 PKGNAME= ${DISTNAME:S/mesa/MesaLib/} @@ -43,7 +43,7 @@ PLIST_VARS+= i830 i915 i965 r100 r200 nouveau_dri PLIST_VARS+= r300 svga nouveau iris # other features -PLIST_VARS+= arm kms vaapi +PLIST_VARS+= arm kms vaapi xa .if ${MESALIB_SUPPORTS_DRI} == "yes" BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.100 @@ -53,18 +53,20 @@ BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.100 . endif MESON_ARGS+= -Degl=true MESON_ARGS+= -Dgbm=true -PLIST_VARS+= xa -. if empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) +. if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \ + ${MACHINE_ARCH:M*arm*} || ${MACHINE_CPU} == "aarch64" # XA state tracker requires at least one of the following gallium drivers: # nouveau, freedreno, i915, svga MESON_ARGS+= -Dgallium-xa=enabled PLIST.xa= yes +. else +MESON_ARGS+= -Dgallium-xa=disabled . endif . if ${X11_TYPE} == "native" && !exists(${X11BASE}/include/xcb/dri3.h) MESON_ARGS+= -Ddri3=false . endif PLIST.kms= yes -. if !empty(MACHINE_ARCH:M*arm*) || \ +. if ${MACHINE_ARCH:M*arm*} || \ ${MACHINE_CPU} == "aarch64" GALLIUM_DRIVERS+= freedreno vc4 etnaviv tegra panfrost lima PLIST.arm= yes diff --git a/graphics/MesaLib/PLIST b/graphics/MesaLib/PLIST index a2a8d3bd6b3..b371c96f2c6 100644 --- a/graphics/MesaLib/PLIST +++ b/graphics/MesaLib/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.48 2022/07/25 09:49:06 he Exp $ +@comment $NetBSD: PLIST,v 1.49 2022/08/02 20:36:51 tnn Exp $ ${PLIST.kms}include/EGL/egl.h ${PLIST.kms}include/EGL/eglext.h ${PLIST.kms}include/EGL/eglextchromium.h @@ -25,9 +25,9 @@ include/GLES3/gl3ext.h include/GLES3/gl3platform.h include/KHR/khrplatform.h ${PLIST.kms}include/gbm.h -${PLIST.xa}${PLIST.kms}include/xa_composite.h -${PLIST.xa}${PLIST.kms}include/xa_context.h -${PLIST.xa}${PLIST.kms}include/xa_tracker.h +${PLIST.xa}include/xa_composite.h +${PLIST.xa}include/xa_context.h +${PLIST.xa}include/xa_tracker.h ${PLIST.arm}lib/dri/armada-drm_dri.so ${PLIST.arm}lib/dri/etnaviv_dri.so ${PLIST.arm}lib/dri/exynos_dri.so @@ -100,9 +100,9 @@ ${PLIST.vulkan}${PLIST.arm}lib/libvulkan_freedreno.so ${PLIST.vulkan_intel}lib/libvulkan_intel.so ${PLIST.vulkan}lib/libvulkan_lvp.so ${PLIST.vulkan}lib/libvulkan_radeon.so -${PLIST.xa}${PLIST.kms}lib/libxatracker.so -${PLIST.xa}${PLIST.kms}lib/libxatracker.so.2 -${PLIST.xa}${PLIST.kms}lib/libxatracker.so.2.5.0 +${PLIST.xa}lib/libxatracker.so +${PLIST.xa}lib/libxatracker.so.2 +${PLIST.xa}lib/libxatracker.so.2.5.0 lib/pkgconfig/dri.pc ${PLIST.kms}lib/pkgconfig/egl.pc ${PLIST.kms}lib/pkgconfig/gbm.pc @@ -110,7 +110,7 @@ ${PLIST.glx}lib/pkgconfig/gl.pc lib/pkgconfig/glesv1_cm.pc lib/pkgconfig/glesv2.pc lib/pkgconfig/osmesa.pc -${PLIST.xa}${PLIST.kms}lib/pkgconfig/xatracker.pc +${PLIST.xa}lib/pkgconfig/xatracker.pc ${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so ${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1 ${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1.0 |