deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

package/x11r7/xdriver_xf86-video-mga: bump version to 1.6.5

Browse source 
Removed 0002-abi23.patch, applied upstream.

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2017-01-31 19:37:37 +01:00 committed by Thomas Petazzoni
parent ea367a7126
commit 28a51f619a
3 changed files with 3 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
package/x11r7/xdriver_xf86-video-mga/0002-abi23.patch
View file

@ -1,33 +0,0 @@
From df094bfffe4ef097bfd9a569f2d2e35649c1a3c7 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Tue, 19 Jul 2016 10:03:56 -0400
Subject: Adapt Block/WakeupHandler signature for ABI 23
Signed-off-by: Adam Jackson <ajax@redhat.com>
---
Downloaded from
https://cgit.freedesktop.org/xorg/driver/xf86-video-mga/commit/?id=df094bfffe4ef097bfd9a569f2d2e35649c1a3c7
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
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
--
cgit v0.10.2

4
package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.hash
View file

@ -1,2 +1,2 @@
# From http://lists.x.org/archives/xorg-announce/2015-February/002533.html
sha256 48c6690b6751c76f53de64f8dbeaa9d6c62dbcfe890c768fd87167951247d44f xf86-video-mga-1.6.4.tar.bz2
# From https://lists.x.org/archives/xorg-announce/2017-January/002765.html
sha256 b663cd8e6364f7c4e2637b9fcab9861d0e3971518c73b00d213f6545a1289422 xf86-video-mga-1.6.5.tar.bz2

2
package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk
View file

@ -4,7 +4,7 @@
#
################################################################################
XDRIVER_XF86_VIDEO_MGA_VERSION = 1.6.4
XDRIVER_XF86_VIDEO_MGA_VERSION = 1.6.5
XDRIVER_XF86_VIDEO_MGA_SOURCE = xf86-video-mga-$(XDRIVER_XF86_VIDEO_MGA_VERSION).tar.bz2
XDRIVER_XF86_VIDEO_MGA_SITE = http://xorg.freedesktop.org/archive/individual/driver
XDRIVER_XF86_VIDEO_MGA_LICENSE = MIT