6 files changed, 44 insertions, 175 deletions

diff --git a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk b/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
deleted file mode 100644
index 19ff811f7b97..000000000000
--- a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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
diff --git a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h b/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
deleted file mode 100644
index 90db3b3cfeda..000000000000
--- a/emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
+++ /dev/null
@@ -1,51 +0,0 @@
---- 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;
- }
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk
deleted file mode 100644
index 14c34aa2db49..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk
+++ /dev/null
@@ -1,84 +0,0 @@
---- 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)
- 
diff --git a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.16.0-xf86Xinput.h b/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.16.0-xf86Xinput.h
deleted file mode 100644
index da1060ffb6ba..000000000000
--- a/emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.16.0-xf86Xinput.h
+++ /dev/null
@@ -1,28 +0,0 @@
---- 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;
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxmouse_Makefile.kmk b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxmouse_Makefile.kmk
new file mode 100644
index 000000000000..59568a2cf095
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxmouse_Makefile.kmk
@@ -0,0 +1,29 @@
+--- 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
+ 
+ 
diff --git a/emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk
new file mode 100644
index 000000000000..398c835b4b43
--- /dev/null
+++ b/emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk
@@ -0,0 +1,15 @@
+--- 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
+ 
+