svn commit: r552571 - head/emulators/virtualbox-ose/files

[Guido Falsi]

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 at 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)