summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2017-01-18 20:19:21 +0000
committerwiz <wiz@pkgsrc.org>2017-01-18 20:19:21 +0000
commit63ae56d33f2ffe7920abc5b92c3f074a48f050d7 (patch)
treee2e81d2c188b4f9094170bbde654b7501f4f132a
parent50aa57bdb3a6c191366ca117583aaa69ba5e9aa1 (diff)
downloadpkgsrc-63ae56d33f2ffe7920abc5b92c3f074a48f050d7.tar.gz
Updated xf86-video-trident to 1.3.8.
Adam Jackson (1): Adapt Block/WakeupHandler signature for ABI 23 Matt Turner (1): xf86-video-trident 1.3.8
-rw-r--r--x11/xf86-video-trident/Makefile6
-rw-r--r--x11/xf86-video-trident/distinfo11
-rw-r--r--x11/xf86-video-trident/patches/patch-src_compat-api.h20
3 files changed, 7 insertions, 30 deletions
diff --git a/x11/xf86-video-trident/Makefile b/x11/xf86-video-trident/Makefile
index 78ba4e96dad..df270e8b079 100644
--- a/x11/xf86-video-trident/Makefile
+++ b/x11/xf86-video-trident/Makefile
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2016/02/26 11:27:21 jperkin Exp $
-#
+# $NetBSD: Makefile,v 1.20 2017/01/18 20:19:21 wiz Exp $
-DISTNAME= xf86-video-trident-1.3.7
-PKGREVISION= 3
+DISTNAME= xf86-video-trident-1.3.8
CATEGORIES= x11
MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
EXTRACT_SUFX= .tar.bz2
diff --git a/x11/xf86-video-trident/distinfo b/x11/xf86-video-trident/distinfo
index dc4bea7673d..95f04e7c5df 100644
--- a/x11/xf86-video-trident/distinfo
+++ b/x11/xf86-video-trident/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.8 2016/11/16 21:46:27 wiz Exp $
+$NetBSD: distinfo,v 1.9 2017/01/18 20:19:21 wiz Exp $
-SHA1 (xf86-video-trident-1.3.7.tar.bz2) = b8cce16caa30e6725bdea078e05ab74b4b8020e7
-RMD160 (xf86-video-trident-1.3.7.tar.bz2) = c9279cdd9708fcfd251e2928277dbe82612dafbe
-SHA512 (xf86-video-trident-1.3.7.tar.bz2) = 39c3dac36095fa5103b9e3af8a6ffce9a42bb79d5d1c7e0c990badc2e469b9af96ca009a041fa892af972bc38ec19e8d014fb90da392bbd0ae8892b9c1fe0064
-Size (xf86-video-trident-1.3.7.tar.bz2) = 376898 bytes
-SHA1 (patch-src_compat-api.h) = 18d1012841abee48bff317830bc638c4a41d6591
+SHA1 (xf86-video-trident-1.3.8.tar.bz2) = 8d6aa7a52dad9029b54f41ec817bdc4ece44dec3
+RMD160 (xf86-video-trident-1.3.8.tar.bz2) = bc0ad277ff0e8051b1adaa1dc82a51b8e863be82
+SHA512 (xf86-video-trident-1.3.8.tar.bz2) = f971e9441c9ff7374d53d30f6746232903221665ae52560d5716762c2233cc6d0065b631a4fed98bf194d9827572cc42da577a2e6e06ba014e6ce42343b63f66
+Size (xf86-video-trident-1.3.8.tar.bz2) = 387742 bytes
diff --git a/x11/xf86-video-trident/patches/patch-src_compat-api.h b/x11/xf86-video-trident/patches/patch-src_compat-api.h
deleted file mode 100644
index d723af2bd4d..00000000000
--- a/x11/xf86-video-trident/patches/patch-src_compat-api.h
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-src_compat-api.h,v 1.1 2016/11/16 21:46:27 wiz Exp $
-
-Adapt Block/WakeupHandler signature for ABI 23.
-
---- src/compat-api.h.orig 2015-03-30 17:12:58.000000000 +0000
-+++ 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