From owner-svn-ports-head@freebsd.org Sat Oct 17 13:29:42 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id DF170438899; Sat, 17 Oct 2020 13:29:42 +0000 (UTC) (envelope-from madpilot@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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4CD3lp5cF1z4B3t; Sat, 17 Oct 2020 13:29:42 +0000 (UTC) (envelope-from madpilot@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 A527722487; Sat, 17 Oct 2020 13:29:42 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 09HDTgAI037109; Sat, 17 Oct 2020 13:29:42 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 09HDTgA8037108; Sat, 17 Oct 2020 13:29:42 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <202010171329.09HDTgA8037108@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Sat, 17 Oct 2020 13:29:42 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r552571 - head/emulators/virtualbox-ose/files X-SVN-Group: ports-head X-SVN-Commit-Author: madpilot X-SVN-Commit-Paths: head/emulators/virtualbox-ose/files X-SVN-Commit-Revision: 552571 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 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: Sat, 17 Oct 2020 13:29:42 -0000 Author: madpilot Date: Sat Oct 17 13:29:42 2020 New Revision: 552571 URL: https://svnweb.freebsd.org/changeset/ports/552571 Log: Fix emulators/virtualbox-ose build after r552109. VirtualBox embeds an outdated version of glext.h, causing it to fail to build due to symbols being redefined incorrectly. Import patch which forces virtualbox to append it's own include paths, thus not "obscuring" the system provided OpenGL include file. PR: 250315 Submitted by: rozhuk.im@gmail.com Approved by: portmgr (fixit blanket) Modified: head/emulators/virtualbox-ose/files/patch-Config.kmk Modified: head/emulators/virtualbox-ose/files/patch-Config.kmk ============================================================================== --- head/emulators/virtualbox-ose/files/patch-Config.kmk Sat Oct 17 13:27:54 2020 (r552570) +++ head/emulators/virtualbox-ose/files/patch-Config.kmk Sat Oct 17 13:29:42 2020 (r552571) @@ -220,6 +220,15 @@ /usr/local/lib else ifeq ($(KBUILD_HOST),netbsd) TEMPLATE_VBoxBldProg_TOOL = GXX3 +@@ -7008,7 +7020,7 @@ + # + TEMPLATE_VBOXCROGLR3HOSTDLL = VBox OpenGL Host DLLs + TEMPLATE_VBOXCROGLR3HOSTDLL_EXTENDS := $(if-expr "$(KBUILD_TARGET)" == "win",VBOXR3,VBOXR3NP) +-TEMPLATE_VBOXCROGLR3HOSTDLL_EXTENDS_BY = prepending ++TEMPLATE_VBOXCROGLR3HOSTDLL_EXTENDS_BY = appending + TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS = VBOX_WITH_HGCM UNPACKS + TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.win = _WIN32_WINNT=0x0500 WINDOWS=1 + TEMPLATE_VBOXCROGLR3HOSTDLL_DEFS.linux = Linux=1 _GNU_SOURCE @@ -7023,6 +7035,7 @@ TEMPLATE_VBOXCROGLR3HOSTDLL_LDFLAGS.darwin += \ -current_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD) \ -compatibility_version $(VBOX_VERSION_MAJOR).$(VBOX_VERSION_MINOR).$(VBOX_VERSION_BUILD)