Patchwork [meta-fsl-arm,v2] xf86-dri-vivante: Fix build with latest X server base

login
register
mail settings
Submitter Gary Thomas
Date March 19, 2013, 1:55 p.m.
Message ID <51486E65.6070403@gmail.com>
Download mbox | patch
Permalink /patch/46459/
State Superseded
Delegated to: Otavio Salvador
Headers show

Comments

Gary Thomas - March 19, 2013, 1:55 p.m.
mibstore functions are no longer supported.  This patch
removes them from this driver, following the pattern in
   http://patches.openembedded.org/patch/46133/

This checkin shows when/where the changes to the X server were made
that deleted the header mibstore.h and mentions the reasons.
   http://lists.x.org/archives/xorg-devel/2012-September/033575.html


Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
  .../xf86-dri-vivante/remove-mibstore.patch         |   24 ++++++++++++++++++++
  .../xorg-driver/xf86-dri-vivante_12.09.01.bb       |    4 +++-
  2 files changed, 27 insertions(+), 1 deletion(-)
  create mode 100644 recipes-graphics/xorg-driver/xf86-dri-vivante/remove-mibstore.patch

  LIC_FILES_CHKSUM = "file://src/dri.h;enline=27;md5=79a9064e49ae41adca4827cd2281a014"
  -SRC_URI = "${FSL_MIRROR}/dri-xorg-graphic-imx-viv-${PV}.bin;fsl-eula=true"
+SRC_URI = "${FSL_MIRROR}/dri-xorg-graphic-imx-viv-${PV}.bin;fsl-eula=true \
+           file://remove-mibstore.patch \
+"
  SRC_URI[md5sum] = "8c90045cd5f4dba81095856634ba5136"
  SRC_URI[sha256sum] = "c844dc180e43901359bbdb4f797ab178b3821fbf63bdee9577e5a0afe5d7f6ad"
  -- 1.7.9.5

Patch

diff --git a/recipes-graphics/xorg-driver/xf86-dri-vivante/remove-mibstore.patch b/recipes-graphics/xorg-driver/xf86-dri-vivante/remove-mibstore.patch
new file mode 100644
index 0000000..1c48563
--- /dev/null
+++ b/recipes-graphics/xorg-driver/xf86-dri-vivante/remove-mibstore.patch
@@ -0,0 +1,24 @@ 
+Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_util/vivante_common.h
+===================================================================
+--- xserver-xorg-video-imx-viv-12.09.01.orig/src/vivante_util/vivante_common.h
++++ xserver-xorg-video-imx-viv-12.09.01/src/vivante_util/vivante_common.h
+@@ -48,7 +48,6 @@ extern "C" {
+ + + #include "mipointer.h"
+-#include "mibstore.h"
+ #include "micmap.h"
+ #include "mipointrst.h"
+ #include "inputstr.h"
+Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_driver.c
+===================================================================
+--- xserver-xorg-video-imx-viv-12.09.01.orig/src/vivante_fbdev/vivante_fbdev_driver.c
++++ xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_driver.c
+@@ -746,7 +746,6 @@ VivScreenInit(SCREEN_INIT_ARGS_DECL) {
+ + +     xf86SetBlackWhitePixels(pScreen);
+-    miInitializeBackingStore(pScreen);
+     xf86SetBackingStore(pScreen);
+ +     pScrn->vtSema = TRUE;
diff --git a/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb b/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb
index acc5479..9f63fb8 100644
--- a/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb
+++ b/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb
@@ -6,7 +6,9 @@  SECTION = "x11/base"
  DEPENDS = "virtual/libx11 util-macros xf86-video-imxfb-vivante"