From 92ce2459bc82b9ecdf9623c3008b7a8f427506dd Mon Sep 17 00:00:00 2001 From: sweeaun Date: Mon, 14 Aug 2017 15:37:13 -0700 Subject: [PATCH] xf86-video-mga: upgrade 1.6.4 -> 1.6.5 Upgrade xf86-video-mga version to 1.6.5. Adapt block/wakeupHandler signature for ABI 23 patch has been removed as the change already available from Upstream 1.6.5. Signed-off-by: sweeaun Signed-off-by: Saul Wold --- ...k-WakeupHandler-signature-for-ABI-23.patch | 36 ------------------- ...o-mga_1.6.4.bb => xf86-video-mga_1.6.5.bb} | 8 ++--- 2 files changed, 3 insertions(+), 41 deletions(-) delete mode 100644 common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch rename common/recipes-graphics/xorg-driver/{xf86-video-mga_1.6.4.bb => xf86-video-mga_1.6.5.bb} (68%) 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 deleted file mode 100644 index c41cefdd..00000000 --- a/common/recipes-graphics/xorg-driver/xf86-video-mga/0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 99b316e80a883372aaa61ee610d98fb53e6a52d4 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -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 - -Original author: Adam Jackson ---- - 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.5.bb similarity index 68% rename from common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.4.bb rename to common/recipes-graphics/xorg-driver/xf86-video-mga_1.6.5.bb index 61b2d3c1..d30936b6 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.5.bb @@ -6,9 +6,7 @@ DESCRIPTION = "mga is an Xorg driver for Matrox video cards" LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc" -SRC_URI += "file://checkfile.patch \ - file://0001-Adapt-Block-WakeupHandler-signature-for-ABI-23.patch \ - " +SRC_URI += "file://checkfile.patch" DEPENDS += "virtual/libx11 libpciaccess" @@ -16,8 +14,8 @@ PR = "r1" COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' -SRC_URI[md5sum] = "cd3db8370caa3e607614ea4e74d4c350" -SRC_URI[sha256sum] = "48c6690b6751c76f53de64f8dbeaa9d6c62dbcfe890c768fd87167951247d44f" +SRC_URI[md5sum] = "3ee2549247e01de3e7bce52c27483118" +SRC_URI[sha256sum] = "b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xf86driproto,xserver-xorg-extension-dri"