From 656b7169e99564e887676ece120ce4da1c806e07 Mon Sep 17 00:00:00 2001 From: wiz Date: Wed, 6 Jan 2016 14:53:04 +0000 Subject: Mention corresponding upstream commits (in xserver). --- x11/xf86-video-ati/distinfo | 6 +++--- x11/xf86-video-ati/patches/patch-src_radeon__drm__queue.c | 6 +++++- x11/xf86-video-ati/patches/patch-src_radeon__kms.c | 6 ++++-- 3 files changed, 12 insertions(+), 6 deletions(-) (limited to 'x11/xf86-video-ati') diff --git a/x11/xf86-video-ati/distinfo b/x11/xf86-video-ati/distinfo index ce868f7d385..e3a7ac35f9e 100644 --- a/x11/xf86-video-ati/distinfo +++ b/x11/xf86-video-ati/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.22 2015/12/11 13:08:21 tnn Exp $ +$NetBSD: distinfo,v 1.23 2016/01/06 14:53:04 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) = 22c2843364c49294073248be8f60b046229558b5 -SHA1 (patch-src_radeon__kms.c) = 0f0cbf99644711983e31242b6d756a668d18fee5 +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 index c75ac94d15e..90a9e2d4874 100644 --- a/x11/xf86-video-ati/patches/patch-src_radeon__drm__queue.c +++ b/x11/xf86-video-ati/patches/patch-src_radeon__drm__queue.c @@ -1,7 +1,11 @@ -$NetBSD: patch-src_radeon__drm__queue.c,v 1.1 2015/12/11 13:08:22 tnn Exp $ +$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 diff --git a/x11/xf86-video-ati/patches/patch-src_radeon__kms.c b/x11/xf86-video-ati/patches/patch-src_radeon__kms.c index d1e3e2ef422..1637a672869 100644 --- a/x11/xf86-video-ati/patches/patch-src_radeon__kms.c +++ b/x11/xf86-video-ati/patches/patch-src_radeon__kms.c @@ -1,6 +1,8 @@ -$NetBSD: patch-src_radeon__kms.c,v 1.1 2015/02/21 11:45:35 tnn Exp $ +$NetBSD: patch-src_radeon__kms.c,v 1.2 2016/01/06 14:53:04 wiz Exp $ -https://bugs.freedesktop.org/show_bug.cgi?id=47160 +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 -- cgit v1.2.3