From owner-svn-ports-head@freebsd.org Wed Mar 6 00:37:46 2019 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id C3019151D50C; Wed, 6 Mar 2019 00:37:45 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 68A4C6851C; Wed, 6 Mar 2019 00:37:45 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5917123D5A; Wed, 6 Mar 2019 00:37:45 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x260bjUR040565; Wed, 6 Mar 2019 00:37:45 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x260bjmi040564; Wed, 6 Mar 2019 00:37:45 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201903060037.x260bjmi040564@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Wed, 6 Mar 2019 00:37:45 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r494755 - head/emulators/virtualbox-ose-additions X-SVN-Group: ports-head X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: head/emulators/virtualbox-ose-additions X-SVN-Commit-Revision: 494755 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 68A4C6851C X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.97 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-1.000,0]; NEURAL_HAM_SHORT(-0.97)[-0.975,0]; NEURAL_HAM_LONG(-1.00)[-1.000,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 06 Mar 2019 00:37:46 -0000 Author: jkim Date: Wed Mar 6 00:37:44 2019 New Revision: 494755 URL: https://svnweb.freebsd.org/changeset/ports/494755 Log: - Fix build with DEBUG option. - Fix build with OPENGL option. [1] - Modernize Makefile. PR: 236148 [1] Modified: head/emulators/virtualbox-ose-additions/Makefile head/emulators/virtualbox-ose-additions/pkg-plist Modified: head/emulators/virtualbox-ose-additions/Makefile ============================================================================== --- head/emulators/virtualbox-ose-additions/Makefile Tue Mar 5 23:38:27 2019 (r494754) +++ head/emulators/virtualbox-ose-additions/Makefile Wed Mar 6 00:37:44 2019 (r494755) @@ -3,7 +3,7 @@ PORTNAME= virtualbox-ose PORTVERSION= 5.2.26 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= emulators MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/ PKGNAMESUFFIX?= -additions @@ -15,6 +15,10 @@ COMMENT= VirtualBox additions for FreeBSD guests LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING +ONLY_FOR_ARCHS= amd64 i386 +USES= compiler:c++11-lang cpe iconv kmod python:build tar:bzip2 +USE_RC_SUBR= vboxguest vboxservice + BUILD_DEPENDS= yasm:devel/yasm \ kmk:devel/kBuild \ xsltproc:textproc/libxslt @@ -24,9 +28,6 @@ CPE_PRODUCT= vm_virtualbox PATCHDIR= ${.CURDIR}/../${PORTNAME}/files WRKSRC= ${WRKDIR}/VirtualBox-${PORTVERSION} -USE_RC_SUBR= vboxguest vboxservice -USES= compiler:c++11-lang cpe iconv kmod python:build tar:bzip2 -ONLY_FOR_ARCHS= i386 amd64 MAKE_JOBS_UNSAFE= yes HAS_CONFIGURE= yes @@ -50,9 +51,22 @@ OPTIONS_DEFINE= DBUS DEBUG OPENGL 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 +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 +X11_USES= pkgconfig +X11_VARS= VBOX_WITH_X11=1 .include @@ -62,10 +76,6 @@ CONFLICTS_INSTALL+= virtualbox-ose-additions-nox11-[0- CONFLICTS_INSTALL+= virtualbox-ose-additions-[0-9]* .endif -.if ${PORT_OPTIONS:MOPENGL} && empty(PORT_OPTIONS:MX11) -BROKEN= OPENGL requires X11 support. Run 'make config' again! -.endif - VIDEODIR= ${PREFIX}/lib/xorg/modules/drivers INPUTDIR= ${PREFIX}/lib/xorg/modules/input @@ -76,19 +86,10 @@ VBOX_SBINS= VBoxControl \ BUILD_WRKSRC= ${VBOX_BIN}/src -KMK_BUILDTYPE= release -KMK_CONFIG= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys -KMK_FLAGS= +KMK_ARCH= freebsd.${ARCH:S/i386/x86/} +KMK_CONFIG+= VBOX_LIBPATH_X11=${LOCALBASE} VBOX_FREEBSD_SRC=${SRC_BASE}/sys -.if ${PORT_OPTIONS:MDEBUG} -KMK_FLAGS+= BUILD_TYPE=debug -KMK_BUILDTYPE= debug -MAKE_ARGS+= DEBUG_FLAGS="-O1 -g" -.endif - .if ${PORT_OPTIONS:MOPENGL} -USE_XORG= xcomposite xdamage xfixes -USE_GL= gl VBOX_LIBS= VBoxEGL.so \ VBoxOGL.so \ VBoxOGLarrayspu.so \ @@ -100,21 +101,10 @@ VBOX_LIBS= VBoxEGL.so \ .endif .if ${PORT_OPTIONS:MX11} -BUILD_DEPENDS+= ${LOCALBASE}/include/xorg/compiler.h:x11-servers/xorg-server -RUN_DEPENDS+= xrandr:x11/xrandr -USE_XORG+= xorgproto x11 xcursor xext xmu xrandr xt -USES+= pkgconfig -VBOX_WITH_X11= 1 .else VBOX_WITH_X11= .endif -.if ${ARCH} == i386 -KMK_ARCH= freebsd.x86 -.else -KMK_ARCH= freebsd.${ARCH} -.endif - .include .if ${COMPILER_TYPE} == clang @@ -133,10 +123,6 @@ post-patch: @${ECHO} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> \ ${WRKSRC}/LocalConfig.kmk @${ECHO} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk -.if ${PORT_OPTIONS:MX11} - @${ECHO} 'VBOX_USE_SYSTEM_XORG_HEADERS = 1' >> \ - ${WRKSRC}/LocalConfig.kmk -.endif .if ${COMPILER_TYPE} == clang @${REINPLACE_CMD} -e 's| -finline-limit=8000||' \ -e 's| -fno-merge-constants||' \ @@ -163,9 +149,16 @@ post-patch: @${ECHO} 'VBOX_ICONV_DEFS = LIBICONV_PLUG' >> ${WRKSRC}/LocalConfig.kmk .endif +post-patch-OPENGL-on: + @${ECHO} 'VBOX_USE_SYSTEM_GL_HEADERS = 1' >> ${WRKSRC}/LocalConfig.kmk + +post-patch-X11-on: + @${ECHO} 'VBOX_USE_SYSTEM_XORG_HEADERS = 1' >> \ + ${WRKSRC}/LocalConfig.kmk + pre-build: cd ${WRKSRC} && ${SH} -c \ - '. env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk ${KMK_FLAGS}' + ". env.sh && ${KMK_CONFIG} ${LOCALBASE}/bin/kmk" do-install: ${MKDIR} ${STAGEDIR}${KMODDIR} @@ -175,10 +168,6 @@ do-install: ${INSTALL_LIB} ${VBOX_BIN}/pam_vbox.so ${STAGEDIR}${PREFIX}/lib ${INSTALL_PROGRAM} ${VBOX_SBINS:S|^|${VBOX_BIN}/|} \ ${STAGEDIR}${PREFIX}/sbin/ - -do-install-DEBUG-on: - ${INSTALL_KLD} ${VBOX_BIN}/src/vboxguest/vboxguest.ko.symbols \ - ${STAGEDIR}${KMODDIR} do-install-X11-on: ${INSTALL_PROGRAM} ${VBOX_BIN}/VBoxClient ${STAGEDIR}${PREFIX}/bin/ Modified: head/emulators/virtualbox-ose-additions/pkg-plist ============================================================================== --- head/emulators/virtualbox-ose-additions/pkg-plist Tue Mar 5 23:38:27 2019 (r494754) +++ head/emulators/virtualbox-ose-additions/pkg-plist Wed Mar 6 00:37:44 2019 (r494755) @@ -19,4 +19,3 @@ sbin/mount_vboxvfs %%X11%%share/autostart/vboxclient.desktop /%%KMODDIR%%/vboxguest.ko /%%KMODDIR%%/vboxvfs.ko -%%DEBUG%%/%%KMODDIR%%/vboxguest.ko.symbols