From: "Roy.Li" <[email protected]> backport a patch to fix a compile failure when xorg-xserver's version is less than 1.10
Signed-off-by: Roy.Li <[email protected]> --- ...-compilation-error-with-xorg-xserver-1.10.patch | 31 ++++++++++++++++++++ .../xorg-driver/xf86-video-intel_2.21.9.bb | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch new file mode 100644 index 0000000..0d0d99f --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch @@ -0,0 +1,31 @@ +From b5e85e495e55e2537d305b7bebacdf6f97b66199 Mon Sep 17 00:00:00 2001 +From: "Roy.Li" <[email protected]> +Date: Thu, 27 Jun 2013 14:10:14 +0800 +Subject: [PATCH] uxa: fix the compilation error with xorg-xserver <= 1.10 + +Upstream-Status: Backported + +struct _Screen has no canDoBGNoneRoot when ABI_VIDEODRV_VERSION is less than 10.0 + +Signed-off-by: Roy.Li <[email protected]> +--- + src/intel_display.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/intel_display.c b/src/intel_display.c +index 17168e5..0acb86d 100644 +--- a/src/intel_display.c ++++ b/src/intel_display.c +@@ -2113,7 +2113,9 @@ void intel_copy_fb(ScrnInfoPtr scrn) + 0, 0, + scrn->virtualX, scrn->virtualY); + intel->uxa_driver->done_copy(dst); ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(10, 0) + pScreen->canDoBGNoneRoot = TRUE; ++#endif + + cleanup_dst: + (*pScreen->DestroyPixmap)(dst); +-- +1.7.10.4 + diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb index 6112089..01c767b 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.9.bb @@ -12,6 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" DEPENDS += "virtual/libx11 drm xf86driproto glproto \ virtual/libgl xineramaproto xf86driproto libpciaccess udev" +SRC_URI += "file://0001-uxa-fix-the-compilation-error-with-xorg-xserver-1.10.patch" + PACKAGECONFIG ??= "" PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" -- 1.7.10.4 _______________________________________________ Openembedded-core mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-core
