diff options
| author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2017-01-31 19:37:35 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-02-01 21:39:18 +0100 |
| commit | c3637918f36548f58ba4e2d672a8123fcb1c1ce2 (patch) | |
| tree | 4bbf5e023db7ba4ec55849c46dd291f87732ba4c | |
| parent | e5918a7c53cdcad7e8729a8f4046351a491c43a5 (diff) | |
| download | buildroot-c3637918f36548f58ba4e2d672a8123fcb1c1ce2.tar.gz buildroot-c3637918f36548f58ba4e2d672a8123fcb1c1ce2.zip | |
package/x11r7/xdriver_xf86-video-tdfx: bump version to 1.4.7
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>
3 files changed, 3 insertions, 42 deletions
diff --git a/package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch b/package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch deleted file mode 100644 index 7e5d650f95..0000000000 --- a/package/x11r7/xdriver_xf86-video-tdfx/0002-abi23.patch +++ /dev/null @@ -1,39 +0,0 @@ -From b99390efcb55d7d4a68e8c595119c1af4426fc0b 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-tdfx/patch/?id=b99390efcb55d7d4a68e8c595119c1af4426fc0b - -Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> - -diff --git a/src/compat-api.h b/src/compat-api.h -index 98ba435..44daea4 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -78,11 +78,19 @@ - - #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 -+ -+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result -+#define WAKEUPHANDLER_ARGS arg, result -+#else - #define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask - #define BLOCKHANDLER_ARGS arg, pTimeout, pReadmask - - #define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result, pointer read_mask - #define WAKEUPHANDLER_ARGS arg, result, read_mask -+#endif - - #define CLOSE_SCREEN_ARGS_DECL ScreenPtr pScreen - #define CLOSE_SCREEN_ARGS pScreen --- -cgit v0.10.2 - diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash index 1cdef2ab81..84885596f6 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.hash @@ -1,2 +1,2 @@ -# From http://lists.x.org/archives/xorg-announce/2015-February/002536.html -sha256 3a8a88867c40ad61f1c9a09ffd7ac64102fa821685855d50ce66c7603dcc6d37 xf86-video-tdfx-1.4.6.tar.bz2 +# From https://lists.x.org/archives/xorg-announce/2017-January/002755.html +sha256 4cf48ee14ead52b23493c3dce5032496fd68bf1d000170bb138730497e212a42 xf86-video-tdfx-1.4.7.tar.bz2 diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk index 942dcf3d60..471e6cf4d2 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.6 +XDRIVER_XF86_VIDEO_TDFX_VERSION = 1.4.7 XDRIVER_XF86_VIDEO_TDFX_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_TDFX_SOURCE = xf86-video-tdfx-$(XDRIVER_XF86_VIDEO_TDFX_VERSION).tar.bz2 XDRIVER_XF86_VIDEO_TDFX_LICENSE = MIT |
