From: Gary Thomas <gary@mlbassoc.com>
Date: Fri, 22 Mar 2013 16:17:50 +0000 (-0600)
Subject: xf86-dri-vivante: Fix build with latest X server
X-Git-Tag: 2.1~1483
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=711543599d7d58cfb750f94a22d2b1d8c531b7a0;p=meta-freescale.git

xf86-dri-vivante: Fix build with latest X server

mibstore functions are no longer supported in the X server.
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

Change-Id: I72174754d98a1f9f918dcbf56da600820476f80c
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---

diff --git a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante/remove-mibstore.patch b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante/remove-mibstore.patch
new file mode 100644
index 00000000..1bdfaf9d
--- /dev/null
+++ b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante/remove-mibstore.patch
@@ -0,0 +1,36 @@
+mibstore functions are no longer supported in the X server.  
+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
+
+Upstream-Status: Pending
+Signed-off-by: Gary Thomas <gary@mlbassoc.com> 
+--
+
+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/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb
index acc54794..9f63fb8a 100644
--- a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb
+++ b/meta-fsl-arm/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"
 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"