diff options
author | Saul Wold <sgw@linux.intel.com> | 2016-03-31 16:27:30 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-05 09:55:47 +0100 |
commit | c8aecfb55961431a5fbce6f90e582418983f17bf (patch) | |
tree | d6c19f290982592b97699858e06fc6bdd78b6ace /meta | |
parent | 7d9e915224a9bc451fddfbbfad533d9b06e9987d (diff) | |
download | openembedded-core-contrib-c8aecfb55961431a5fbce6f90e582418983f17bf.tar.gz |
xf86-video-intel: Add patch to allow UXA to build
This patch is a backport to fixup an API change in xorg-server
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
2 files changed, 31 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch new file mode 100644 index 00000000000..29924bb90c5 --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch @@ -0,0 +1,30 @@ +From 2c5063938cc809f624e56efd4673041fa8141e81 Mon Sep 17 00:00:00 2001 +From: Martin Peres <martin.peres@linux.intel.com> +Date: Thu, 9 Jul 2015 11:26:38 +0300 +Subject: [PATCH] uxa: fix the call to PixmapSyncDirtyHelper, broken by + xserver's 90db5ed + +[ickle: switch to HAS_DIRTYTRACKING_ROTATION as suggested by Dave Airlie] +Signed-off-by: Martin Peres <martin.peres@linux.intel.com> + +Upstream-Status: Backport +Signed-off-by: Saul Wold <sgw@linux.intel.com> +--- + src/compat-api.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/compat-api.h b/src/compat-api.h +index aa93bee..293e9d7 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -247,3 +247,7 @@ static inline void FreePixmap(PixmapPtr pixmap) + #endif + + #endif ++ ++#if HAS_DIRTYTRACKING_ROTATION ++#define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d) ++#endif +-- +2.5.0 + diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb index a2f145659b7..f4125565c73 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb @@ -13,6 +13,7 @@ SRC_URI += "file://disable-x11-dri3.patch \ file://always_include_xorg_server.h.patch \ file://sna-Protect-against-ABI-breakage-in-recent-versions-.patch \ file://udev-fstat.patch \ + file://0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch \ " SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b" |