Attachment #201970 for bug #227238

View | Details | Raw Unified | Return to bug 227238 | Differences between
Collapse All | Expand All




--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2016-01-19 19:14:53 UTC
+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -20,6 +20,9 @@ include $(KBUILD_PATH)/subheader.kmk
 
 vboxvideo_70_DEFS := \
 	IN_MODULE XORG_7X RENDER=1 IN_RT_STATIC X_BYTE_ORDER=X_LITTLE_ENDIAN
+ifeq ($(KBUILD_TARGET),freebsd) # don't use .freebsd or anything here.
+ vboxvideo_70_DEFS += GCCUSESGAS
+endif
 ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
  vboxvideo_70_DEFS += __EXTENSIONS__  ## @todo Why this?
 endif




--- src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h.orig	2015-02-12 11:08:51.000000000 -0500
+++ src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h	2015-02-18 17:44:16.919457000 -0500
@@ -972,26 +972,26 @@
 static __inline__ void
 outb(unsigned short port, unsigned char val)
 {
-    __asm__ __volatile__("out%B0 (%1)"::"a"(val), "d"(port));
+    __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port));
 }
 
 static __inline__ void
 outw(unsigned short port, unsigned short val)
 {
-    __asm__ __volatile__("out%W0 (%1)"::"a"(val), "d"(port));
+    __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port));
 }
 
 static __inline__ void
 outl(unsigned short port, unsigned int val)
 {
-    __asm__ __volatile__("out%L0 (%1)"::"a"(val), "d"(port));
+    __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port));
 }
 
 static __inline__ unsigned int
 inb(unsigned short port)
 {
     unsigned char ret;
-    __asm__ __volatile__("in%B0 (%1)":"=a"(ret):"d"(port));
+    __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port));
 
     return ret;
 }
@@ -1000,7 +1000,7 @@
 inw(unsigned short port)
 {
     unsigned short ret;
-    __asm__ __volatile__("in%W0 (%1)":"=a"(ret):"d"(port));
+    __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port));
 
     return ret;
 }
@@ -1009,7 +1009,7 @@
 inl(unsigned short port)
 {
     unsigned int ret;
-    __asm__ __volatile__("in%L0 (%1)":"=a"(ret):"d"(port));
+    __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port));
 
     return ret;
 }




--- src/VBox/Additions/x11/vboxmouse/Makefile.kmk.orig	2016-04-18 15:20:42 UTC
+++ src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -228,6 +228,72 @@ vboxmouse_drv_112_INCS := \
 vboxmouse_drv_112_SOURCES = \
 	vboxmouse.c
 
+DLLS += vboxmouse_drv_113
+vboxmouse_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_113_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+vboxmouse_drv_113_INCS := \
+    $(vboxmouse_xorg_INCS) \
+	$(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0 \
+	$(PATH_SUB_CURRENT)
+vboxmouse_drv_113_SOURCES = \
+	vboxmouse.c
+
+DLLS += vboxmouse_drv_114
+vboxmouse_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_114_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+vboxmouse_drv_114_INCS := \
+    $(vboxmouse_xorg_INCS) \
+	$(VBOX_PATH_X11_ROOT)/xorg-server-1.14.0 \
+	$(PATH_SUB_CURRENT)
+vboxmouse_drv_114_SOURCES = \
+	vboxmouse.c
+
+DLLS += vboxmouse_drv_115
+vboxmouse_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_115_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+vboxmouse_drv_115_INCS := \
+    $(vboxmouse_xorg_INCS) \
+	$(VBOX_PATH_X11_ROOT)/xorg-server-1.15.0 \
+	$(PATH_SUB_CURRENT)
+vboxmouse_drv_115_SOURCES = \
+	vboxmouse.c
+
+DLLS += vboxmouse_drv_116
+vboxmouse_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_116_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+vboxmouse_drv_116_INCS := \
+    $(vboxmouse_xorg_INCS) \
+	$(VBOX_PATH_X11_ROOT)/xorg-server-1.16.0 \
+	$(PATH_SUB_CURRENT)
+vboxmouse_drv_116_SOURCES = \
+	vboxmouse.c
+
+DLLS += vboxmouse_drv_117
+vboxmouse_drv_117_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_117_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+vboxmouse_drv_117_INCS := \
+    $(vboxmouse_xorg_INCS) \
+	$(VBOX_PATH_X11_ROOT)/xorg-server-1.17.1 \
+	$(PATH_SUB_CURRENT)
+vboxmouse_drv_117_SOURCES = \
+	vboxmouse.c
+
+DLLS += vboxmouse_drv_118
+vboxmouse_drv_118_TEMPLATE = VBOXGUESTR3XORGMOD
+vboxmouse_drv_118_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
+vboxmouse_drv_118_INCS := \
+    $(vboxmouse_xorg_INCS) \
+	$(VBOX_PATH_X11_ROOT)/xorg-server-1.18.0 \
+	$(PATH_SUB_CURRENT)
+vboxmouse_drv_118_SOURCES = \
+	vboxmouse.c
+
 endif # neq ($(KBUILD_TARGET),linux)
 
 
@@ -276,7 +342,7 @@ $$(vboxmouse_drv_0_OUTDIR)/tstvboxmouse6
      $(foreach ver, _70 _71 _13 _14 _15 _16, $(eval $(def_vboxmouse_test)))
 
      ifneq ($(KBUILD_TARGET), linux)
-      $(foreach ver, _17 _18 _19 _110 _111 _112 _113, $(eval $(def_vboxmouse_test)))
+      $(foreach ver, _17 _18 _19 _110 _111 _112 _113 _114 _115 _116 _117 _118, $(eval $(def_vboxmouse_test)))
 
      endif # neq ($(KBUILD_TARGET),linux)
 




--- src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Xinput.h.orig	2014-11-21 10:18:44.000000000 -0500
+++ src/VBox/Additions/x11/x11include/xorg-server-1.16.0/xf86Xinput.h	2014-12-18 16:26:57.000000000 -0500
@@ -51,6 +51,7 @@
 #ifndef _xf86Xinput_h
 #define _xf86Xinput_h
 
+#include "xf86.h"
 #include "xf86str.h"
 #include "inputstr.h"
 #include <X11/extensions/XI.h>
@@ -85,7 +86,7 @@
 
 /* This is to input devices what the ScrnInfoRec is to screens. */
 
-typedef struct _InputInfoRec {
+struct _InputInfoRec {
     struct _InputInfoRec *next;
     char *name;
     char *driver;
@@ -110,7 +111,7 @@
     void *module;
     XF86OptionPtr options;
     InputAttributes *attrs;
-} *InputInfoPtr;
+};
 
 /* xf86Globals.c */
 extern InputInfoPtr xf86InputDevs;




--- src/VBox/Additions/x11/vboxmouse/Makefile.kmk.orig	2019-01-25 18:24:30 UTC
+++ src/VBox/Additions/x11/vboxmouse/Makefile.kmk
@@ -227,10 +227,22 @@ endif # neq ($(KBUILD_TARGET),linux)
 
 
 ifdef VBOX_USE_SYSTEM_XORG_HEADERS
- # As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not
- # build it in this case.
- DLLS    := $(filter-out vboxmouse_drv_%,$(DLLS))
- SYSMODS := $(filter-out vboxmouse_drv%,$(SYSMODS))
+ ifeq ($(KBUILD_TARGET),freebsd)
+  DLLS += vboxmouse_drv_system
+  vboxmouse_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
+  vboxmouse_drv_system_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
+  vboxmouse_drv_system_INCS := \
+	$(vboxmouse_xorg_INCS) \
+	/usr/local/include/xorg \
+	$(PATH_SUB_CURRENT)
+  vboxmouse_drv_system_SOURCES = \
+	vboxmouse.c
+ else
+  # As vboxmouse_drv is not needed at all for X.Org Server 1.7 and later do not
+  # build it in this case.
+   DLLS    := $(filter-out vboxmouse_drv_%,$(DLLS))
+  SYSMODS := $(filter-out vboxmouse_drv%,$(SYSMODS))
+ endif
 endif
 
 




--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2019-01-25 18:24:30 UTC
+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -406,9 +406,10 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
  vboxvideo_drv_system_INCS += \
         $(PATH_ROOT)/src/VBox/Runtime/include \
         $(VBOX_GRAPHICS_INCS) \
-        /usr/include/xorg \
-        /usr/include/pixman-1
+        /usr/local/include/xorg \
+        /usr/local/include/pixman-1
  vboxvideo_drv_system_SOURCES := $(vboxvideo_drv_17_SOURCES)
+ vboxvideo_drv_system_LIBS += $(vboxvideo_drv_70_LIBS)
 endif
 
 





PORTNAME=	virtualbox-ose
PORTVERSION=	5.2.26
PORTREVISION=	1
CATEGORIES=	emulators
MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
PKGNAMESUFFIX?=	-additions

USE_XORG+=	xorgproto x11 xcursor xext xmu xorg-server xrandr xt
USES+=		pkgconfig
VBOX_WITH_X11=	1
XORG_DRV_ABI=	pkgconf --modversion xorg-server | \
		${SED} -E -e 's/\.[0-9]+$$//' -e 's/\.//'
.else
VBOX_WITH_X11=
.endif

.include <bsd.port.pre.mk>

.if ${COMPILER_TYPE} == clang
EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-Config.kmk
		${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk \
		${PATCHDIR}/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
.if ${COMPILER_FEATURES:Mlibc++}
EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
.endif

	@${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||' \

	    ${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
	    ${WRKSRC}/src/VBox/Additions/common/crOpenGL/load.c \
	    ${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
	    ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
	    ${WRKSRC}/src/VBox/Additions/x11/vboxmouse/Makefile.kmk \
	    ${WRKSRC}/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
	@${REINPLACE_CMD} \
	    -e 's|\$$KBUILDDIR_BIN/kmk_sed|${LOCALBASE}/bin/kmk_sed|g' \
	    ${WRKSRC}/configure

	    ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
	    ${STAGEDIR}${PREFIX}/share/autostart/
	${MKDIR} ${STAGEDIR}${VIDEODIR}
	${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_system.so \
	    ${STAGEDIR}${VIDEODIR}/vboxvideo_drv.so
	${MKDIR} ${STAGEDIR}${INPUTDIR}
	${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_system.so \
	    ${STAGEDIR}${VIDEODIR}/vboxmouse_drv.so

do-install-OPENGL-on:
	${INSTALL_DATA} ${FILESDIR}/vboxvideo.conf \

Return to bug 227238

Lines 1-12 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk (-12 lines)
1	--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2016-01-19 19:14:53 UTC
2	+++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk
3	@@ -20,6 +20,9 @@ include $(KBUILD_PATH)/subheader.kmk
4
5	vboxvideo_70_DEFS := \
6	IN_MODULE XORG_7X RENDER=1 IN_RT_STATIC X_BYTE_ORDER=X_LITTLE_ENDIAN
7	+ifeq ($(KBUILD_TARGET),freebsd) # don't use .freebsd or anything here.
8	+ vboxvideo_70_DEFS += GCCUSESGAS
9	+endif
10	ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
11	vboxvideo_70_DEFS += __EXTENSIONS__ ## @todo Why this?
12	endif

Lines 1-51 Link Here

(-)emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h (-51 lines)
1	--- src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h.orig 2015-02-12 11:08:51.000000000 -0500
2	+++ src/VBox/Additions/x11/x11include/xorg-server-1.17.1/compiler.h 2015-02-18 17:44:16.919457000 -0500
3	@@ -972,26 +972,26 @@
4	static __inline__ void
5	outb(unsigned short port, unsigned char val)
6	{
7	- __asm__ __volatile__("out%B0 (%1)"::"a"(val), "d"(port));
8	+ __asm__ __volatile__("outb %0,%1"::"a"(val), "d"(port));
9	}
10
11	static __inline__ void
12	outw(unsigned short port, unsigned short val)
13	{
14	- __asm__ __volatile__("out%W0 (%1)"::"a"(val), "d"(port));
15	+ __asm__ __volatile__("outw %0,%1"::"a"(val), "d"(port));
16	}
17
18	static __inline__ void
19	outl(unsigned short port, unsigned int val)
20	{
21	- __asm__ __volatile__("out%L0 (%1)"::"a"(val), "d"(port));
22	+ __asm__ __volatile__("outl %0,%1"::"a"(val), "d"(port));
23	}
24
25	static __inline__ unsigned int
26	inb(unsigned short port)
27	{
28	unsigned char ret;
29	- __asm__ __volatile__("in%B0 (%1)":"=a"(ret):"d"(port));
30	+ __asm__ __volatile__("inb %1,%0":"=a"(ret):"d"(port));
31
32	return ret;
33	}
34	@@ -1000,7 +1000,7 @@
35	inw(unsigned short port)
36	{
37	unsigned short ret;
38	- __asm__ __volatile__("in%W0 (%1)":"=a"(ret):"d"(port));
39	+ __asm__ __volatile__("inw %1,%0":"=a"(ret):"d"(port));
40
41	return ret;
42	}
43	@@ -1009,7 +1009,7 @@
44	inl(unsigned short port)
45	{
46	unsigned int ret;
47	- __asm__ __volatile__("in%L0 (%1)":"=a"(ret):"d"(port));
48	+ __asm__ __volatile__("inl %1,%0":"=a"(ret):"d"(port));
49
50	return ret;
51	}

Lines 1-84 Link Here

(-)emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk (-84 lines)
1	--- src/VBox/Additions/x11/vboxmouse/Makefile.kmk.orig 2016-04-18 15:20:42 UTC
2	+++ src/VBox/Additions/x11/vboxmouse/Makefile.kmk
3	@@ -228,6 +228,72 @@ vboxmouse_drv_112_INCS := \
4	vboxmouse_drv_112_SOURCES = \
5	vboxmouse.c
6
7	+DLLS += vboxmouse_drv_113
8	+vboxmouse_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
9	+vboxmouse_drv_113_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
10	+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
11	+vboxmouse_drv_113_INCS := \
12	+ $(vboxmouse_xorg_INCS) \
13	+ $(VBOX_PATH_X11_ROOT)/xorg-server-1.13.0 \
14	+ $(PATH_SUB_CURRENT)
15	+vboxmouse_drv_113_SOURCES = \
16	+ vboxmouse.c
17	+
18	+DLLS += vboxmouse_drv_114
19	+vboxmouse_drv_114_TEMPLATE = VBOXGUESTR3XORGMOD
20	+vboxmouse_drv_114_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
21	+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
22	+vboxmouse_drv_114_INCS := \
23	+ $(vboxmouse_xorg_INCS) \
24	+ $(VBOX_PATH_X11_ROOT)/xorg-server-1.14.0 \
25	+ $(PATH_SUB_CURRENT)
26	+vboxmouse_drv_114_SOURCES = \
27	+ vboxmouse.c
28	+
29	+DLLS += vboxmouse_drv_115
30	+vboxmouse_drv_115_TEMPLATE = VBOXGUESTR3XORGMOD
31	+vboxmouse_drv_115_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
32	+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
33	+vboxmouse_drv_115_INCS := \
34	+ $(vboxmouse_xorg_INCS) \
35	+ $(VBOX_PATH_X11_ROOT)/xorg-server-1.15.0 \
36	+ $(PATH_SUB_CURRENT)
37	+vboxmouse_drv_115_SOURCES = \
38	+ vboxmouse.c
39	+
40	+DLLS += vboxmouse_drv_116
41	+vboxmouse_drv_116_TEMPLATE = VBOXGUESTR3XORGMOD
42	+vboxmouse_drv_116_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
43	+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
44	+vboxmouse_drv_116_INCS := \
45	+ $(vboxmouse_xorg_INCS) \
46	+ $(VBOX_PATH_X11_ROOT)/xorg-server-1.16.0 \
47	+ $(PATH_SUB_CURRENT)
48	+vboxmouse_drv_116_SOURCES = \
49	+ vboxmouse.c
50	+
51	+DLLS += vboxmouse_drv_117
52	+vboxmouse_drv_117_TEMPLATE = VBOXGUESTR3XORGMOD
53	+vboxmouse_drv_117_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
54	+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
55	+vboxmouse_drv_117_INCS := \
56	+ $(vboxmouse_xorg_INCS) \
57	+ $(VBOX_PATH_X11_ROOT)/xorg-server-1.17.1 \
58	+ $(PATH_SUB_CURRENT)
59	+vboxmouse_drv_117_SOURCES = \
60	+ vboxmouse.c
61	+
62	+DLLS += vboxmouse_drv_118
63	+vboxmouse_drv_118_TEMPLATE = VBOXGUESTR3XORGMOD
64	+vboxmouse_drv_118_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
65	+## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
66	+vboxmouse_drv_118_INCS := \
67	+ $(vboxmouse_xorg_INCS) \
68	+ $(VBOX_PATH_X11_ROOT)/xorg-server-1.18.0 \
69	+ $(PATH_SUB_CURRENT)
70	+vboxmouse_drv_118_SOURCES = \
71	+ vboxmouse.c
72	+
73	endif # neq ($(KBUILD_TARGET),linux)
74
75
76	@@ -276,7 +342,7 @@ $$(vboxmouse_drv_0_OUTDIR)/tstvboxmouse6
77	$(foreach ver, _70 _71 _13 _14 _15 _16, $(eval $(def_vboxmouse_test)))
78
79	ifneq ($(KBUILD_TARGET), linux)
80	- $(foreach ver, _17 _18 _19 _110 _111 _112 _113, $(eval $(def_vboxmouse_test)))
81	+ $(foreach ver, _17 _18 _19 _110 _111 _112 _113 _114 _115 _116 _117 _118, $(eval $(def_vboxmouse_test)))
82
83	endif # neq ($(KBUILD_TARGET),linux)
84

Lines 3-8 Link Here

(-)emulators/virtualbox-ose-additions/Makefile (-9 / +12 lines)
3		3
4	PORTNAME= virtualbox-ose	4	PORTNAME= virtualbox-ose
5	PORTVERSION= 5.2.26	5	PORTVERSION= 5.2.26
		6	PORTREVISION= 1
6	CATEGORIES= emulators	7	CATEGORIES= emulators
7	MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/	8	MASTER_SITES= https://download.virtualbox.org/virtualbox/${PORTVERSION}/
8	PKGNAMESUFFIX?= -additions	9	PKGNAMESUFFIX?= -additions
Lines 104-111 RUN_DEPENDS+= xrandr:x11/xrandr Link Here
104	USE_XORG+= xorgproto x11 xcursor xext xmu xorg-server xrandr xt	105	USE_XORG+= xorgproto x11 xcursor xext xmu xorg-server xrandr xt
105	USES+= pkgconfig	106	USES+= pkgconfig
106	VBOX_WITH_X11= 1	107	VBOX_WITH_X11= 1
107	XORG_DRV_ABI= pkgconf --modversion xorg-server \| \
108	${SED} -E -e 's/\.[0-9]+$$//' -e 's/\.//'
109	.else	108	.else
110	VBOX_WITH_X11=	109	VBOX_WITH_X11=
111	.endif	110	.endif
Lines 119-127 KMK_ARCH= freebsd.${ARCH} Link Here
119	.include <bsd.port.pre.mk>	118	.include <bsd.port.pre.mk>
120		119
121	.if ${COMPILER_TYPE} == clang	120	.if ${COMPILER_TYPE} == clang
122	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk \	121	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-Config.kmk
123	${PATCHDIR}/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk \
124	${PATCHDIR}/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
125	.if ${COMPILER_FEATURES:Mlibc++}	122	.if ${COMPILER_FEATURES:Mlibc++}
126	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk	123	EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
127	.endif	124	.endif
Lines 136-141 post-patch: Link Here
136	@${ECHO} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> \	133	@${ECHO} 'VBOX_WITH_X11_ADDITIONS = ${VBOX_WITH_X11}' >> \
137	${WRKSRC}/LocalConfig.kmk	134	${WRKSRC}/LocalConfig.kmk
138	@${ECHO} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk	135	@${ECHO} 'VBOX_GCC_std = -std=c++11' >> ${WRKSRC}/LocalConfig.kmk
		136	.if ${PORT_OPTIONS:MX11}
		137	@${ECHO} 'VBOX_USE_SYSTEM_XORG_HEADERS = 1' >> \
		138	${WRKSRC}/LocalConfig.kmk
		139	.endif
139	.if ${COMPILER_TYPE} == clang	140	.if ${COMPILER_TYPE} == clang
140	@${REINPLACE_CMD} -e 's\| -finline-limit=8000\|\|' \	141	@${REINPLACE_CMD} -e 's\| -finline-limit=8000\|\|' \
141	-e 's\| -fno-merge-constants\|\|' \	142	-e 's\| -fno-merge-constants\|\|' \
Lines 149-155 post-patch: Link Here
149	${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \	150	${WRKSRC}/kBuild/units/qt5.kmk ${WRKSRC}/kBuild/sdks/LIBSDL.kmk \
150	${WRKSRC}/src/VBox/Additions/common/crOpenGL/load.c \	151	${WRKSRC}/src/VBox/Additions/common/crOpenGL/load.c \
151	${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \	152	${WRKSRC}/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
152	${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop	153	${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
		154	${WRKSRC}/src/VBox/Additions/x11/vboxmouse/Makefile.kmk \
		155	${WRKSRC}/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
153	@${REINPLACE_CMD} \	156	@${REINPLACE_CMD} \
154	-e 's\|\$$KBUILDDIR_BIN/kmk_sed\|${LOCALBASE}/bin/kmk_sed\|g' \	157	-e 's\|\$$KBUILDDIR_BIN/kmk_sed\|${LOCALBASE}/bin/kmk_sed\|g' \
155	${WRKSRC}/configure	158	${WRKSRC}/configure
Lines 193-203 do-install-X11-on: Link Here
193	${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \	196	${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
194	${STAGEDIR}${PREFIX}/share/autostart/	197	${STAGEDIR}${PREFIX}/share/autostart/
195	${MKDIR} ${STAGEDIR}${VIDEODIR}	198	${MKDIR} ${STAGEDIR}${VIDEODIR}
196	${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_$$(${XORG_DRV_ABI}).so \	199	${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_system.so \
197	${STAGEDIR}${VIDEODIR}/vboxvideo_drv.so	200	${STAGEDIR}${VIDEODIR}/vboxvideo_drv.so
198	${MKDIR} ${STAGEDIR}${INPUTDIR}	201	${MKDIR} ${STAGEDIR}${INPUTDIR}
199	${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_$$(${XORG_DRV_ABI}).so \	202	${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_system.so \
200	${STAGEDIR}${INPUTDIR}/vboxmouse_drv.so	203	${STAGEDIR}${VIDEODIR}/vboxmouse_drv.so
201		204
202	do-install-OPENGL-on:	205	do-install-OPENGL-on:
203	${INSTALL_DATA} ${FILESDIR}/vboxvideo.conf \	206	${INSTALL_DATA} ${FILESDIR}/vboxvideo.conf \