diff options
Diffstat (limited to 'meta-emenlow/recipes-graphics/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-xserver17.patch')
| -rw-r--r-- | meta-emenlow/recipes-graphics/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-xserver17.patch | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/meta-emenlow/recipes-graphics/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-xserver17.patch b/meta-emenlow/recipes-graphics/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-xserver17.patch new file mode 100644 index 00000000..defed503 --- /dev/null +++ b/meta-emenlow/recipes-graphics/xserver-xorg-video-psb/xserver-xorg-video-psb-0.32.1/xorg-x11-drv-psb-0.31.0-xserver17.patch @@ -0,0 +1,85 @@ +--- xserver-xorg-video-psb-0.31.0/src/Xpsb.h 2009-04-17 11:22:26.000000000 -0700 ++++ xserver-xorg-video-psb-0.31.0/src/Xpsb.h.new 2009-08-28 09:24:16.333677591 -0700 +@@ -38,7 +38,9 @@ + #include "xf86drm.h" + #include "xf86.h" + #include "xf86_OSproc.h" ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 + #include "xf86Resources.h" ++#endif + #include "compiler.h" + + #define XPSB_VOFFSET_X 0 +--- xserver-xorg-video-psb-0.31.0/src/psb_driver.h 2009-04-17 11:22:25.000000000 -0700 ++++ xserver-xorg-video-psb-0.31.0/src/psb_driver.h.new 2009-08-28 09:24:11.822679667 -0700 +@@ -34,7 +34,6 @@ + + #include "xf86.h" + #include "xf86_OSproc.h" +-#include "xf86Resources.h" + #include "compiler.h" + #include "xf86PciInfo.h" + #include "vgaHW.h" +@@ -46,8 +45,10 @@ + #include "xf86int10.h" + #include "mibank.h" + #include "dgaproc.h" ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 + #include "xf86Resources.h" + #include "xf86RAC.h" ++#endif + #include "fb.h" + #include "xaa.h" + #include "xf86xv.h" +--- xserver-xorg-video-psb-0.31.0/src/i830_i2c.c 2009-04-17 11:22:24.000000000 -0700 ++++ xserver-xorg-video-psb-0.31.0/src/i830_i2c.c.new 2009-08-28 09:33:06.789804272 -0700 +@@ -31,8 +31,10 @@ + + #include "xf86.h" + #include "xf86_OSproc.h" ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 + #include "xf86Resources.h" + #include "xf86RAC.h" ++#endif + #include "xf86cmap.h" + #include "compiler.h" + #include "mibstore.h" +--- xserver-xorg-video-psb-0.31.0/src/psb_video.c 2009-04-17 11:22:26.000000000 -0700 ++++ xserver-xorg-video-psb-0.31.0/src/psb_video.c.new 2009-08-28 09:35:03.874805663 -0700 +@@ -36,7 +36,9 @@ + + #include "xf86.h" + #include "xf86_OSproc.h" ++#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6 + #include "xf86Resources.h" ++#endif + #include "compiler.h" + + #include "xf86xv.h" +--- xserver-xorg-video-psb-0.31.0/src/psb_driver.c 2009-04-17 11:22:26.000000000 -0700 ++++ xserver-xorg-video-psb-0.31.0/src/psb_driver.c.new 2009-08-28 10:30:32.325553685 -0700 +@@ -317,7 +317,7 @@ + * This data is accessed by the loader. The name must be the module name + * followed by "ModuleData". + */ +-XF86ModuleData psbModuleData = { &psbVersionRec, psbSetup, NULL }; ++_X_EXPORT XF86ModuleData psbModuleData = { &psbVersionRec, psbSetup, NULL }; + + static pointer + psbSetup(pointer Module, pointer Options, int *ErrorMajor, int *ErrorMinor) +@@ -1023,11 +1023,13 @@ + + PSB_DEBUG(scrnIndex, 3, "Initializing device\n"); + ++#ifndef XSERVER_LIBPCIACCESS + if (xf86RegisterResources(pDevice->pEnt->index, NULL, ResExclusive)) { + xf86DrvMsg(scrnIndex, X_ERROR, + "Could not registrer device. Resource conflict.\n"); + return FALSE; + } ++#endif + + if (!xf86LoadSubModule(pDevice->pScrns[0], "vgahw")) + return FALSE; + + |