EDIT: as author I consider this work to be used as MIT or GPL-2+ as your
convenience (to comply with your policy contributor)
and feel free to change the number to your own best convenience, 101600000
might be a better number :)
cheers,
Gianfranco
Il Venerdì 13 Febbraio 2015 16:12, Gianfranco Costamagna
<[email protected]> ha scritto:
Hi folks, your recent changes to the vboxvideo Makefile broke the build when
VBOX_USE_SYSTEM_XORG_HEADERS is defined (debian)
the following trivial patch makes the build succeed again.
diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
index 592d65e..d13d24d 100644
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -388,7 +388,7 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_system_CFLAGS := \
$(vboxvideo_drv_70_CFLAGS) -include xorg-server.h
- vboxvideo_drv_system_DEFS := $(vboxvideo_15_DEFS)
+ vboxvideo_drv_system_DEFS := $(vboxvideo_15_DEFS)
XORG_VERSION_CURRENT=101700000
vboxvideo_drv_system_INCS += \
$(PATH_ROOT)/src/VBox/Runtime/include \
/usr/include/x11 \
I'm attaching it for convenience.
thanks for considering.
(BTW as a Debian maintainer I release my work over a GPL-2+ LICENSE, let me
know if it is not sufficient for you)
cheers,
Gianfranco
diff --git a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
index 592d65e..d13d24d 100644
--- a/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
+++ b/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
@@ -388,7 +388,7 @@ ifdef VBOX_USE_SYSTEM_XORG_HEADERS
vboxvideo_drv_system_TEMPLATE = VBOXGUESTR3XORGMOD
vboxvideo_drv_system_CFLAGS := \
$(vboxvideo_drv_70_CFLAGS) -include xorg-server.h
- vboxvideo_drv_system_DEFS := $(vboxvideo_15_DEFS)
+ vboxvideo_drv_system_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101700000
vboxvideo_drv_system_INCS += \
$(PATH_ROOT)/src/VBox/Runtime/include \
/usr/include/x11 \
_______________________________________________
vbox-dev mailing list
[email protected]
https://www.virtualbox.org/mailman/listinfo/vbox-dev
