VirtualBox

Ignore:
Timestamp:
Sep 10, 2012 3:08:03 PM (13 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
80681
Message:

Additions/x11/vboxvideo: reduce header file dependencies from xorg-server.h

Location:
trunk/src/VBox/Additions/x11/vboxvideo
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/x11/vboxvideo/Makefile.kmk

    r43257 r43270  
    2323#
    2424include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
     25
     26vboxvideo_70_DEFS := \
     27        IN_MODULE XORG_7X RENDER=1 IN_RT_STATIC
     28ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
     29 vboxvideo_70_DEFS += __EXTENSIONS__  ## @todo Why this?
     30endif
     31vboxvideo_13_DEFS := $(vboxvideo_70_DEFS) VBOXVIDEO_13
     32vboxvideo_15_DEFS := \
     33        $(vboxvideo_13_DEFS) VBOX_DRI NO_ANSIC PCIACCESS XSERVER_LIBPCIACCESS
    2534
    2635#
    … …  
    109118        -Wno-conversion -Wno-unused-parameter $(VBOX_GCC_Wno-variadic-macros) # template?
    110119endif
    111 vboxvideo_drv_70_DEFS := \
    112         XFree86Server IN_MODULE XFree86Module XFree86LOADER XORG_7X RENDER=1 IN_XF86_MODULE IN_RT_STATIC
     120vboxvideo_drv_70_DEFS = $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700000000
    113121ifeq ($(KBUILD_TARGET),solaris) # don't use .solaris or anything here.
    114  vboxvideo_drv_70_DEFS += __EXTENSIONS__
    115122 vboxvideo_drv_70_CFLAGS += -D_XPG6 # Until we have moved the C++ bits into a library
    116123endif
    … …  
    129136vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
    130137vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    131 vboxvideo_drv_71_DEFS := $(vboxvideo_drv_70_DEFS)
     138vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700100000
    132139vboxvideo_drv_71_INCS = \
    133140        $(VBOX_PATH_X11_XORG_7_1) \
    … …  
    144151vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
    145152vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    146 vboxvideo_drv_13_DEFS := $(vboxvideo_drv_70_DEFS) VBOXVIDEO_13
     153vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100300000
    147154vboxvideo_drv_13_INCS = \
    148155        $(VBOX_PATH_X11_XORG_1_3) \
    … …  
    163170vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
    164171vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    165 vboxvideo_drv_14_DEFS := $(vboxvideo_drv_13_DEFS)
     172vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100400000
    166173vboxvideo_drv_14_INCS = \
    167174        $(VBOX_PATH_X11_XORG_1_4) \
    … …  
    182189vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
    183190vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    184 vboxvideo_drv_15_DEFS := $(vboxvideo_drv_13_DEFS) NO_ANSIC PCIACCESS \
    185                          VBOX_NO_LOW_COLOUR
     191vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
    186192if1of ($(KBUILD_TARGET), linux solaris)
    187193 vboxvideo_drv_15_DEFS += VBOX_DRI
    … …  
    209215vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
    210216vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    211 vboxvideo_drv_16_DEFS := $(vboxvideo_drv_15_DEFS)
     217vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
    212218vboxvideo_drv_16_INCS = \
    213219        $(VBOX_PATH_X11_XORG_1_6) \
    … …  
    229235vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
    230236vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    231 vboxvideo_drv_17_DEFS := $(vboxvideo_drv_15_DEFS)
     237vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
    232238## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    233239vboxvideo_drv_17_INCS = \
    … …  
    256262vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
    257263vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    258 vboxvideo_drv_18_DEFS := $(vboxvideo_drv_15_DEFS)
     264vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
    259265## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    260266vboxvideo_drv_18_INCS = \
    … …  
    283289vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
    284290vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    285 vboxvideo_drv_19_DEFS := $(vboxvideo_drv_15_DEFS)
     291vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
    286292## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    287293vboxvideo_drv_19_INCS = \
    … …  
    310316vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
    311317vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    312 vboxvideo_drv_110_DEFS := $(vboxvideo_drv_15_DEFS)
     318vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
    313319## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    314320vboxvideo_drv_110_INCS = \
    … …  
    337343vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
    338344vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    339 vboxvideo_drv_111_DEFS := $(vboxvideo_drv_15_DEFS)
     345vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
    340346## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    341347vboxvideo_drv_111_INCS = \
    … …  
    364370vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
    365371vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    366 vboxvideo_drv_112_DEFS := $(vboxvideo_drv_15_DEFS)
     372vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
    367373## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    368374vboxvideo_drv_112_INCS = \
    … …  
    391397vboxvideo_drv_113_TEMPLATE = VBOXGUESTR3XORGMOD
    392398vboxvideo_drv_113_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
    393 vboxvideo_drv_113_DEFS := $(vboxvideo_drv_15_DEFS)
     399vboxvideo_drv_113_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101300000
    394400## @todo replace $(VBOX_PATH_X11_ROOT)/xorg-server-1.6.0-local
    395401vboxvideo_drv_113_INCS = \

  • trunk/src/VBox/Additions/x11/vboxvideo/edid.c

    r35776 r43270  
    4545 */
    4646
    47 #include <xorg-server.h>
    4847#include <misc.h>
    4948#include <xf86DDC.h>

  • trunk/src/VBox/Additions/x11/vboxvideo/pointer.c

    r43081 r43270  
    3131
    3232#include "vboxvideo.h"
     33
     34#ifdef XORG_7X
     35# include <stdlib.h>
     36#endif
    3337
    3438#define VBOX_MAX_CURSOR_WIDTH 64

  • trunk/src/VBox/Additions/x11/vboxvideo/setmode.c

    r43245 r43270  
    5454# define _XF86_ANSIC_H
    5555# define XF86_LIBC_H
    56 # include "xorg-server.h"
    5756# include <string.h>
    5857#endif

  • trunk/src/VBox/Additions/x11/vboxvideo/vboxutils.c

    r43246 r43270  
    2929
    3030#include "vboxvideo.h"
     31
     32#ifdef XORG_7X
     33# include <stdio.h>
     34# include <stdlib.h>
     35#endif
    3136
    3237/**************************************************************************

  • trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.c

    r43250 r43270  
    5656
    5757#ifdef XORG_7X
    58 # include "xorg-server.h"
     58# include <stdlib.h>
    5959# include <string.h>
    6060#endif
    … …  
    560560#endif /* VBOXVIDEO_13 */
    561561
    562 #ifdef XFree86LOADER
    563562/* Module loader interface */
    564563static MODULESETUPPROTO(vboxSetup);
    … …  
    623622}
    624623
    625 #endif  /* XFree86Loader defined */
    626624
    627625static const OptionInfoRec *

  • trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo.h

    r43245 r43270  
    118118#include "sarea.h"
    119119#include "GL/glxint.h"
    120 #include "GL/glxtokens.h"
    121120
    122121/* For some reason this is not in the header files. */

  • trunk/src/VBox/Additions/x11/vboxvideo/vboxvideo_dri.c

    r43108 r43270  
    5252# include "xf86Pci.h"
    5353#endif
     54#include <dri.h>
     55#include <GL/glx.h>
     56#include <GL/glxint.h>
     57#include <drm.h>
    5458
    5559static Bool
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette