Patchwork [meta-fsl-arm,v3] xf86-dr-vivante: Fix build with latest X server

login
register
mail settings
Submitter Gary Thomas
Date March 22, 2013, 4:23 p.m.
Message ID <514C857C.60703@gmail.com>
Download mbox | patch
Permalink /patch/46709/
State Accepted
Delegated to: Otavio Salvador
Headers show

Comments

Gary Thomas - March 22, 2013, 4:23 p.m.
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>
---
  .../xf86-dri-vivante/remove-mibstore.patch         |   36 ++++++++++++++++++++
  .../xorg-driver/xf86-dri-vivante_12.09.01.bb       |    4 ++-
  2 files changed, 39 insertions(+), 1 deletion(-)
  create mode 100644 recipes-graphics/xorg-driver/xf86-dri-vivante/remove-mibstore.patch

+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
Otavio Salvador - March 22, 2013, 5:41 p.m.
On Fri, Mar 22, 2013 at 1:23 PM, Gary Thomas <samoht.yrag@gmail.com> wrote:
> 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>

I applied this and also did a similar change for the Xorg driver as it
was also affected. I have used your patch on it as well.

Thanks.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br

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..1bdfaf9
--- /dev/null
+++ b/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/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"
  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"