diff options
author | wiz <wiz@pkgsrc.org> | 2017-01-18 18:23:24 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2017-01-18 18:23:24 +0000 |
commit | b1ac6fe958558cd62ad09e18e888973d8a6ce1fe (patch) | |
tree | 3582e13700d51658137a74f58f6168f8468016cc /x11/xf86-video-tdfx | |
parent | 926734fb64405d491428395fe75bb149721cec11 (diff) | |
download | pkgsrc-b1ac6fe958558cd62ad09e18e888973d8a6ce1fe.tar.gz |
Updated xf86-video-tdfx to 1.4.7.
Adam Jackson (1):
Adapt Block/WakeupHandler signature for ABI 23
Matt Turner (1):
xf86-video-tdfx 1.4.7
Diffstat (limited to 'x11/xf86-video-tdfx')
-rw-r--r-- | x11/xf86-video-tdfx/Makefile | 5 | ||||
-rw-r--r-- | x11/xf86-video-tdfx/distinfo | 11 | ||||
-rw-r--r-- | x11/xf86-video-tdfx/patches/patch-src_compat-api.h | 32 |
3 files changed, 7 insertions, 41 deletions
diff --git a/x11/xf86-video-tdfx/Makefile b/x11/xf86-video-tdfx/Makefile index 9285a6a0b9e..3304e90b271 100644 --- a/x11/xf86-video-tdfx/Makefile +++ b/x11/xf86-video-tdfx/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.20 2016/02/26 11:27:21 jperkin Exp $ +# $NetBSD: Makefile,v 1.21 2017/01/18 18:23:24 wiz Exp $ -DISTNAME= xf86-video-tdfx-1.4.6 -PKGREVISION= 3 +DISTNAME= xf86-video-tdfx-1.4.7 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/xf86-video-tdfx/distinfo b/x11/xf86-video-tdfx/distinfo index 6adbc8cb461..977162d8131 100644 --- a/x11/xf86-video-tdfx/distinfo +++ b/x11/xf86-video-tdfx/distinfo @@ -1,7 +1,6 @@ -$NetBSD: distinfo,v 1.9 2016/11/16 21:51:13 wiz Exp $ +$NetBSD: distinfo,v 1.10 2017/01/18 18:23:24 wiz Exp $ -SHA1 (xf86-video-tdfx-1.4.6.tar.bz2) = a6c5abc7a957c7396b57d36a09f4f5e0143e4d15 -RMD160 (xf86-video-tdfx-1.4.6.tar.bz2) = f0c4441215f249691b04f4e4f214210d011db808 -SHA512 (xf86-video-tdfx-1.4.6.tar.bz2) = d47421000f7aaeabcd13700c39a0a869c2967e6e1d02526cc348155415ac62064f61bbc5416c75b7e44a55fa9124a9feabbe6008d43c41a2305c1a0c842f384c -Size (xf86-video-tdfx-1.4.6.tar.bz2) = 368300 bytes -SHA1 (patch-src_compat-api.h) = 5c78972b5783c93713be51f9118d52a48f91e959 +SHA1 (xf86-video-tdfx-1.4.7.tar.bz2) = 536e3136b85e44deab36be3bf24983453ac0422a +RMD160 (xf86-video-tdfx-1.4.7.tar.bz2) = 5e62ee026850bc8e3c2faf3bd9dee2043748a08e +SHA512 (xf86-video-tdfx-1.4.7.tar.bz2) = 573eea7a6b05ed33a963f8e2f80ac1cb14632b7fd10d8d90da16c07db432e73641ced885ee979f68e4ead8429b39506b2f231ca4ac296a0780c9f6d223c3b405 +Size (xf86-video-tdfx-1.4.7.tar.bz2) = 372249 bytes diff --git a/x11/xf86-video-tdfx/patches/patch-src_compat-api.h b/x11/xf86-video-tdfx/patches/patch-src_compat-api.h deleted file mode 100644 index fce21d0bf91..00000000000 --- a/x11/xf86-video-tdfx/patches/patch-src_compat-api.h +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 21:51:13 wiz Exp $ - -commit b99390efcb55d7d4a68e8c595119c1af4426fc0b -Author: Adam Jackson <ajax@redhat.com> -Date: Tue Jul 19 10:03:56 2016 -0400 - - Adapt Block/WakeupHandler signature for ABI 23 - - Signed-off-by: Adam Jackson <ajax@redhat.com> - ---- src/compat-api.h.orig 2013-02-07 07:56:21.000000000 +0000 -+++ 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 |