diff options
author | Gary Thomas <gary@mlbassoc.com> | 2013-03-22 10:17:50 -0600 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2013-03-22 13:49:13 -0300 |
commit | 2e6402a5fd601d183b620a8b38851159217e0d8b (patch) | |
tree | 609950dcf78487ca430b19dea51a6c7b42c4fdf2 /recipes-graphics/xorg-driver | |
parent | c6942196b58c013dda737288a7ba5e2dbc678d16 (diff) | |
download | meta-fsl-arm-2e6402a5fd601d183b620a8b38851159217e0d8b.tar.gz |
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>
Diffstat (limited to 'recipes-graphics/xorg-driver')
-rw-r--r-- | recipes-graphics/xorg-driver/xf86-dri-vivante/remove-mibstore.patch | 36 | ||||
-rw-r--r-- | recipes-graphics/xorg-driver/xf86-dri-vivante_12.09.01.bb | 4 |
2 files changed, 39 insertions, 1 deletions
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..1bdfaf9 --- /dev/null +++ b/recipes-graphics/xorg-driver/xf86-dri-vivante/remove-mibstore.patch | |||
@@ -0,0 +1,36 @@ | |||
1 | mibstore functions are no longer supported in the X server. | ||
2 | This patch removes them from this driver, following the pattern in | ||
3 | http://patches.openembedded.org/patch/46133/ | ||
4 | |||
5 | This checkin shows when/where the changes to the X server were made | ||
6 | that deleted the header mibstore.h and mentions the reasons. | ||
7 | http://lists.x.org/archives/xorg-devel/2012-September/033575.html | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: Gary Thomas <gary@mlbassoc.com> | ||
11 | -- | ||
12 | |||
13 | Index: 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" | ||
25 | Index: 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-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" | |||
6 | DEPENDS = "virtual/libx11 util-macros xf86-video-imxfb-vivante" | 6 | DEPENDS = "virtual/libx11 util-macros xf86-video-imxfb-vivante" |
7 | LIC_FILES_CHKSUM = "file://src/dri.h;enline=27;md5=79a9064e49ae41adca4827cd2281a014" | 7 | LIC_FILES_CHKSUM = "file://src/dri.h;enline=27;md5=79a9064e49ae41adca4827cd2281a014" |
8 | 8 | ||
9 | SRC_URI = "${FSL_MIRROR}/dri-xorg-graphic-imx-viv-${PV}.bin;fsl-eula=true" | 9 | SRC_URI = "${FSL_MIRROR}/dri-xorg-graphic-imx-viv-${PV}.bin;fsl-eula=true \ |
10 | file://remove-mibstore.patch \ | ||
11 | " | ||
10 | SRC_URI[md5sum] = "8c90045cd5f4dba81095856634ba5136" | 12 | SRC_URI[md5sum] = "8c90045cd5f4dba81095856634ba5136" |
11 | SRC_URI[sha256sum] = "c844dc180e43901359bbdb4f797ab178b3821fbf63bdee9577e5a0afe5d7f6ad" | 13 | SRC_URI[sha256sum] = "c844dc180e43901359bbdb4f797ab178b3821fbf63bdee9577e5a0afe5d7f6ad" |
12 | 14 | ||