← Back to branch summary

~ubuntu-branches/ubuntu/trusty/virtualbox-ose/trusty

« back to all changes in this revision

Viewing changes to src/VBox/Additions/x11/vboxvideo/vboxvideo_68.h

  • Committer: Bazaar Package Importer
  • Author(s): Felix Geyer
  • Date: 2009-12-18 16:44:29 UTC
  • mfrom: (0.3.3 upstream) (0.4.6 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091218164429-jd34ccexpv5na11a
Tags: 3.1.2-dfsg-1ubuntu1
https://launchpad.net/bugs/498219
https://launchpad.net/bugs/288590
https://launchpad.net/bugs/474625
https://launchpad.net/bugs/495935
https://launchpad.net/bugs/473334
* Merge from Debian unstable (LP: #498219), remaining changes:
  - Disable update action
    - debian/patches/u01-disable-update-action.dpatch
  - VirtualBox should go in Accessories, not in System tools (LP: #288590)
    - debian/virtualbox-ose-qt.files/virtualbox-ose.desktop
  - Add Apport hook
    - debian/virtualbox-ose.files/source_virtualbox-ose.py
    - debian/virtualbox-ose.install
  - Add Launchpad integration
    - debian/control
    - debian/lpi-bug.xpm
    - debian/patches/u02-lp-integration.dpatch
* Fixes the following bugs:
  - Kernel module fails to build with Linux >= 2.6.32 (LP: #474625)
  - X.Org drivers need to be rebuilt against X-Server 1.7 (LP: #495935)
  - The *-source packages try to build the kernel modules even though the
    kernel headers aren't available (LP: #473334)
* Replace *-source packages with transitional packages for *-dkms.
* Adapt u01-disable-update-action.dpatch and u02-lp-integration.dpatch for
  new upstream version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/VBox/Additions/x11/vboxvideo/vboxvideo_68.h
56
56
#ifndef _VBOXVIDEO_H_
57
57
#define _VBOXVIDEO_H_
58
58
 
59
 
#include <VBox/VBoxGuest.h>
 
59
#include <VBox/VMMDev.h>
60
60
 
61
61
/* All drivers should typically include these */
62
62
#include "xf86.h"
153
153
    Bool pointerOffscreen;
154
154
    Bool useVbva;
155
155
    int viewportX, viewportY;
156
 
    VMMDevVideoAccelFlush *reqf; 
157
 
    VMMDevVideoAccelEnable *reqe; 
 
156
    Bool forceSWCursor;
 
157
    VMMDevVideoAccelFlush *reqf;
 
158
    VMMDevVideoAccelEnable *reqe;
158
159
    VMMDevMemory *pVMMDevMemory;
159
160
    VBVAMEMORY *pVbvaMemory;
160
161
} VBOXRec, *VBOXPtr;