Attachment 201974 Details for Bug 227238 – Use system header files

[patch] Use system header files

vbox.diff (text/plain), 14.97 KB, created by Jung-uk Kim on 2019-02-13 04:07:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jung-uk Kim

Created: 2019-02-13 04:07:25 UTC

Size: 14.97 KB

patch

obsolete

>Index: emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
>===================================================================
>--- emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk	(revision 492824)
>+++ emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk	(nonexistent)
>@@ -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
>
>Property changes on: emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-vboxvideo-Makefile.kmk
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
>===================================================================
>--- emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h	(revision 492824)
>+++ emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h	(nonexistent)
>@@ -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;
>- }
>
>Property changes on: emulators/virtualbox-ose/files/extrapatch-src-VBox-Additions-x11-x11include-xorg-server-1.17.1-compiler.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk
>===================================================================
>--- emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk	(revision 492824)
>+++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk	(nonexistent)
>@@ -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)
>- 
>
>Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.16.0-xf86Xinput.h
>===================================================================
>--- emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.16.0-xf86Xinput.h	(revision 492824)
>+++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.16.0-xf86Xinput.h	(nonexistent)
>@@ -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;
>
>Property changes on: emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-x11include-xorg-server-1.16.0-xf86Xinput.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxmouse_Makefile.kmk
>===================================================================
>--- emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxmouse_Makefile.kmk	(nonexistent)
>+++ emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxmouse_Makefile.kmk	(working copy)
>@@ -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
>+ 
>+ 
>
>Property changes on: emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxmouse_Makefile.kmk
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk
>===================================================================
>--- emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk	(nonexistent)
>+++ emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk	(working copy)
>@@ -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
>+ 
>+ 
>
>Property changes on: emulators/virtualbox-ose/files/patch-src_VBox_Additions_x11_vboxvideo_Makefile.kmk
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: emulators/virtualbox-ose-additions/Makefile
>===================================================================
>--- emulators/virtualbox-ose-additions/Makefile	(revision 492824)
>+++ emulators/virtualbox-ose-additions/Makefile	(working copy)
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	virtualbox-ose
> PORTVERSION=	5.2.26
>+PORTREVISION=	1
> CATEGORIES=	emulators
> MASTER_SITES=	https://download.virtualbox.org/virtualbox/${PORTVERSION}/
> PKGNAMESUFFIX?=	-additions
>@@ -104,8 +105,6 @@ RUN_DEPENDS+=	xrandr:x11/xrandr
> 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
>@@ -119,9 +118,7 @@ KMK_ARCH=	freebsd.${ARCH}
> .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
>+EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-Config.kmk
> .if ${COMPILER_FEATURES:Mlibc++}
> EXTRA_PATCHES+=	${PATCHDIR}/extrapatch-src-VBox-Additions-x11-VBoxClient-Makefile.kmk
> .endif
>@@ -136,6 +133,10 @@ 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||' \
>@@ -149,7 +150,9 @@ post-patch:
> 	    ${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/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
>@@ -193,10 +196,10 @@ do-install-X11-on:
> 	    ${WRKSRC}/src/VBox/Additions/x11/Installer/vboxclient.desktop \
> 	    ${STAGEDIR}${PREFIX}/share/autostart/
> 	${MKDIR} ${STAGEDIR}${VIDEODIR}
>-	${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_$$(${XORG_DRV_ABI}).so \
>+	${INSTALL_DATA} ${VBOX_BIN}/vboxvideo_drv_system.so \
> 	    ${STAGEDIR}${VIDEODIR}/vboxvideo_drv.so
> 	${MKDIR} ${STAGEDIR}${INPUTDIR}
>-	${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_$$(${XORG_DRV_ABI}).so \
>+	${INSTALL_DATA} ${VBOX_BIN}/vboxmouse_drv_system.so \
> 	    ${STAGEDIR}${INPUTDIR}/vboxmouse_drv.so
> 
> do-install-OPENGL-on:

Actions: View | Diff

Attachments on bug 227238: 192154 | 201970 | 201974