CVS commit: pkgsrc/x11/xf86-video-vmware

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun Jul  9 16:49:33 UTC 2023

Modified Files:
        pkgsrc/x11/xf86-video-vmware: Makefile
Added Files:
        pkgsrc/x11/xf86-video-vmware: options.mk

Log Message:
x11/xf86-video-vmware: Enable xatracker by default if X11_TYPE == modular

libxatracker is required for making use of DRM/KMS and its 3D acceleration
capability. It's a part of Mesa but isn't guaranteed to be built, e.g. the
native Mesa in NetBSD doesn't provide it.

Also enable udev support on Linux by default. It's seemingly used for
monitor hot-plugging.


To generate a diff of this commit:
cvs rdiff -u -r1.35 -r1.36 pkgsrc/x11/xf86-video-vmware/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/xf86-video-vmware/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/x11/xf86-video-vmware/Makefile
diff -u pkgsrc/x11/xf86-video-vmware/Makefile:1.35 pkgsrc/x11/xf86-video-vmware/Makefile:1.36
--- pkgsrc/x11/xf86-video-vmware/Makefile:1.35  Sun Jan 29 21:18:30 2023
+++ pkgsrc/x11/xf86-video-vmware/Makefile       Sun Jul  9 16:49:33 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2023/01/29 21:18:30 ryoon Exp $
+# $NetBSD: Makefile,v 1.36 2023/07/09 16:49:33 pho Exp $
 
 DISTNAME=      xf86-video-vmware-13.4.0
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=  .tar.xz
@@ -9,6 +9,7 @@ EXTRACT_SUFX=   .tar.xz
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://xorg.freedesktop.org/
 COMMENT=       Modular Xorg VMware virtual video driver
+LICENSE=       mit
 
 USE_LIBTOOL=   yes
 GNU_CONFIGURE= yes
@@ -18,23 +19,9 @@ RELRO_SUPPORTED=     partial
 
 CONFIGURE_ENV.SunOS+=  DRIVER_MAN_SUFFIX=4
 
-ONLY_FOR_PLATFORM+=    *-*-i386 *-*-x86_64
+ONLY_FOR_PLATFORM+=    *-*-i386 *-*-x86_64 *-*-*arm* *-*-aarch64
 
-PKG_OPTIONS_VAR=       PKG_OPTIONS.xf86-video-vmware
-PKG_SUPPORTED_OPTIONS= xatracker
-PKG_SUGGESTED_OPTIONS=
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Mxatracker)
-CFLAGS+=       -fPIC
-BUILDLINK_API_DEPENDS.MesaLib+=        MesaLib>=11
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../lang/libLLVM/buildlink3.mk"
-.else
-pre-configure:
-       find ${BUILDLINK_DIR} -name xatracker.pc -delete
-.endif
+.include "options.mk"
 
 X11_DRV_NAME=  vmware
 .include "../../meta-pkgs/modular-xorg/avoid-duplicate.mk"

Added files:

Index: pkgsrc/x11/xf86-video-vmware/options.mk
diff -u /dev/null pkgsrc/x11/xf86-video-vmware/options.mk:1.1
--- /dev/null   Sun Jul  9 16:49:33 2023
+++ pkgsrc/x11/xf86-video-vmware/options.mk     Sun Jul  9 16:49:33 2023
@@ -0,0 +1,44 @@
+# $NetBSD: options.mk,v 1.1 2023/07/09 16:49:33 pho Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.xf86-video-vmware
+PKG_SUPPORTED_OPTIONS= xatracker
+PKG_SUGGESTED_OPTIONS= # empty
+
+.include "../../mk/bsd.prefs.mk"
+
+# libudev is a Systemd thing, which only makes sense on Linux.
+.if ${OPSYS} == "Linux"
+PKG_SUPPORTED_OPTIONS+=        udev
+PKG_SUGGESTED_OPTIONS+=        udev
+.endif
+
+# xatracker is optionally provided by MesaLib. If X11 is a modular one
+# we're sure it's available. Otherwise we don't know.
+.if ${X11_TYPE} == "modular"
+PKG_SUGGESTED_OPTIONS+=        xatracker
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+###
+### udev support
+###
+.if !empty(PKG_OPTIONS:Mudev)
+.  include "../../sysutils/libudev/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-libudev
+.else
+CONFIGURE_ARGS+=       --without-libudev
+.endif
+
+###
+### xatracker support
+###
+.if !empty(PKG_OPTIONS:Mxatracker)
+CFLAGS+=       -fPIC
+BUILDLINK_API_DEPENDS.MesaLib+=        MesaLib>=11
+.  include "../../graphics/MesaLib/buildlink3.mk"
+.  include "../../lang/libLLVM/buildlink3.mk"
+.else
+pre-configure:
+       find ${BUILDLINK_DIR} -name xatracker.pc -delete
+.endif