diff options
| -rw-r--r-- | debian/changelog | 38 | ||||
| -rw-r--r-- | debian/patches/00list | 2 | ||||
| -rwxr-xr-x | debian/patches/18-xorg-1.4.dpatch | 659 | ||||
| -rw-r--r-- | debian/virtualbox-ose-guest-x11.install | 1 |
4 files changed, 699 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index edd3af6b8..86fd52f1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +virtualbox-ose (3.0.10-dfsg-2~bpo50+1) lenny-backports; urgency=low + + * Rebuild for lenny-backports. + + -- Michael Meskes <meskes@debian.org> Thu, 19 Nov 2009 17:47:53 +0100 + virtualbox-ose (3.0.10-dfsg-2) unstable; urgency=low * Downgrade dkms dependency to recommendation. (Closes: #553918) @@ -21,6 +27,12 @@ virtualbox-ose (3.0.10-dfsg-1) unstable; urgency=low -- Michael Meskes <meskes@debian.org> Sat, 31 Oct 2009 19:58:01 +0100 +virtualbox-ose (3.0.8-dfsg-1~bpo50+1) lenny-backports; urgency=low + + * Rebuild for lenny-backports. + + -- Michael Meskes <meskes@debian.org> Sun, 01 Nov 2009 11:11:57 +0100 + virtualbox-ose (3.0.8-dfsg-1) unstable; urgency=high [ Felix Geyer ] @@ -48,6 +60,14 @@ virtualbox-ose (3.0.8-dfsg-1) unstable; urgency=high -- Michael Meskes <meskes@debian.org> Tue, 13 Oct 2009 13:46:44 +0200 +virtualbox-ose (3.0.6-dfsg-1~bpo50+1) lenny-backports; urgency=low + + * Rebuild for lenny-backports. + * Re-created 18-xorg-1.4.dpatch. + * Re-added vboxvideo.ids for Xorg 1.4. + + -- Michael Meskes <meskes@debian.org> Wed, 15 Jul 2009 15:52:30 +0200 + virtualbox-ose (3.0.6-dfsg-1) unstable; urgency=low [ Felix Geyer ] @@ -81,6 +101,12 @@ virtualbox-ose (3.0.4-dfsg-1) unstable; urgency=low -- Michael Meskes <meskes@debian.org> Mon, 10 Aug 2009 13:27:41 +0200 +virtualbox-ose (3.0.2-dfsg-1~bpo50+1) lenny-backports; urgency=low + + * Rebuild for lenny-backports. + + -- Michael Meskes <meskes@debian.org> Wed, 15 Jul 2009 15:52:30 +0200 + virtualbox-ose (3.0.2-dfsg-1) unstable; urgency=low * New Upstream Version, closes: #536338, #536371, #536578 @@ -160,6 +186,12 @@ virtualbox-ose (2.2.2-dfsg-1) unstable; urgency=low -- Michael Meskes <meskes@debian.org> Wed, 29 Apr 2009 09:13:24 +0200 +virtualbox-ose (2.2.0-dfsg-3~bpo50+1) lenny-backports; urgency=low + + * Rebuild for lenny-backports. + + -- Michael Meskes <meskes@debian.org> Tue, 21 Apr 2009 09:27:37 +0200 + virtualbox-ose (2.2.0-dfsg-3) unstable; urgency=low * Putting back the tar command that was lost in debian/rules, closes: #524897 @@ -191,6 +223,12 @@ virtualbox-ose (2.2.0-dfsg-1) unstable; urgency=low -- Michael Meskes <meskes@debian.org> Fri, 10 Apr 2009 11:16:49 +0200 +virtualbox-ose (2.1.4-dfsg-1~bpo50+1) lenny-backports; urgency=low + + * Rebuild for lenny-backports. + + -- Michael Meskes <meskes@debian.org> Tue, 03 Mar 2009 12:35:54 +0100 + virtualbox-ose (2.1.4-dfsg-1) unstable; urgency=high * New upstream version. diff --git a/debian/patches/00list b/debian/patches/00list index 79941265d..97f41c027 100644 --- a/debian/patches/00list +++ b/debian/patches/00list @@ -7,7 +7,7 @@ 15-wined3d-guest-addition.dpatch 16-no-update.dpatch 17-disable-help-contents.dpatch -18-xorg-1.6.dpatch +18-xorg-1.4.dpatch 20-hide-help-buttons.dpatch 21-dont-strip-x11-drivers.dpatch 22-no-static-libstdcpp.dpatch diff --git a/debian/patches/18-xorg-1.4.dpatch b/debian/patches/18-xorg-1.4.dpatch new file mode 100755 index 000000000..2db3b6f48 --- /dev/null +++ b/debian/patches/18-xorg-1.4.dpatch @@ -0,0 +1,659 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 18-xorg-1.4.dpatch by Michael Meskes <meskes@debian.org> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use XServer-Xorg 1.4 + +@DPATCH@ + +--- virtualbox-ose-3.0.6-dfsg/src/VBox/Additions/x11/vboxvideo/Makefile.kmk.orig 2009-09-21 12:45:42.000000000 +0000 ++++ virtualbox-ose-3.0.6-dfsg/src/VBox/Additions/x11/vboxvideo/Makefile.kmk 2009-09-21 12:48:13.000000000 +0000 +@@ -26,7 +26,7 @@ + # vboxvideo_drv + # + if1of ($(KBUILD_TARGET), linux) +- SYSMODS += vboxvideo_drv ++ #SYSMODS += vboxvideo_drv + vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD + vboxvideo_drv_DEFS.linux = linux + vboxvideo_drv_DEFS.x86 = __i386__ +@@ -113,7 +113,7 @@ + # base keywords instead of using .solaris or .linux. + # Also it is *important* to use := and not = when deriving a properity. + # +-DLLS += vboxvideo_drv_70 ++#DLLS += vboxvideo_drv_70 + vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD + if1of ($(KBUILD_TARGET), linux) + vboxvideo_drv_70_CFLAGS += \ +@@ -139,7 +139,7 @@ + # + # vboxvideo_drv_71 + # +-DLLS += vboxvideo_drv_71 ++#DLLS += vboxvideo_drv_71 + vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS) +@@ -158,7 +158,7 @@ + # + # vboxvideo_drv_13 + # +-DLLS += vboxvideo_drv_13 ++#DLLS += vboxvideo_drv_13 + vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) +@@ -180,18 +180,18 @@ + # This uses the same code (vboxvideo_13.c) as 1.3, but is built + # for 1.4 as well in case there should be any relevant header changes. + # +-DLLS += vboxvideo_drv_14 +-vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD +-vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS) +-vboxvideo_drv_14_DEFS := $(vboxvideo_drv_70_DEFS) +-vboxvideo_drv_14_INCS = \ +- $(VBOX_PATH_X11_XORG_1_4) \ +- $(VBOX_PATH_X11_XORG_1_4)/X11 \ ++DLLS += vboxvideo_drv ++vboxvideo_drv_TEMPLATE = VBOXGUESTR3XORGMOD ++vboxvideo_drv_CFLAGS := $(vboxvideo_drv_70_CFLAGS) ++vboxvideo_drv_DEFS := $(vboxvideo_drv_70_DEFS) ++vboxvideo_drv_INCS = \ ++ /usr/include/xorg \ + $(VBOX_PATH_X11_XORG_1_4)/xorg \ +- $(VBOX_PATH_X11_ROOT)/glproto-1.4.8 \ +- $(VBOX_PATH_X11_ROOT)/libdrm-2.3.0 \ +- $(VBOX_PATH_X11_ROOT)/xf86driproto-2.0.4 +-vboxvideo_drv_14_SOURCES = \ ++ /usr/include/x11 \ ++ /usr/include/pixman-1 \ ++ /usr/include/X11/dri \ ++ /usr/include/drm ++vboxvideo_drv_SOURCES = \ + vboxvideo_13.c \ + vboxutils.c + +@@ -199,7 +199,7 @@ + # + # vboxvideo_drv_15 + # +-DLLS += vboxvideo_drv_15 ++#DLLS += vboxvideo_drv_15 + vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_15_DEFS := $(vboxvideo_drv_70_DEFS) NO_ANSIC PCIACCESS \ +@@ -220,7 +220,7 @@ + # + # vboxvideo_drv_16 + # +-DLLS += vboxvideo_drv_16 ++#DLLS += vboxvideo_drv_16 + vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS) +@@ -241,7 +241,7 @@ + # + # vboxvideo_drv_17 + # +-DLLS += vboxvideo_drv_17 ++#DLLS += vboxvideo_drv_17 + vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD + vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS) + vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS) +--- virtualbox-ose-3.0.6-dfsg/src/VBox/Additions/x11/vboxmouse/Makefile.kmk.orig 2009-09-21 14:10:23.000000000 +0200 ++++ virtualbos-ose-3.0.6-dfsg/src/VBox/Additions/x11/vboxmouse/Makefile.kmk 2009-09-21 14:10:47.000000000 +0200 +@@ -27,7 +27,7 @@ + # vboxmouse_drv + # + if1of ($(KBUILD_TARGET), linux) +- SYSMODS += vboxmouse_drv ++ #SYSMODS += vboxmouse_drv + vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD + vboxmouse_drv_DEFS.linux = linux + vboxmouse_drv_DEFS.x86 += __i386__ +@@ -61,7 +61,7 @@ + # + # vboxmouse_drv_70 + # +-DLLS += vboxmouse_drv_70 ++#DLLS += vboxmouse_drv_70 + vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_70_DEFS = \ + XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X +@@ -82,7 +82,7 @@ + # + # vboxmouse_drv_71 + # +-DLLS += vboxmouse_drv_71 ++#DLLS += vboxmouse_drv_71 + vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) + vboxmouse_drv_71_INCS := \ +@@ -99,15 +99,15 @@ + # + # vboxmouse_drv_14 + # +-DLLS += vboxmouse_drv_14 +-vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD +-vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC +-vboxmouse_drv_14_INCS := \ +- $(VBOX_PATH_X11_XORG_1_4) \ +- $(VBOX_PATH_X11_XORG_1_4)/X11 \ +- $(VBOX_PATH_X11_XORG_1_4)/xorg \ ++DLLS += vboxmouse_drv ++vboxmouse_drv_TEMPLATE = VBOXGUESTR3XORGMOD ++vboxmouse_drv_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC ++vboxmouse_drv_INCS := \ ++ /usr/include/x11 \ ++ /usr/include/xorg \ ++ /usr/include/pixman-1 \ + $(PATH_SUB_CURRENT) +-vboxmouse_drv_14_SOURCES = \ ++vboxmouse_drv_SOURCES = \ + xorg14/mouse.c \ + xorg14/pnp.c \ + VBoxUtils.c +@@ -116,7 +116,7 @@ + # + # vboxmouse_drv_15 + # +-DLLS += vboxmouse_drv_15 ++#DLLS += vboxmouse_drv_15 + vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_15_INCS := \ +@@ -131,7 +131,7 @@ + # + # vboxmouse_drv_16 + # +-DLLS += vboxmouse_drv_16 ++#DLLS += vboxmouse_drv_16 + vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + vboxmouse_drv_16_INCS := \ +@@ -147,7 +147,7 @@ + # + # vboxmouse_drv_17 + # +-DLLS += vboxmouse_drv_17 ++#DLLS += vboxmouse_drv_17 + vboxmouse_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD + vboxmouse_drv_17_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC + ## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local +--- virtualbox-ose-3.0.6-dfsg/src/VBox/Additions/common/crOpenGL/Makefile.kmk.org 2009-09-09 20:07:35.000000000 +0200 ++++ virtualbox-ose-3.0.6-dfsg/src/VBox/Additions/common/crOpenGL/Makefile.kmk 2009-09-10 23:04:18.000000000 +0200 +@@ -69,21 +69,16 @@ + VBoxOGL_INCS = . + if1of ($(KBUILD_TARGET),linux solaris) + VBoxOGL_INCS += \ +- $(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \ +- $(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \ +- $(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \ +- $(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \ +- $(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \ +- $(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \ +- $(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \ +- $(VBOX_PATH_X11_ROOT)/1.3/xorg \ ++ /usr/include/x11 \ ++ /usr/include/xorg \ ++ /usr/include/pixman-1 \ + $(VBOX_PATH_MESA_SOURCE) \ + $(VBOX_PATH_MESA_SOURCE)/include \ + $(VBOX_PATH_MESA_SOURCE)/src/mesa/ \ + $(VBOX_PATH_MESA_SOURCE)/src/mesa/glapi \ + $(VBOX_PATH_MESA_SOURCE)/src/mesa/main \ + $(VBOX_PATH_MESA_SOURCE)/src/mesa/drivers/dri/common \ +- $(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.5 ++ /usr/include/drm + VBoxOGL_DEFS += VBOX_NO_NATIVEGL + endif + ifdef VBoxOGL_DRI +--- virtualbox-ose-3.0.6-dfsg/src/VBox/Additions/x11/x11include/1.4/xorg/Pci.h 1970-01-01 01:00:00.000000000 +0100 ++++ virtualbox-ose-3.0.6-dfsg/src/VBox/Additions/x11/x11include/1.4/xorg/Pci.h 2009-09-21 14:01:33.000000000 +0200 +@@ -0,0 +1,445 @@ ++/* ++ * Copyright 1998 by Concurrent Computer Corporation ++ * ++ * Permission to use, copy, modify, distribute, and sell this software ++ * and its documentation for any purpose is hereby granted without fee, ++ * provided that the above copyright notice appear in all copies and that ++ * both that copyright notice and this permission notice appear in ++ * supporting documentation, and that the name of Concurrent Computer ++ * Corporation not be used in advertising or publicity pertaining to ++ * distribution of the software without specific, written prior ++ * permission. Concurrent Computer Corporation makes no representations ++ * about the suitability of this software for any purpose. It is ++ * provided "as is" without express or implied warranty. ++ * ++ * CONCURRENT COMPUTER CORPORATION DISCLAIMS ALL WARRANTIES WITH REGARD ++ * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++ * AND FITNESS, IN NO EVENT SHALL CONCURRENT COMPUTER CORPORATION BE ++ * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY ++ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, ++ * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ++ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ * ++ * Copyright 1998 by Metro Link Incorporated ++ * ++ * Permission to use, copy, modify, distribute, and sell this software ++ * and its documentation for any purpose is hereby granted without fee, ++ * provided that the above copyright notice appear in all copies and that ++ * both that copyright notice and this permission notice appear in ++ * supporting documentation, and that the name of Metro Link ++ * Incorporated not be used in advertising or publicity pertaining to ++ * distribution of the software without specific, written prior ++ * permission. Metro Link Incorporated makes no representations ++ * about the suitability of this software for any purpose. It is ++ * provided "as is" without express or implied warranty. ++ * ++ * METRO LINK INCORPORATED DISCLAIMS ALL WARRANTIES WITH REGARD ++ * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++ * AND FITNESS, IN NO EVENT SHALL METRO LINK INCORPORATED BE ++ * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY ++ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, ++ * WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ++ * ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS ++ * SOFTWARE. ++ * ++ * This file is derived in part from the original xf86_PCI.h that included ++ * following copyright message: ++ * ++ * Copyright 1995 by Robin Cutshaw <robin@XFree86.Org> ++ * ++ * Permission to use, copy, modify, distribute, and sell this software and its ++ * documentation for any purpose is hereby granted without fee, provided that ++ * the above copyright notice appear in all copies and that both that ++ * copyright notice and this permission notice appear in supporting ++ * documentation, and that the names of the above listed copyright holder(s) ++ * not be used in advertising or publicity pertaining to distribution of ++ * the software without specific, written prior permission. The above listed ++ * copyright holder(s) make(s) no representations about the suitability of this ++ * software for any purpose. It is provided "as is" without express or ++ * implied warranty. ++ * ++ * THE ABOVE LISTED COPYRIGHT HOLDER(S) DISCLAIM(S) ALL WARRANTIES WITH REGARD ++ * TO THIS SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY ++ * AND FITNESS, IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE ++ * LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY ++ * DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER ++ * IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING ++ * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ++ * ++ */ ++/* ++ * Copyright (c) 1999-2003 by The XFree86 Project, Inc. ++ * ++ * Permission is hereby granted, free of charge, to any person obtaining a ++ * copy of this software and associated documentation files (the "Software"), ++ * to deal in the Software without restriction, including without limitation ++ * the rights to use, copy, modify, merge, publish, distribute, sublicense, ++ * and/or sell copies of the Software, and to permit persons to whom the ++ * Software is furnished to do so, subject to the following conditions: ++ * ++ * The above copyright notice and this permission notice shall be included in ++ * all copies or substantial portions of the Software. ++ * ++ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR ++ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, ++ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL ++ * THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR ++ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ++ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR ++ * OTHER DEALINGS IN THE SOFTWARE. ++ * ++ * Except as contained in this notice, the name of the copyright holder(s) ++ * and author(s) shall not be used in advertising or otherwise to promote ++ * the sale, use or other dealings in this Software without prior written ++ * authorization from the copyright holder(s) and author(s). ++ */ ++ ++ ++/* ++ * This file has the private Pci definitions. The public ones are imported ++ * from xf86Pci.h. Drivers should not use this file. ++ */ ++#ifdef HAVE_XORG_CONFIG_H ++#include <xorg-config.h> ++#endif ++ ++#ifndef _PCI_H ++#define _PCI_H 1 ++ ++#include <X11/Xarch.h> ++#include <X11/Xfuncproto.h> ++#include "xf86Pci.h" ++#include "xf86PciInfo.h" ++ ++/* ++ * Global Definitions ++ */ ++#define MAX_PCI_DEVICES 128 /* Max number of devices accomodated */ ++ /* by xf86scanpci */ ++#if defined(sun) && defined(SVR4) && defined(sparc) ++# define MAX_PCI_BUSES 4096 /* Max number of PCI buses */ ++#elif (defined(__alpha__) || defined(__ia64__)) && defined (linux) ++# define MAX_PCI_DOMAINS 512 ++# define PCI_DOM_MASK 0x01fful ++# define MAX_PCI_BUSES (MAX_PCI_DOMAINS*256) /* 256 per domain */ ++#else ++# define MAX_PCI_BUSES 256 /* Max number of PCI buses */ ++#endif ++ ++#define DEVID(vendor, device) \ ++ ((CARD32)((PCI_##device << 16) | PCI_##vendor)) ++ ++#ifndef PCI_DOM_MASK ++# define PCI_DOM_MASK 0x0ffu ++#endif ++#define PCI_DOMBUS_MASK (((PCI_DOM_MASK) << 8) | 0x0ffu) ++ ++/* ++ * "b" contains an optional domain number. ++ */ ++#define PCI_MAKE_TAG(b,d,f) ((((b) & (PCI_DOMBUS_MASK)) << 16) | \ ++ (((d) & 0x00001fu) << 11) | \ ++ (((f) & 0x000007u) << 8)) ++ ++#define PCI_MAKE_BUS(d,b) ((((d) & (PCI_DOM_MASK)) << 8) | ((b) & 0xffu)) ++ ++#define PCI_DOM_FROM_TAG(tag) (((tag) >> 24) & (PCI_DOM_MASK)) ++#define PCI_BUS_FROM_TAG(tag) (((tag) >> 16) & (PCI_DOMBUS_MASK)) ++#define PCI_DEV_FROM_TAG(tag) (((tag) & 0x0000f800u) >> 11) ++#define PCI_FUNC_FROM_TAG(tag) (((tag) & 0x00000700u) >> 8) ++ ++#define PCI_DFN_FROM_TAG(tag) (((tag) & 0x0000ff00u) >> 8) ++#define PCI_BDEV_FROM_TAG(tag) ((tag) & 0x00fff800u) ++ ++#define PCI_DOM_FROM_BUS(bus) (((bus) >> 8) & (PCI_DOM_MASK)) ++#define PCI_BUS_NO_DOMAIN(bus) ((bus) & 0xffu) ++#define PCI_TAG_NO_DOMAIN(tag) ((tag) & 0x00ffff00u) ++ ++/* ++ * Macros for bus numbers found in P2P headers. ++ */ ++#define PCI_PRIMARY_BUS_EXTRACT(x, tag) \ ++ ((((x) & PCI_PRIMARY_BUS_MASK ) >> 0) | (PCI_DOM_FROM_TAG(tag) << 8)) ++#define PCI_SECONDARY_BUS_EXTRACT(x, tag) \ ++ ((((x) & PCI_SECONDARY_BUS_MASK ) >> 8) | (PCI_DOM_FROM_TAG(tag) << 8)) ++#define PCI_SUBORDINATE_BUS_EXTRACT(x, tag) \ ++ ((((x) & PCI_SUBORDINATE_BUS_MASK) >> 16) | (PCI_DOM_FROM_TAG(tag) << 8)) ++ ++#define PCI_PRIMARY_BUS_INSERT(x, y) \ ++ (((x) & ~PCI_PRIMARY_BUS_MASK ) | (((y) & 0xffu) << 0)) ++#define PCI_SECONDARY_BUS_INSERT(x, y) \ ++ (((x) & ~PCI_SECONDARY_BUS_MASK ) | (((y) & 0xffu) << 8)) ++#define PCI_SUBORDINATE_BUS_INSERT(x, y) \ ++ (((x) & ~PCI_SUBORDINATE_BUS_MASK) | (((y) & 0xffu) << 16)) ++ ++/* Ditto for CardBus bridges */ ++#define PCI_CB_PRIMARY_BUS_EXTRACT(x, tag) \ ++ PCI_PRIMARY_BUS_EXTRACT(x, tag) ++#define PCI_CB_CARDBUS_BUS_EXTRACT(x, tag) \ ++ PCI_SECONDARY_BUS_EXTRACT(x, tag) ++#define PCI_CB_SUBORDINATE_BUS_EXTRACT(x, tag) \ ++ PCI_SUBORDINATE_BUS_EXTRACT(x, tag) ++ ++#define PCI_CB_PRIMARY_BUS_INSERT(x, tag) \ ++ PCI_PRIMARY_BUS_INSERT(x, tag) ++#define PCI_CB_CARDBUS_BUS_INSERT(x, tag) \ ++ PCI_SECONDARY_BUS_INSERT(x, tag) ++#define PCI_CB_SUBORDINATE_BUS_INSERT(x, tag) \ ++ PCI_SUBORDINATE_BUS_INSERT(x, tag) ++ ++#if X_BYTE_ORDER == X_BIG_ENDIAN ++#define PCI_CPU(val) (((val >> 24) & 0x000000ff) | \ ++ ((val >> 8) & 0x0000ff00) | \ ++ ((val << 8) & 0x00ff0000) | \ ++ ((val << 24) & 0xff000000)) ++#define PCI_CPU16(val) (((val >> 8) & 0x000000ff) | \ ++ ((val << 8) & 0x0000ff00)) ++#else ++#define PCI_CPU(val) (val) ++#define PCI_CPU16(val) (val) ++#endif ++ ++/* ++ * Debug Macros/Definitions ++ */ ++/* #define DEBUGPCI 2 */ /* Disable/enable trace in PCI code */ ++ ++#if defined(DEBUGPCI) ++ ++# define PCITRACE(lvl,printfargs) \ ++ if (lvl > xf86Verbose) { \ ++ ErrorF printfargs; \ ++ } ++ ++#else /* !defined(DEBUGPCI) */ ++ ++# define PCITRACE(lvl,printfargs) ++ ++#endif /* !defined(DEBUGPCI) */ ++ ++/* ++ * PCI Config mechanism definitions ++ */ ++#define PCI_EN 0x80000000 ++ ++#define PCI_CFGMECH1_ADDRESS_REG 0xCF8 ++#define PCI_CFGMECH1_DATA_REG 0xCFC ++ ++#define PCI_CFGMECH1_MAXDEV 32 ++ ++/* ++ * Select architecture specific PCI init function ++ */ ++#if defined(__alpha__) ++# if defined(linux) ++# define ARCH_PCI_INIT axpPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# elif defined(__FreeBSD__) || defined(__OpenBSD__) ++# define ARCH_PCI_INIT freebsdPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# elif defined(__NetBSD__) ++# define ARCH_PCI_INIT netbsdPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# endif ++#elif defined(__arm__) ++# if defined(linux) ++# define ARCH_PCI_INIT linuxPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# endif ++#elif defined(__hppa__) ++# if defined(linux) ++# define ARCH_PCI_INIT linuxPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# endif ++#elif defined(__ia64__) ++# if defined(linux) ++# define ARCH_PCI_INIT ia64linuxPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# elif defined(FreeBSD) ++# define ARCH_PCI_INIT freebsdPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# endif ++# define XF86SCANPCI_WRAPPER ia64ScanPCIWrapper ++#elif defined(__i386__) || defined(i386) ++# define ARCH_PCI_INIT ix86PciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# if defined(linux) ++# define ARCH_PCI_OS_INIT linuxPciInit ++# endif ++#elif defined(__mc68000__) ++# if defined(linux) ++# define ARCH_PCI_INIT linuxPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# endif ++#elif defined(__mips__) ++# if defined(linux) ++# define ARCH_PCI_INIT linuxPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# endif ++#elif defined(__powerpc__) || defined(__powerpc64__) ++# if defined(linux) ++# define ARCH_PCI_INIT linuxPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN /* Needs kernel work to remove */ ++# elif defined(__FreeBSD__) || defined(__OpenBSD__) ++# define ARCH_PCI_INIT freebsdPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# elif defined(__NetBSD__) ++# define ARCH_PCI_INIT netbsdPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# else ++# define ARCH_PCI_INIT ppcPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# endif ++#elif defined(__s390__) ++# if defined(linux) ++# define ARCH_PCI_INIT linuxPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# endif ++#elif defined(__sh__) ++# if defined(linux) ++# define ARCH_PCI_INIT linuxPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# endif ++#elif defined(__sparc__) || defined(sparc) ++# if defined(linux) ++# define ARCH_PCI_INIT linuxPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# elif defined(sun) ++# define ARCH_PCI_INIT sparcPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# elif (defined(__OpenBSD__) || defined(__FreeBSD__)) && defined(__sparc64__) ++# define ARCH_PCI_INIT freebsdPciInit ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# endif ++# if !defined(__FreeBSD__) && !defined(linux) ++# define ARCH_PCI_PCI_BRIDGE sparcPciPciBridge ++# endif ++#elif defined(__amd64__) || defined(__amd64) ++# if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) ++# define ARCH_PCI_INIT freebsdPciInit ++# else ++# define ARCH_PCI_INIT ix86PciInit ++# endif ++# define INCLUDE_XF86_MAP_PCI_MEM ++# define INCLUDE_XF86_NO_DOMAIN ++# if defined(linux) ++# define ARCH_PCI_OS_INIT linuxPciInit ++# endif ++#endif ++ ++#ifndef ARCH_PCI_INIT ++#error No PCI support available for this architecture/OS combination ++#endif ++ ++extern void ARCH_PCI_INIT(void); ++#if defined(ARCH_PCI_OS_INIT) ++extern void ARCH_PCI_OS_INIT(void); ++#endif ++ ++#if defined(ARCH_PCI_PCI_BRIDGE) ++extern void ARCH_PCI_PCI_BRIDGE(pciConfigPtr pPCI); ++#endif ++ ++#if defined(XF86SCANPCI_WRAPPER) ++typedef enum { ++ SCANPCI_INIT, ++ SCANPCI_TERM ++} scanpciWrapperOpt; ++extern void XF86SCANPCI_WRAPPER(scanpciWrapperOpt flags); ++#endif ++ ++/* ++ * Table of functions used to access a specific PCI bus domain ++ * (e.g. a primary PCI bus and all of its secondaries) ++ */ ++typedef struct pci_bus_funcs { ++ CARD32 (*pciReadLong)(PCITAG, int); ++ void (*pciWriteLong)(PCITAG, int, CARD32); ++ void (*pciSetBitsLong)(PCITAG, int, CARD32, CARD32); ++ ADDRESS (*pciAddrHostToBus)(PCITAG, PciAddrType, ADDRESS); ++ ADDRESS (*pciAddrBusToHost)(PCITAG, PciAddrType, ADDRESS); ++ /* ++ * The next three are optional. If NULL, the corresponding function is ++ * to be performed generically. ++ */ ++ CARD16 (*pciControlBridge)(int, CARD16, CARD16); ++ void (*pciGetBridgeBuses)(int, int *, int *, int *); ++ /* Use pointer's to avoid #include recursion */ ++ void (*pciGetBridgeResources)(int, pointer *, pointer *, pointer *); ++ ++ /* These are optional and will be implemented using read long ++ * if not present. */ ++ CARD8 (*pciReadByte)(PCITAG, int); ++ void (*pciWriteByte)(PCITAG, int, CARD8); ++ CARD16 (*pciReadWord)(PCITAG, int); ++ void (*pciWriteWord)(PCITAG, int, CARD16); ++ ++} pciBusFuncs_t, *pciBusFuncs_p; ++ ++/* ++ * pciBusInfo_t - One structure per defined PCI bus ++ */ ++typedef struct pci_bus_info { ++ unsigned char configMech; /* PCI config type to use */ ++ unsigned char numDevices; /* Range of valid devnums */ ++ unsigned char secondary; /* Boolean: bus is a secondary */ ++ int primary_bus; /* Parent bus */ ++ pciBusFuncs_p funcs; /* PCI access functions */ ++ void *pciBusPriv; /* Implementation private data */ ++ pciConfigPtr bridge; /* bridge that opens this bus */ ++} pciBusInfo_t; ++ ++#define HOST_NO_BUS ((pciBusInfo_t *)(-1)) ++ ++/* configMech values */ ++#define PCI_CFG_MECH_UNKNOWN 0 /* Not yet known */ ++#define PCI_CFG_MECH_1 1 /* Most machines */ ++#define PCI_CFG_MECH_2 2 /* Older PC's */ ++#define PCI_CFG_MECH_OTHER 3 /* Something else */ ++ ++/* Generic PCI service functions and helpers */ ++PCITAG pciGenFindFirst(void); ++PCITAG pciGenFindNext(void); ++CARD32 pciCfgMech1Read(PCITAG tag, int offset); ++void pciCfgMech1Write(PCITAG tag, int offset, CARD32 val); ++void pciCfgMech1SetBits(PCITAG tag, int offset, CARD32 mask, ++ CARD32 val); ++CARD32 pciByteSwap(CARD32); ++Bool pciMfDev(int, int); ++ADDRESS pciAddrNOOP(PCITAG tag, PciAddrType type, ADDRESS); ++ ++extern void pciSetOSBIOSPtr(int (*bios_fn)(PCITAG Tag, int basereg, unsigned char * buf, int len)); ++extern PCITAG (*pciFindFirstFP)(void); ++extern PCITAG (*pciFindNextFP)(void); ++ ++extern CARD32 pciDevid; ++extern CARD32 pciDevidMask; ++ ++extern int pciMaxBusNum; ++ ++extern int pciBusNum; ++extern int pciDevNum; ++extern int pciFuncNum; ++extern PCITAG pciDeviceTag; ++ ++extern int xf86MaxPciDevs; ++ ++extern pciBusInfo_t *pciBusInfo[]; ++ ++#endif /* _PCI_H */ diff --git a/debian/virtualbox-ose-guest-x11.install b/debian/virtualbox-ose-guest-x11.install index 9d7f59e32..7edb556ec 100644 --- a/debian/virtualbox-ose-guest-x11.install +++ b/debian/virtualbox-ose-guest-x11.install @@ -4,6 +4,7 @@ out/bin/additions/VBoxClient /usr/bin src/VBox/Additions/x11/Installer/x11config.pl /usr/share/virtualbox src/VBox/Additions/x11/Installer/x11config15.pl /usr/share/virtualbox src/VBox/Additions/x11/Installer/98vboxadd-xclient /etc/X11/Xsession.d +src/VBox/Additions/x11/Installer/vboxvideo.ids /usr/share/xserver-xorg/pci out/bin/additions/vboxmouse_drv.so /usr/lib/xorg/modules/input out/bin/additions/vboxvideo_drv.so /usr/lib/xorg/modules/drivers out/bin/additions/VBoxOGL*.so /usr/lib |