pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/graphics/MesaLib18
Module Name: pkgsrc
Committed By: nia
Date: Wed Aug 21 12:21:28 UTC 2019
Modified Files:
pkgsrc/graphics/MesaLib18: Makefile PLIST buildlink3.mk builtin.mk
dri.mk options.mk
Log Message:
MesaLib18: Add Wayland support.
Note: It doesn't seem to be possible to build Mesa without X11 support yet.
While here,
- Fix building with non-modular X.
- Appease pkglint and my eyes.
To generate a diff of this commit:
cvs rdiff -u -r1.20 -r1.21 pkgsrc/graphics/MesaLib18/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/graphics/MesaLib18/PLIST
cvs rdiff -u -r1.2 -r1.3 pkgsrc/graphics/MesaLib18/buildlink3.mk \
pkgsrc/graphics/MesaLib18/dri.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/graphics/MesaLib18/builtin.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/graphics/MesaLib18/options.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/graphics/MesaLib18/Makefile
diff -u pkgsrc/graphics/MesaLib18/Makefile:1.20 pkgsrc/graphics/MesaLib18/Makefile:1.21
--- pkgsrc/graphics/MesaLib18/Makefile:1.20 Thu Apr 25 07:32:56 2019
+++ pkgsrc/graphics/MesaLib18/Makefile Wed Aug 21 12:21:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2019/04/25 07:32:56 maya Exp $
+# $NetBSD: Makefile,v 1.21 2019/08/21 12:21:28 nia Exp $
DISTNAME= mesa-18.3.4
PKGNAME= ${DISTNAME:S/mesa/MesaLib/}
@@ -52,11 +52,11 @@ SUBST_SED.wrapper-bug+= -e 's,libglapi_
SUBST_SED.wrapper-bug+= -e 's,libglapi_tmp_rename_la,libglapi_la,g'
# Replace /etc/drirc.d with ${PREFIX}/etc/drirc.d
-SUBST_CLASSES+= drirc
-SUBST_STAGE.drirc= pre-configure
-SUBST_MESSAGE.drirc= Fixing hardcoded /etc/drirc.d references
-SUBST_FILES.drirc+= src/util/xmlconfig.c
-SUBST_SED.drirc+= -e 's|/etc|${PREFIX}/etc|g'
+SUBST_CLASSES+= drirc
+SUBST_STAGE.drirc= pre-configure
+SUBST_MESSAGE.drirc= Fixing hardcoded /etc/drirc.d references
+SUBST_FILES.drirc+= src/util/xmlconfig.c
+SUBST_SED.drirc+= -e 's|/etc|${PREFIX}/etc|g'
CFLAGS.SunOS+= -D__EXTENSIONS__ -D_POSIX_PTHREAD_SEMANTICS
CXXFLAGS.SunOS+= -Drestrict=__restrict__
@@ -102,9 +102,10 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/src/util/00-mesa-defaults.conf ${DESTDIR}${EGDIR}
.include "../../devel/zlib/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
.include "../../x11/libXrandr/buildlink3.mk"
.include "../../x11/libX11/buildlink3.mk"
.include "../../x11/libXext/buildlink3.mk"
.include "../../x11/libxcb/buildlink3.mk"
-.include "../../textproc/expat/buildlink3.mk"
+.include "../../x11/libxshmfence/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Index: pkgsrc/graphics/MesaLib18/PLIST
diff -u pkgsrc/graphics/MesaLib18/PLIST:1.5 pkgsrc/graphics/MesaLib18/PLIST:1.6
--- pkgsrc/graphics/MesaLib18/PLIST:1.5 Sat Jan 19 21:54:03 2019
+++ pkgsrc/graphics/MesaLib18/PLIST Wed Aug 21 12:21:28 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2019/01/19 21:54:03 tnn Exp $
+@comment $NetBSD: PLIST,v 1.6 2019/08/21 12:21:28 nia Exp $
${PLIST.egl}include/EGL/egl.h
${PLIST.egl}include/EGL/eglext.h
${PLIST.egl}include/EGL/eglextchromium.h
@@ -11,8 +11,8 @@ include/GL/glext.h
include/GL/glx.h
include/GL/glx_mangle.h
include/GL/glxext.h
-${PLIST.osmesa}include/GL/osmesa.h
${PLIST.dri}include/GL/internal/dri_interface.h
+${PLIST.osmesa}include/GL/osmesa.h
${PLIST.glesv1}include/GLES/egl.h
${PLIST.glesv1}include/GLES/gl.h
${PLIST.glesv1}include/GLES/glext.h
@@ -40,12 +40,18 @@ ${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
+@comment ${PLIST.vdpau}lib/dri/nouveau_drv_video.la
+${PLIST.nouveau}${PLIST.vaapi}lib/dri/nouveau_drv_video.so
${PLIST.nouveau_dri}lib/dri/nouveau_vieux_dri.so
+@comment ${PLIST.vdpau}lib/dri/radeonsi_drv_video.la
${PLIST.r200}lib/dri/r200_dri.so
${PLIST.r300}lib/dri/r300_dri.so
${PLIST.r600}lib/dri/r600_dri.so
+@comment ${PLIST.vdpau}lib/dri/r600_drv_video.la
+${PLIST.vaapi}lib/dri/r600_drv_video.so
${PLIST.radeon_dri}lib/dri/radeon_dri.so
${PLIST.radeonsi}lib/dri/radeonsi_dri.so
+${PLIST.vaapi}lib/dri/radeonsi_drv_video.so
${PLIST.swrast_dri}lib/dri/swrast_dri.so
${PLIST.vc4}lib/dri/vc4_dri.so
${PLIST.svga}lib/dri/vmwgfx_dri.so
@@ -64,16 +70,16 @@ ${PLIST.xvmc}${PLIST.r600}lib/libXvMCr60
${PLIST.xvmc}${PLIST.r600}lib/libXvMCr600.so.1.0.0
${PLIST.gbm}lib/libgbm.la
lib/libglapi.la
-${PLIST.wayland}lib/libwayland-egl.la
+${PLIST.vulkan}lib/libvulkan_intel.la
+${PLIST.vulkan}lib/libvulkan_radeon.la
${PLIST.xatracker}lib/libxatracker.la
${PLIST.dri}lib/pkgconfig/dri.pc
${PLIST.egl}lib/pkgconfig/egl.pc
${PLIST.gbm}lib/pkgconfig/gbm.pc
-${PLIST.osmesa}lib/pkgconfig/osmesa.pc
lib/pkgconfig/gl.pc
${PLIST.glesv1}lib/pkgconfig/glesv1_cm.pc
${PLIST.glesv2}lib/pkgconfig/glesv2.pc
-${PLIST.wayland}lib/pkgconfig/wayland-egl.pc
+${PLIST.osmesa}lib/pkgconfig/osmesa.pc
${PLIST.xatracker}lib/pkgconfig/xatracker.pc
${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so
${PLIST.nouveau}${PLIST.vdpau}lib/vdpau/libvdpau_nouveau.so.1
@@ -91,14 +97,6 @@ ${PLIST.vdpau}lib/vdpau/libvdpau_radeons
${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1
${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1.0
${PLIST.vdpau}lib/vdpau/libvdpau_radeonsi.so.1.0.0
-@comment ${PLIST.vdpau}lib/dri/nouveau_drv_video.la
-${PLIST.nouveau}${PLIST.vaapi}lib/dri/nouveau_drv_video.so
-@comment ${PLIST.vdpau}lib/dri/r600_drv_video.la
-${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
Index: pkgsrc/graphics/MesaLib18/buildlink3.mk
diff -u pkgsrc/graphics/MesaLib18/buildlink3.mk:1.2 pkgsrc/graphics/MesaLib18/buildlink3.mk:1.3
--- pkgsrc/graphics/MesaLib18/buildlink3.mk:1.2 Wed Oct 10 11:03:02 2018
+++ pkgsrc/graphics/MesaLib18/buildlink3.mk Wed Aug 21 12:21:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2018/10/10 11:03:02 maya Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2019/08/21 12:21:28 nia Exp $
BUILDLINK_TREE+= MesaLib
@@ -13,8 +13,8 @@ BUILDLINK_PKGSRCDIR.MesaLib?= ../../grap
.if ${X11_TYPE} == "modular"
BUILDLINK_ABI_DEPENDS.MesaLib+= MesaLib>=10.5.3
-# This is needed to avoid linking conflicting libstdc++ versions
. if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mc++)
+# This is needed to avoid linking conflicting libstdc++ versions
GCC_REQD+= 4.2
. endif
.endif
@@ -42,9 +42,8 @@ MESALIB_SUPPORTS_EGL= yes
MESALIB_SUPPORTS_EGL= no
.endif
-.include "../../mk/pthread.buildlink3.mk"
-
.include "../../x11/libXext/buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
.endif # MESALIB_BUILDLINK3_MK
BUILDLINK_TREE+= -MesaLib
Index: pkgsrc/graphics/MesaLib18/dri.mk
diff -u pkgsrc/graphics/MesaLib18/dri.mk:1.2 pkgsrc/graphics/MesaLib18/dri.mk:1.3
--- pkgsrc/graphics/MesaLib18/dri.mk:1.2 Thu Apr 11 16:27:03 2019
+++ pkgsrc/graphics/MesaLib18/dri.mk Wed Aug 21 12:21:28 2019
@@ -1,33 +1,31 @@
-# $NetBSD: dri.mk,v 1.2 2019/04/11 16:27:03 maya Exp $
+# $NetBSD: dri.mk,v 1.3 2019/08/21 12:21:28 nia Exp $
#
# Currently, this is for convenience only.
#
.if !defined(DRI_MK)
DRI_MK= # defined
-. if !defined(USE_BUILTIN.MesaLib)
+.if !defined(USE_BUILTIN.MesaLib)
CHECK_BUILTIN.MesaLib:= yes
-. include "../../graphics/MesaLib/builtin.mk"
+. include "../../graphics/MesaLib/builtin.mk"
CHECK_BUILTIN.MesaLib:= no
-. endif
+.endif
-. if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
-. if ${OPSYS} != "Darwin"
+.if !empty(USE_BUILTIN.MesaLib:M[Nn][Oo])
+. if ${OPSYS} != "Darwin"
BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.60
-. endif
-. if ${OPSYS} == "Linux"
+. endif
+. if ${OPSYS} == "Linux"
BUILDLINK_API_DEPENDS.libxcb+= libxcb>=1.9.3
-. endif
. endif
-. include "../../x11/xorgproto/buildlink3.mk"
+.endif
+.include "../../x11/xorgproto/buildlink3.mk"
# XXX these do not have builtin.mk
-. if ${X11_TYPE} == "modular"
-. include "../../x11/libxshmfence/buildlink3.mk"
-. endif
-. include "../../x11/libXdamage/buildlink3.mk"
-. include "../../x11/libXfixes/buildlink3.mk"
-. include "../../x11/libXxf86vm/buildlink3.mk"
-. if ${OPSYS} != "Darwin"
-. include "../../x11/libdrm/buildlink3.mk"
-. endif
+.include "../../x11/libxshmfence/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
+.include "../../x11/libXfixes/buildlink3.mk"
+.include "../../x11/libXxf86vm/buildlink3.mk"
+.if ${OPSYS} != "Darwin"
+. include "../../x11/libdrm/buildlink3.mk"
+.endif
.endif
Index: pkgsrc/graphics/MesaLib18/builtin.mk
diff -u pkgsrc/graphics/MesaLib18/builtin.mk:1.1 pkgsrc/graphics/MesaLib18/builtin.mk:1.2
--- pkgsrc/graphics/MesaLib18/builtin.mk:1.1 Sun Oct 7 23:49:31 2018
+++ pkgsrc/graphics/MesaLib18/builtin.mk Wed Aug 21 12:21:28 2019
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.1 2018/10/07 23:49:31 ryoon Exp $
+# $NetBSD: builtin.mk,v 1.2 2019/08/21 12:21:28 nia Exp $
BUILTIN_PKG:= MesaLib
@@ -22,6 +22,7 @@ IS_BUILTIN.MesaLib= yes
IS_BUILTIN.MesaLib= no
. endif
.endif
+
MAKEVARS+= IS_BUILTIN.MesaLib
###
@@ -67,6 +68,7 @@ USE_BUILTIN.MesaLib!= \
. endif
. endif # PREFER.MesaLib
.endif
+
MAKEVARS+= USE_BUILTIN.MesaLib
###
Index: pkgsrc/graphics/MesaLib18/options.mk
diff -u pkgsrc/graphics/MesaLib18/options.mk:1.12 pkgsrc/graphics/MesaLib18/options.mk:1.13
--- pkgsrc/graphics/MesaLib18/options.mk:1.12 Thu Apr 11 16:27:03 2019
+++ pkgsrc/graphics/MesaLib18/options.mk Wed Aug 21 12:21:28 2019
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.12 2019/04/11 16:27:03 maya Exp $
+# $NetBSD: options.mk,v 1.13 2019/08/21 12:21:28 nia Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.MesaLib
-PKG_SUPPORTED_OPTIONS= llvm dri
+PKG_SUPPORTED_OPTIONS= llvm dri wayland
PKG_SUGGESTED_OPTIONS=
PKG_SUPPORTED_OPTIONS+= glx-tls xvmc debug
@@ -58,62 +58,74 @@ PLIST_VARS+= egl gbm vaapi vdpau wayland
PLIST_VARS+= osmesa xvmc
PLIST_VARS+= glesv1 glesv2
-.if !empty(PKG_OPTIONS:Mdri)
+EGL_PLATFORMS+= x11
+.if ${OPSYS} != "Darwin"
+EGL_PLATFORMS+= drm
+.endif
+
+.if !empty(PKG_OPTIONS:Mwayland)
+EGL_PLATFORMS+= wayland
+PLIST.wayland= yes
+.include "../../devel/wayland/buildlink3.mk"
+.include "../../devel/wayland-protocols/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mdri)
CONFIGURE_ARGS+= --enable-dri
# Having DRI3 and egl compiled in by default doesn't hurt, the X server
# will only use it if it is supported at run time.
CONFIGURE_ARGS+= --enable-dri3
-.if ${OPSYS} != "Darwin"
+. if ${OPSYS} != "Darwin"
CONFIGURE_ARGS+= --enable-egl
CONFIGURE_ARGS+= --enable-gbm
PLIST.egl= yes
PLIST.gbm= yes
-.else
+. else
CONFIGURE_ARGS+= --disable-egl
CONFIGURE_ARGS+= --disable-gbm
-.endif
+. endif
-.if !empty(PKG_OPTIONS:Mosmesa)
+. if !empty(PKG_OPTIONS:Mosmesa)
CONFIGURE_ARGS+= --enable-osmesa
PLIST.osmesa= yes
-.endif
+. endif
-.if !empty(PKG_OPTIONS:Mglesv1)
+. if !empty(PKG_OPTIONS:Mglesv1)
CONFIGURE_ARGS+= --enable-gles1
PLIST.glesv1= yes
-.else
+. else
CONFIGURE_ARGS+= --disable-gles1
-.endif
+. endif
-.if !empty(PKG_OPTIONS:Mglesv2)
+. if !empty(PKG_OPTIONS:Mglesv2)
CONFIGURE_ARGS+= --enable-gles2
PLIST.glesv2= yes
-.else
+. else
CONFIGURE_ARGS+= --disable-gles2
-.endif
+. endif
-.if !empty(PKG_OPTIONS:Mglx-tls)
+. if !empty(PKG_OPTIONS:Mglx-tls)
# Recommended by
# http://www.freedesktop.org/wiki/Software/Glamor/
CONFIGURE_ARGS+= --enable-glx-tls
-.else
+. else
# (EE) Failed to load /usr/pkg/lib/xorg/modules/extensions/libglx.so:
# /usr/pkg/lib/libGL.so.1: Use of initialized Thread Local Storage with model
# initial-exec and dlopen is not supported
CONFIGURE_ARGS+= --disable-glx-tls
-.endif # glx-tls
+. endif # glx-tls
# DRI on Linux needs either sysfs or udev
CONFIGURE_ARGS.Linux+= --enable-sysfs
PLIST.dri= yes
-.if ${OPSYS} != "Darwin"
+. if ${OPSYS} != "Darwin"
BUILDLINK_DEPMETHOD.libpciaccess= full
-.include "../../sysutils/libpciaccess/buildlink3.mk"
-.endif
-.include "../../graphics/MesaLib/dri.mk"
+. include "../../sysutils/libpciaccess/buildlink3.mk"
+. endif
+. include "../../graphics/MesaLib/dri.mk"
DRI_DRIVERS= #
GALLIUM_DRIVERS= #
@@ -122,13 +134,13 @@ VULKAN_DRIVERS= #
# Software rasterizer
PLIST.swrast_dri= yes
DRI_DRIVERS+= swrast
-.if ${OPSYS} != "Darwin"
+. if ${OPSYS} != "Darwin"
PLIST.swrast= yes
GALLIUM_DRIVERS+= swrast
-.endif
+. endif
# x86 only drivers
-.if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "Darwin"
+. if (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64") && ${OPSYS} != "Darwin"
# svga / VMWare driver
PLIST.svga= yes
GALLIUM_DRIVERS+= svga
@@ -141,17 +153,17 @@ DRI_DRIVERS+= i915
PLIST.i965= yes
DRI_DRIVERS+= i965
-.endif
+. endif
# Vulkan support
-.if !empty(PKG_OPTIONS:Mvulkan)
+. if !empty(PKG_OPTIONS:Mvulkan)
VULKAN_DRIVERS+= intel
VULKAN_DRIVERS+= radeon
PLIST.vulkan= yes
-.endif
+. endif
# ARM drivers
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
+. if !empty(MACHINE_PLATFORM:MNetBSD-*-*arm*)
# Qualcomm SnapDragon, libdrm_freedreno.pc
#GALLIUM_DRIVERS+= freedreno
#PLIST.freedreno= yes
@@ -159,17 +171,17 @@ PLIST.vulkan= yes
# Broadcom VideoCore 4
GALLIUM_DRIVERS+= vc4
PLIST.vc4= yes
-.endif
+. endif
# qemu Linux guest driver
-.if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
+. if !empty(MACHINE_PLATFORM:MLinux-*-x86_64)
# XXX test this
#GALLIUM_DRIVERS+= virgl
#PLIST.virgl= yes
-.endif
+. endif
# theoretically cross platform PCI drivers
-.if ${OPSYS} != "Darwin" && empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) && \
+. if ${OPSYS} != "Darwin" && empty(MACHINE_PLATFORM:MNetBSD-*-*arm*) && \
empty(MACHINE_PLATFORM:MNetBSD-*-mipsel)
# AMD Radeon r600
@@ -180,11 +192,11 @@ GALLIUM_DRIVERS+= r600
# FULL_OS_VERSION= ${FULL_OS_VERSION_CMD:sh}
# FreeBSD lacks nouveau support (there are official binaries from Nvidia)
-.if ${OPSYS} != "FreeBSD"
+. if ${OPSYS} != "FreeBSD"
# nVidia
PLIST.nouveau= yes
GALLIUM_DRIVERS+= nouveau
-.endif
+. endif
# classic DRI radeon
PLIST.radeon_dri= yes
@@ -195,45 +207,36 @@ PLIST.r200= yes
DRI_DRIVERS+= r200
# FreeBSD lacks nouveau support (there are official binaries from Nvidia)
-.if ${OPSYS} != "FreeBSD"
+. if ${OPSYS} != "FreeBSD"
# classic DRI nouveau
PLIST.nouveau_dri= yes
DRI_DRIVERS+= nouveau
-.endif
-.endif # cross platform PCI drivers
-
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+= --with-platforms=x11
-#.elif ${OPSYS} == "Linux"
-#.include "../../wip/wayland/buildlink3.mk"
-#CONFIGURE_ARGS+= --with-platforms=x11,drm,wayland
-#PLIST.wayland= yes
-.else
-CONFIGURE_ARGS+= --with-platforms=x11,drm
-.endif
+. endif
+. endif
+# end cross platform PCI drivers
-.if !empty(PKG_OPTIONS:Mllvm)
+. if !empty(PKG_OPTIONS:Mllvm)
# VA-API and VDPAU
-.if !empty(PKG_OPTIONS:Mvaapi)
-.include "../../multimedia/libva/available.mk"
-.if ${VAAPI_AVAILABLE} == "yes"
+. if !empty(PKG_OPTIONS:Mvaapi)
+. include "../../multimedia/libva/available.mk"
+. if ${VAAPI_AVAILABLE} == "yes"
PLIST.vaapi= yes
-.include "../../multimedia/libva/buildlink3.mk"
-.endif
-.endif # vaapi
-.if !empty(PKG_OPTIONS:Mvdpau)
-.include "../../multimedia/libvdpau/available.mk"
-.if ${VDPAU_AVAILABLE} == "yes"
+. include "../../multimedia/libva/buildlink3.mk"
+. endif
+. endif # vaapi
+. if !empty(PKG_OPTIONS:Mvdpau)
+. include "../../multimedia/libvdpau/available.mk"
+. if ${VDPAU_AVAILABLE} == "yes"
PLIST.vdpau= yes
-.include "../../multimedia/libvdpau/buildlink3.mk"
-.endif
-.endif # vdpau
+. include "../../multimedia/libvdpau/buildlink3.mk"
+. endif
+. endif # vdpau
# XA is useful for accelerating xf86-video-vmware
-.if !empty(PKG_OPTIONS:Mxa)
+. if !empty(PKG_OPTIONS:Mxa)
CONFIGURE_ARGS+= --enable-xa
PLIST.xatracker= yes
-.endif
+. endif
# AMD Radeon r300
PLIST.r300= yes
@@ -244,22 +247,23 @@ GALLIUM_DRIVERS+= radeonsi
CONFIGURE_ARGS+= --enable-llvm
CONFIGURE_ARGS+= --enable-llvm-shared-libs
-.if !exists(/usr/include/libelf.h)
-.include "../../devel/libelf/buildlink3.mk"
-.endif
+. if !exists(/usr/include/libelf.h)
+. include "../../devel/libelf/buildlink3.mk"
+. endif
BUILDLINK_API_DEPENDS.libLLVM+= libLLVM>=7.0
-.include "../../lang/libLLVM/buildlink3.mk"
-CONFIGURE_ENV+= ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH}
-.else # !llvm
+. include "../../lang/libLLVM/buildlink3.mk"
+CONFIGURE_ENV+= ac_cv_path_ac_pt_LLVM_CONFIG=${LLVM_CONFIG_PATH:Q}
+. else # !llvm
CONFIGURE_ARGS+= --disable-xa
CONFIGURE_ARGS+= --disable-llvm
CONFIGURE_ARGS+= --disable-llvm-shared-libs
-.endif # llvm
+. endif # llvm
CONFIGURE_ARGS+= --with-gallium-drivers=${GALLIUM_DRIVERS:ts,}
CONFIGURE_ARGS+= --with-dri-drivers=${DRI_DRIVERS:ts,}
CONFIGURE_ARGS+= --with-vulkan-drivers=${VULKAN_DRIVERS:ts,}
+CONFIGURE_ARGS+= --with-platforms=${EGL_PLATFORMS:S/ /,/gW}
.else # !dri
CONFIGURE_ARGS+= --with-gallium-drivers=
@@ -273,9 +277,9 @@ CONFIGURE_ARGS+= --disable-gles1
CONFIGURE_ARGS+= --disable-gles2
CONFIGURE_ARGS+= --enable-xlib-glx
CONFIGURE_ARGS+= --with-platforms=x11
-.if !empty(PKG_OPTIONS:Mllvm)
+. if !empty(PKG_OPTIONS:Mllvm)
PKG_FAIL_REASON+= "The llvm PKG_OPTION must also be disabled when dri is disabled"
-.endif
+. endif
.endif # dri
.if !empty(PKG_OPTIONS:Mdebug)
@@ -283,8 +287,11 @@ CONFIGURE_ARGS+= --enable-debug
.endif
.if !empty(PKG_OPTIONS:Mxvmc)
+CONFIGURE_ARGS+= --enable-xvmc
.include "../../x11/libXvMC/buildlink3.mk"
PLIST.xvmc= yes
+.else
+CONFIGURE_ARGS+= --disable-xvmc
.endif
.if !empty(PKG_OPTIONS:Mnoatexit)
Home |
Main Index |
Thread Index |
Old Index