diff options
author | Rene Ladan <rene@FreeBSD.org> | 2021-01-01 14:15:10 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2021-01-01 14:15:10 +0000 |
commit | 004f6d960390f088ae2056439182f7791de2e1c1 (patch) | |
tree | f1cdf69c81956f0cd2e69691a858c7d1e12763b4 /emulators | |
parent | 91b2ae47f7f4ddb274201682a7ee6587bf12c0e7 (diff) | |
download | ports-004f6d960390f088ae2056439182f7791de2e1c1.tar.gz ports-004f6d960390f088ae2056439182f7791de2e1c1.zip |
emulators/virtualbox-ose-additions: drop optional support for OPENGL
OPENGL requires Python 2.7 which expired yesterday.
PR: 249682
Submitted by: swills (hint by VVD)
Notes
Notes:
svn path=/head/; revision=559828
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/virtualbox-ose-additions/Makefile | 22 | ||||
-rw-r--r-- | emulators/virtualbox-ose-additions/pkg-plist | 3 |
2 files changed, 1 insertions, 24 deletions
diff --git a/emulators/virtualbox-ose-additions/Makefile b/emulators/virtualbox-ose-additions/Makefile index 44abdbbc2240..e6c4b416bd22 100644 --- a/emulators/virtualbox-ose-additions/Makefile +++ b/emulators/virtualbox-ose-additions/Makefile @@ -47,21 +47,15 @@ CONFLICTS_INSTALL= virtualbox-ose-[0-9]* \ virtualbox-ose-lite-[0-9]* \ virtualbox-ose-nox11-[0-9]* -OPTIONS_DEFINE= DBUS DEBUG OPENGL X11 +OPTIONS_DEFINE= DBUS DEBUG X11 OPTIONS_DEFAULT= DBUS X11 OPTIONS_SUB= yes -OPENGL_DESC= 3D pass-through support (requires X11) - DBUS_CONFIGURE_OFF= --disable-dbus DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DEBUG_CONFIGURE_ON= --build-debug DEBUG_VARS= KMK_BUILDTYPE=debug DEBUG_VARS_OFF= KMK_BUILDTYPE=release -OPENGL_CONFIGURE_OFF= --disable-opengl -OPENGL_IMPLIES= X11 -OPENGL_USE= GL=gl,glu XORG=xcomposite,xdamage,xfixes -OPENGL_USES= gl python:2.7,build xorg X11_BUILD_DEPENDS= ${LOCALBASE}/include/xorg/compiler.h:x11-servers/xorg-server X11_RUN_DEPENDS= xrandr:x11/xrandr X11_USE= XORG=x11,xcursor,xext,xorgproto,xmu,xrandr,xt @@ -89,11 +83,6 @@ BUILD_WRKSRC= ${VBOX_BIN}/src KMK_ARCH= freebsd.${ARCH:S/i386/x86/} KMK_CONFIG+= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys -.if ${PORT_OPTIONS:MOPENGL} -VBOX_LIBS= VBoxEGL.so \ - VBoxOGL.so -.endif - .if ${PORT_OPTIONS:MX11} .else VBOX_WITH_X11= @@ -142,9 +131,6 @@ post-patch: @${ECHO_CMD} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk .endif -post-patch-OPENGL-on: - @${ECHO_CMD} 'VBOX_USE_SYSTEM_GL_HEADERS = 1' >> ${WRKSRC}/LocalConfig.kmk - post-patch-X11-on: @${ECHO_CMD} 'VBOX_USE_SYSTEM_XORG_HEADERS = 1' >> \ ${WRKSRC}/LocalConfig.kmk @@ -184,10 +170,4 @@ do-install-X11-on: ${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_system.so \ ${STAGEDIR}${INPUTDIR}/vboxmouse_drv.so -do-install-OPENGL-on: - ${INSTALL_DATA} ${FILESDIR}/vboxvideo.conf \ - ${STAGEDIR}${PREFIX}/etc/libmap.d/ - ${INSTALL_DATA} ${VBOX_LIBS:S|^|${VBOX_BIN}/|} \ - ${STAGEDIR}${PREFIX}/lib/ - .include <bsd.port.post.mk> diff --git a/emulators/virtualbox-ose-additions/pkg-plist b/emulators/virtualbox-ose-additions/pkg-plist index a2e1891359e9..dac84dc22bcc 100644 --- a/emulators/virtualbox-ose-additions/pkg-plist +++ b/emulators/virtualbox-ose-additions/pkg-plist @@ -1,9 +1,6 @@ %%X11%%bin/VBoxClient %%X11%%bin/VBoxClient-all -%%OPENGL%%etc/libmap.d/vboxvideo.conf %%X11%%etc/xdg/autostart/vboxclient.desktop -%%OPENGL%%lib/VBoxEGL.so -%%OPENGL%%lib/VBoxOGL.so lib/pam_vbox.so %%X11%%lib/xorg/modules/drivers/vboxvideo_drv.so %%X11%%lib/xorg/modules/input/vboxmouse_drv.so |