summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-03-22 13:46:49 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2013-03-22 13:49:13 -0300
commite085a8b34f195a304bbdb05d563fa1882955fcd0 (patch)
tree3f280787d2375502e249e4fee12a0af92ac519f9
parent2e6402a5fd601d183b620a8b38851159217e0d8b (diff)
downloadmeta-fsl-arm-e085a8b34f195a304bbdb05d563fa1882955fcd0.tar.gz
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>
-rw-r--r--recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/remove-mibstore.patch36
-rw-r--r--recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb1
2 files changed, 37 insertions, 0 deletions
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/remove-mibstore.patch b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/remove-mibstore.patch
new file mode 100644
index 0000000..1bdfaf9
--- /dev/null
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante/remove-mibstore.patch
@@ -0,0 +1,36 @@
1mibstore functions are no longer supported in the X server.
2This patch removes them from this driver, following the pattern in
3 http://patches.openembedded.org/patch/46133/
4
5This checkin shows when/where the changes to the X server were made
6that deleted the header mibstore.h and mentions the reasons.
7 http://lists.x.org/archives/xorg-devel/2012-September/033575.html
8
9Upstream-Status: Pending
10Signed-off-by: Gary Thomas <gary@mlbassoc.com>
11--
12
13Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_util/vivante_common.h
14===================================================================
15--- xserver-xorg-video-imx-viv-12.09.01.orig/src/vivante_util/vivante_common.h
16+++ xserver-xorg-video-imx-viv-12.09.01/src/vivante_util/vivante_common.h
17@@ -48,7 +48,6 @@ extern "C" {
18
19
20 #include "mipointer.h"
21-#include "mibstore.h"
22 #include "micmap.h"
23 #include "mipointrst.h"
24 #include "inputstr.h"
25Index: xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_driver.c
26===================================================================
27--- xserver-xorg-video-imx-viv-12.09.01.orig/src/vivante_fbdev/vivante_fbdev_driver.c
28+++ xserver-xorg-video-imx-viv-12.09.01/src/vivante_fbdev/vivante_fbdev_driver.c
29@@ -746,7 +746,6 @@ VivScreenInit(SCREEN_INIT_ARGS_DECL) {
30
31
32 xf86SetBlackWhitePixels(pScreen);
33- miInitializeBackingStore(pScreen);
34 xf86SetBackingStore(pScreen);
35
36 pScrn->vtSema = TRUE;
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb
index e35080f..1182e22 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb-vivante_12.09.01.bb
+++ b/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
11 11
12SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz \ 12SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-viv-${PV}.tar.gz \
13 file://fix-vivante-compile.patch \ 13 file://fix-vivante-compile.patch \
14 file://remove-mibstore.patch \
14 file://Makefile.am-remove-prefixed-include-path.patch" 15 file://Makefile.am-remove-prefixed-include-path.patch"
15SRC_URI[md5sum] = "1948119717aa01bed1f630be9ee7a708" 16SRC_URI[md5sum] = "1948119717aa01bed1f630be9ee7a708"
16SRC_URI[sha256sum] = "5b3be4b426d2d2803554df9e4d8919d1f9d17659c3153c71c6529f43c37e6ed1" 17SRC_URI[sha256sum] = "5b3be4b426d2d2803554df9e4d8919d1f9d17659c3153c71c6529f43c37e6ed1"