From e7dfcf22af3dc682deaa68c7d0a8b55b21bcbfc0 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Wed, 20 Mar 2013 18:14:51 -0300 Subject: [PATCH] xf86-video-imxfb: Fix build using 1.14 Xorg server mibstore functions are no longer supported. 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: I3957ada1f71bffa3f1e3b4533e0a0d25bf5838cc Signed-off-by: Otavio Salvador --- .../xserver-1.14-compat.patch | 26 +++++++++++++++++++ .../xorg-driver/xf86-video-imxfb_11.09.01.bb | 3 ++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb/xserver-1.14-compat.patch diff --git a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb/xserver-1.14-compat.patch b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb/xserver-1.14-compat.patch new file mode 100644 index 00000000..a1e05a2d --- /dev/null +++ b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb/xserver-1.14-compat.patch @@ -0,0 +1,26 @@ +Fix building using new Xorg 1.14 + +mibstore functions are no longer supported. 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: Otavio Salvador + +Index: xserver-xorg-video-imx-11.09.01/src/imx_driver.c +=================================================================== +--- xserver-xorg-video-imx-11.09.01.orig/src/imx_driver.c ++++ xserver-xorg-video-imx-11.09.01/src/imx_driver.c +@@ -37,7 +37,6 @@ + #include "xf86_OSproc.h" + + #include "mipointer.h" +-#include "mibstore.h" + #include "micmap.h" + #include "colormapst.h" + #include "xf86cmap.h" diff --git a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb_11.09.01.bb b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb_11.09.01.bb index f3273304..274f890a 100644 --- a/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb_11.09.01.bb +++ b/meta-fsl-arm/recipes-graphics/xorg-driver/xf86-video-imxfb_11.09.01.bb @@ -6,13 +6,14 @@ LICENSE = "MIT-X" DEPENDS = "virtual/xserver virtual/libx11 xproto randrproto util-macros amd-gpu-x11-bin-mx51 libz160" LIC_FILES_CHKSUM = "file://COPYING;md5=f7bdc0c63080175d1667091b864cb12c" -PR = "r10" +PR = "r11" SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-${PV}.tar.gz \ file://xf86-video-imxfb-fix-m4-hardcodded-paths.patch \ file://Make-video-API-forward-and-backward-compatible.patch \ file://ext-Update-to-newer-swap-macros.patch \ file://Fix-error-unknown-type-name-uint.patch \ + file://xserver-1.14-compat.patch \ " SRC_URI[md5sum] = "d19148399b5d1c4dab90d0cc6f2c4789" SRC_URI[sha256sum] = "d7d85e9f13c6dd58addab89847f3a8a67f6382a54135c7978c9a95368af024d4" -- 2.40.1