summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2013-03-20 18:14:51 -0300
committerOtavio Salvador <otavio@ossystems.com.br>2013-03-20 18:23:22 -0300
commit77af633422b96469f0fd2fc3b0ef889c0130cd52 (patch)
treef6e93fe61e00e266ce4820197a1a6dd88f7fcd29
parent623f4a8cc175ad0044137582f6ac09174eeaf570 (diff)
downloadmeta-fsl-arm-77af633422b96469f0fd2fc3b0ef889c0130cd52.tar.gz
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 <otavio@ossystems.com.br>
-rw-r--r--recipes-graphics/xorg-driver/xf86-video-imxfb/xserver-1.14-compat.patch26
-rw-r--r--recipes-graphics/xorg-driver/xf86-video-imxfb_11.09.01.bb3
2 files changed, 28 insertions, 1 deletions
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb/xserver-1.14-compat.patch b/recipes-graphics/xorg-driver/xf86-video-imxfb/xserver-1.14-compat.patch
new file mode 100644
index 0000000..a1e05a2
--- /dev/null
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb/xserver-1.14-compat.patch
@@ -0,0 +1,26 @@
1Fix building using new Xorg 1.14
2
3mibstore functions are no longer supported. This patch removes them
4from this driver, following the pattern in
5http://patches.openembedded.org/patch/46133/
6
7This checkin shows when/where the changes to the X server were made
8that deleted the header mibstore.h and mentions the reasons.
9http://lists.x.org/archives/xorg-devel/2012-September/033575.html
10
11Upstream-Status: Pending
12
13Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
14
15Index: xserver-xorg-video-imx-11.09.01/src/imx_driver.c
16===================================================================
17--- xserver-xorg-video-imx-11.09.01.orig/src/imx_driver.c
18+++ xserver-xorg-video-imx-11.09.01/src/imx_driver.c
19@@ -37,7 +37,6 @@
20 #include "xf86_OSproc.h"
21
22 #include "mipointer.h"
23-#include "mibstore.h"
24 #include "micmap.h"
25 #include "colormapst.h"
26 #include "xf86cmap.h"
diff --git a/recipes-graphics/xorg-driver/xf86-video-imxfb_11.09.01.bb b/recipes-graphics/xorg-driver/xf86-video-imxfb_11.09.01.bb
index f327330..274f890 100644
--- a/recipes-graphics/xorg-driver/xf86-video-imxfb_11.09.01.bb
+++ b/recipes-graphics/xorg-driver/xf86-video-imxfb_11.09.01.bb
@@ -6,13 +6,14 @@ LICENSE = "MIT-X"
6DEPENDS = "virtual/xserver virtual/libx11 xproto randrproto util-macros amd-gpu-x11-bin-mx51 libz160" 6DEPENDS = "virtual/xserver virtual/libx11 xproto randrproto util-macros amd-gpu-x11-bin-mx51 libz160"
7LIC_FILES_CHKSUM = "file://COPYING;md5=f7bdc0c63080175d1667091b864cb12c" 7LIC_FILES_CHKSUM = "file://COPYING;md5=f7bdc0c63080175d1667091b864cb12c"
8 8
9PR = "r10" 9PR = "r11"
10 10
11SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-${PV}.tar.gz \ 11SRC_URI = "${FSL_MIRROR}/xserver-xorg-video-imx-${PV}.tar.gz \
12 file://xf86-video-imxfb-fix-m4-hardcodded-paths.patch \ 12 file://xf86-video-imxfb-fix-m4-hardcodded-paths.patch \
13 file://Make-video-API-forward-and-backward-compatible.patch \ 13 file://Make-video-API-forward-and-backward-compatible.patch \
14 file://ext-Update-to-newer-swap-macros.patch \ 14 file://ext-Update-to-newer-swap-macros.patch \
15 file://Fix-error-unknown-type-name-uint.patch \ 15 file://Fix-error-unknown-type-name-uint.patch \
16 file://xserver-1.14-compat.patch \
16" 17"
17SRC_URI[md5sum] = "d19148399b5d1c4dab90d0cc6f2c4789" 18SRC_URI[md5sum] = "d19148399b5d1c4dab90d0cc6f2c4789"
18SRC_URI[sha256sum] = "d7d85e9f13c6dd58addab89847f3a8a67f6382a54135c7978c9a95368af024d4" 19SRC_URI[sha256sum] = "d7d85e9f13c6dd58addab89847f3a8a67f6382a54135c7978c9a95368af024d4"