On 16 November 2016 at 12:14, Jussi Kukkonen <jussi.kukko...@intel.com> wrote:
> Fixes build with xserver-xorg 1.19. > On further testing I see there are several drivers in oe-core that do not build cleanly with 1.19. I'm fine with dropping the patch for now: I will only finish this xserver-xorg upgrade after my vacation (so December), but I can resend this patch at that point if there's no new release by then. Jussi > Signed-off-by: Jussi Kukkonen <jussi.kukko...@intel.com> > --- > ...-Block-WakeupHandler-signature-for-ABI-23.patch | 36 > ++++++++++++++++++++++ > .../xorg-driver/xf86-video-mga_1.6.4.bb | 4 ++- > 2 files changed, 39 insertions(+), 1 deletion(-) > create mode 100644 common/recipes-graphics/xorg- > driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler- > signature-for-ABI-23.patch > > diff --git a/common/recipes-graphics/xorg-driver/xf86-video-mga/ > 0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch > b/common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block- > WakeupHandler-signature-for-ABI-23.patch > new file mode 100644 > index 0000000..c41cefd > --- /dev/null > +++ b/common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block- > WakeupHandler-signature-for-ABI-23.patch > @@ -0,0 +1,36 @@ > +From 99b316e80a883372aaa61ee610d98fb53e6a52d4 Mon Sep 17 00:00:00 2001 > +From: Jussi Kukkonen <jussi.kukko...@intel.com> > +Date: Wed, 16 Nov 2016 12:03:03 +0200 > +Subject: [PATCH] Adapt Block/WakeupHandler signature for ABI 23 > + > +Add backport to fix build with new xserver-xorg. > + > +Upstream-Status: Backport [df094bfffe] > +Signed-off-by: Jussi Kukkonen <jussi.kukko...@intel.com> > + > +Original author: Adam Jackson <a...@redhat.com> > +--- > + src/compat-api.h | 5 +++++ > + 1 file changed, 5 insertions(+) > + > +diff --git a/src/compat-api.h b/src/compat-api.h > +index 6bc946f..89976e4 100644 > +--- a/src/compat-api.h > ++++ b/src/compat-api.h > +@@ -75,8 +75,13 @@ > + > + #define SCREEN_INIT_ARGS_DECL ScreenPtr pScreen, int argc, char **argv > + > ++#if ABI_VIDEODRV_VERSION >= SET_ABI_VERSION(23, 0) > ++#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout > ++#define BLOCKHANDLER_ARGS arg, pTimeout > ++#else > + #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer > pReadmask > + #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask > ++#endif > + > + #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen > + #define CLOSE_SCREEN_ARGS pScreen > +-- > +2.1.4 > + > diff --git a/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb > b/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb > index 36b75b2..61b2d3c 100644 > --- a/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb > +++ b/common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb > @@ -6,7 +6,9 @@ DESCRIPTION = "mga is an Xorg driver for Matrox video > cards" > > LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc" > > -SRC_URI += "file://checkfile.patch" > +SRC_URI += "file://checkfile.patch \ > + file://0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch > \ > + " > > DEPENDS += "virtual/libx11 libpciaccess" > > -- > 2.1.4 > >
-- _______________________________________________ meta-intel mailing list meta-intel@yoctoproject.org https://lists.yoctoproject.org/listinfo/meta-intel