diff options
| -rw-r--r-- | x11/xf86-video-ati/Makefile | 7 | ||||
| -rw-r--r-- | x11/xf86-video-ati/distinfo | 4 | ||||
| -rw-r--r-- | x11/xf86-video-ati/patches/patch-src_radeon__drm__queue.c | 46 | ||||
| -rw-r--r-- | x11/xf86-video-ati/patches/patch-src_radeon__kms.c | 17 |
4 files changed, 4 insertions, 70 deletions
diff --git a/x11/xf86-video-ati/Makefile b/x11/xf86-video-ati/Makefile index 475ec79930e..740f7f07208 100644 --- a/x11/xf86-video-ati/Makefile +++ b/x11/xf86-video-ati/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.35 2016/01/05 13:11:43 tnn Exp $ +# $NetBSD: Makefile,v 1.36 2016/02/09 01:20:44 wiz Exp $ DISTNAME= xf86-video-ati-7.6.1 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= x11 MASTER_SITES= ${MASTER_SITE_XORG:=driver/} EXTRACT_SUFX= .tar.bz2 @@ -26,8 +26,7 @@ CONFIGURE_ARGS+= --enable-glamor CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 .endif -BUILDLINK_API_DEPENDS.modular-xorg-server+= \ - modular-xorg-server>=1.17.2nb6 +BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.18.1 .include "../../x11/modular-xorg-server/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" diff --git a/x11/xf86-video-ati/distinfo b/x11/xf86-video-ati/distinfo index e3a7ac35f9e..6bca4f710a1 100644 --- a/x11/xf86-video-ati/distinfo +++ b/x11/xf86-video-ati/distinfo @@ -1,8 +1,6 @@ -$NetBSD: distinfo,v 1.23 2016/01/06 14:53:04 wiz Exp $ +$NetBSD: distinfo,v 1.24 2016/02/09 01:20:44 wiz Exp $ SHA1 (xf86-video-ati-7.6.1.tar.bz2) = b517c7fc8e7df0fb0ece0c9a5446b092ec944479 RMD160 (xf86-video-ati-7.6.1.tar.bz2) = beb0dcf6b17d0a89602add06036e9230d81b8b43 SHA512 (xf86-video-ati-7.6.1.tar.bz2) = b829b1db2088161a2486f396a9b36afd6fbbc765fb495450fb1c2de33951e6270c7ef6665c8275c66dfc6509af71b9882c342d236fc0537ff0dde117683c4891 Size (xf86-video-ati-7.6.1.tar.bz2) = 823043 bytes -SHA1 (patch-src_radeon__drm__queue.c) = 00879f05cc3b105e43b677eb056bf1b4171b7c3f -SHA1 (patch-src_radeon__kms.c) = 4703aea7857f0eb4511eabb7ea8d7d5d5f70a24d diff --git a/x11/xf86-video-ati/patches/patch-src_radeon__drm__queue.c b/x11/xf86-video-ati/patches/patch-src_radeon__drm__queue.c deleted file mode 100644 index 90a9e2d4874..00000000000 --- a/x11/xf86-video-ati/patches/patch-src_radeon__drm__queue.c +++ /dev/null @@ -1,46 +0,0 @@ -$NetBSD: patch-src_radeon__drm__queue.c,v 1.2 2016/01/06 14:53:04 wiz Exp $ - -Fix use of uninitialized pointers. Fixes Xorg SEGV when compiled with clang. - -Fixed upstream in xserver instead, see -http://cgit.freedesktop.org/xorg/xserver/commit/?id=63f83d1b7f496d05b409352749cdb6674d71cf80 -so patch can be removed once this is in pkgsrc modular-xorg-server. - ---- src/radeon_drm_queue.c.orig 2015-11-12 02:57:33.000000000 +0000 -+++ src/radeon_drm_queue.c -@@ -59,7 +59,7 @@ radeon_drm_queue_handler(int fd, unsigne - unsigned int usec, void *user_ptr) - { - struct radeon_drm_queue_entry *user_data = user_ptr; -- struct radeon_drm_queue_entry *e, *tmp; -+ struct radeon_drm_queue_entry *e = NULL, *tmp; - - xorg_list_for_each_entry_safe(e, tmp, &radeon_drm_queue, list) { - if (e == user_data) { -@@ -119,7 +119,7 @@ radeon_drm_abort_one(struct radeon_drm_q - void - radeon_drm_abort_client(ClientPtr client) - { -- struct radeon_drm_queue_entry *e, *tmp; -+ struct radeon_drm_queue_entry *e = NULL, *tmp; - - xorg_list_for_each_entry_safe(e, tmp, &radeon_drm_queue, list) { - if (e->client == client) -@@ -142,7 +142,7 @@ radeon_drm_abort_entry(struct radeon_drm - void - radeon_drm_abort_id(uint64_t id) - { -- struct radeon_drm_queue_entry *e, *tmp; -+ struct radeon_drm_queue_entry *e = NULL, *tmp; - - xorg_list_for_each_entry_safe(e, tmp, &radeon_drm_queue, list) { - if (e->id == id) { -@@ -170,7 +170,7 @@ radeon_drm_queue_init() - void - radeon_drm_queue_close(ScrnInfoPtr scrn) - { -- struct radeon_drm_queue_entry *e, *tmp; -+ struct radeon_drm_queue_entry *e = NULL, *tmp; - - xorg_list_for_each_entry_safe(e, tmp, &radeon_drm_queue, list) { - if (e->scrn == scrn) diff --git a/x11/xf86-video-ati/patches/patch-src_radeon__kms.c b/x11/xf86-video-ati/patches/patch-src_radeon__kms.c deleted file mode 100644 index 1637a672869..00000000000 --- a/x11/xf86-video-ati/patches/patch-src_radeon__kms.c +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-src_radeon__kms.c,v 1.2 2016/01/06 14:53:04 wiz Exp $ - -Should be fixed by xserver commit: -http://cgit.freedesktop.org/xorg/xserver/commit/?id=63f83d1b7f496d05b409352749cdb6674d71cf80 -so patch can be removed once this is in pkgsrc modular-xorg-server. - ---- src/radeon_kms.c.orig 2014-10-02 03:31:27.000000000 +0000 -+++ src/radeon_kms.c -@@ -280,7 +280,7 @@ static void - radeon_dirty_update(ScreenPtr screen) - { - RegionPtr region; -- PixmapDirtyUpdatePtr ent; -+ PixmapDirtyUpdatePtr ent = NULL; - - if (xorg_list_is_empty(&screen->pixmap_dirty_list)) - return; |