xf86-video-imxfb-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: I83ae62ac97139602c6c401823980fa16ef94b12b
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>

diff --git a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/remove-mibstore.patch b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/remove-mibstore.patch
new file mode 100644 (file)
index 0000000..1bdfaf9
--- /dev/null
+++ b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-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-video-imxfb-vivante_12.09.01.bb b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb
index e35080fdfbc6efad7fa2c37f1462a5b4c17e9c7d..1182e220e04b3cbe4c9b089acc2fde84e6e91df6 100644 (file)
--- a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb
+++ b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb
@@ -11,6 +11,7 @@ LIC_FILES_CHKSUM = "file://src/vivante_fbdev/vivante.h;endline=19;md5=93a322f91e
 
 SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz \
            file://fix-vivante-compile.patch \
+           file://remove-mibstore.patch \
            file://Makefile.am-remove-prefixed-include-path.patch"
 SRC_URI[md5sum] = "1948119717aa01bed1f630be9ee7a708"
 SRC_URI[sha256sum] = "5b3be4b426d2d2803554df9e4d8919d1f9d17659c3153c71c6529f43c37e6ed1"