Attachment 192154 Details for Bug 227238 – patch file

[patch] patch file

virtualbox-xorg-1.19.patch (text/plain), 4.60 KB, created by Dmitri Goutnik on 2018-04-03 01:53:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitri Goutnik

Created: 2018-04-03 01:53:11 UTC

Size: 4.60 KB

patch

obsolete

>Index: emulators/virtualbox-ose-additions/Makefile
>===================================================================
>--- emulators/virtualbox-ose-additions/Makefile	(revision 466278)
>+++ emulators/virtualbox-ose-additions/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	virtualbox-ose
> PORTVERSION=	5.2.8
>-PORTREVISION=	1
>+PORTREVISION=	2
> CATEGORIES=	emulators
> MASTER_SITES=	http://download.virtualbox.org/virtualbox/${PORTVERSION}/
> PKGNAMESUFFIX?=	-additions
>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 466278)
>+++ emulators/virtualbox-ose/files/patch-src-VBox-Additions-x11-vboxmouse-Makefile.kmk	(working copy)
>@@ -1,6 +1,6 @@
>---- src/VBox/Additions/x11/vboxmouse/Makefile.kmk.orig	2016-04-18 15:20:42 UTC
>+--- src/VBox/Additions/x11/vboxmouse/Makefile.kmk.orig	2018-02-26 15:57:35 UTC
> +++ src/VBox/Additions/x11/vboxmouse/Makefile.kmk
>-@@ -228,6 +228,72 @@ vboxmouse_drv_112_INCS := \
>+@@ -223,6 +223,85 @@ vboxmouse_drv_112_INCS := \
>  vboxmouse_drv_112_SOURCES = \
>  	vboxmouse.c
>  
>@@ -70,15 +70,28 @@
> +vboxmouse_drv_118_SOURCES = \
> +	vboxmouse.c
> +
>++DLLS += vboxmouse_drv_119
>++vboxmouse_drv_119_TEMPLATE = VBOXGUESTR3XORGMOD
>++vboxmouse_drv_119_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
>++vboxmouse_drv_119_INCS = \
>++        $(PATH_ROOT)/src/VBox/Runtime/include \
>++        $(VBOX_GRAPHICS_INCS) \
>++        /usr/local/include/x11 \
>++        /usr/local/include/xorg \
>++        /usr/local/include/pixman-1 \
>++	$(PATH_SUB_CURRENT)
>++vboxmouse_drv_119_SOURCES = \
>++	vboxmouse.c
>++
>  endif # neq ($(KBUILD_TARGET),linux)
>  
>  
>-@@ -276,7 +342,7 @@ $$(vboxmouse_drv_0_OUTDIR)/tstvboxmouse6
>+@@ -271,7 +350,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)))
>++      $(foreach ver, _17 _18 _19 _110 _111 _112 _113 _114 _115 _116 _117 _118, _119 $(eval $(def_vboxmouse_test)))
>  
>       endif # neq ($(KBUILD_TARGET),linux)
>  
>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,36 @@
>+--- src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig	2018-02-26 15:57:35 UTC
>++++ src/VBox/Additions/x11/vboxvideo/Makefile.kmk
>+@@ -395,6 +395,24 @@ vboxvideo_drv_118_INCS += $(PATH_ROOT)/s
>+ vboxvideo_drv_118_SOURCES := $(vboxvideo_drv_17_SOURCES)
>+ vboxvideo_drv_118_LIBS += $(vboxvideo_drv_70_LIBS)
>+ 
>++
>++#
>++# vboxvideo_drv_119
>++#
>++DLLS += vboxvideo_drv_119
>++vboxvideo_drv_119_TEMPLATE = VBOXGUESTR3XORGMOD
>++vboxvideo_drv_119_CFLAGS := \
>++	$(vboxvideo_drv_70_CFLAGS) -include xorg-server.h
>++vboxvideo_drv_119_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=11900000
>++vboxvideo_drv_119_INCS = \
>++	$(PATH_ROOT)/src/VBox/Runtime/include \
>++	$(VBOX_GRAPHICS_INCS) \
>++	/usr/local/include/x11 \
>++	/usr/local/include/xorg \
>++	/usr/local/include/pixman-1
>++vboxvideo_drv_119_SOURCES := $(vboxvideo_drv_17_SOURCES)
>++vboxvideo_drv_119_LIBS += $(vboxvideo_drv_70_LIBS)
>++
>+ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
>+  # Build using local X.Org headers.  We assume X.Org Server 1.7 or later.
>+  DLLS    := $(filter-out vboxvideo_drv_%,$(DLLS)) vboxvideo_drv_system
>+@@ -447,7 +465,7 @@ $$(vboxvideo_drv_0_OUTDIR)/tstvboxvideo6
>+ 	$$(QUIET)$$(APPEND) -t "$$@" "done"
>+     endef
>+ 
>+-    $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113 _114 _115 _116 _117 _118, $(eval $(def_vboxvideo_test)))
>++    $(foreach ver, _70 _71 _13 _14 _15 _16 _17 _18 _19 _110 _111 _112 _113 _114 _115 _116 _117 _118, _119, $(eval $(def_vboxvideo_test)))
>+ 
>+     endif # ! VBOX_ONLY_SDK
>+    endif # eq ($(KBUILD_HOST_ARCH),$(KBUILD_TARGET_ARCH))
>
>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

Actions: View | Diff

Attachments on bug 227238: 192154 | 201970 | 201974