Tue Feb 9 01:20:44 2016 UTC ()
Remove two patches that are obsoleted by the newest modular-xorg-server,
and depend on it.

Bump PKGREVISION.


(wiz)
diff -r1.35 -r1.36 pkgsrc/x11/xf86-video-ati/Makefile
diff -r1.23 -r1.24 pkgsrc/x11/xf86-video-ati/distinfo
diff -r1.2 -r0 pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon__drm__queue.c
diff -r1.2 -r0 pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon__kms.c
cvs diff -r1.35 -r1.36 pkgsrc/x11/xf86-video-ati/Makefile (expand / switch to unified diff)

--- pkgsrc/x11/xf86-video-ati/Makefile 2016/01/05 13:11:43 1.35
+++ pkgsrc/x11/xf86-video-ati/Makefile 2016/02/09 01:20:44 1.36
@@ -1,43 +1,42 @@ @@ -1,43 +1,42 @@
1# $NetBSD: Makefile,v 1.35 2016/01/05 13:11:43 tnn Exp $ 1# $NetBSD: Makefile,v 1.36 2016/02/09 01:20:44 wiz Exp $
2 2
3DISTNAME= xf86-video-ati-7.6.1 3DISTNAME= xf86-video-ati-7.6.1
4PKGREVISION= 2 4PKGREVISION= 3
5CATEGORIES= x11 5CATEGORIES= x11
6MASTER_SITES= ${MASTER_SITE_XORG:=driver/} 6MASTER_SITES= ${MASTER_SITE_XORG:=driver/}
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8 8
9MAINTAINER= joerg@NetBSD.org 9MAINTAINER= joerg@NetBSD.org
10HOMEPAGE= http://xorg.freedesktop.org/ 10HOMEPAGE= http://xorg.freedesktop.org/
11COMMENT= Modular Xorg ATI Radeon video driver 11COMMENT= Modular Xorg ATI Radeon video driver
12 12
13CONFIGURE_ARGS+= --enable-dri 13CONFIGURE_ARGS+= --enable-dri
14 14
15CONFLICTS+= xf86-video-ati6-[0-9]* 15CONFLICTS+= xf86-video-ati6-[0-9]*
16 16
17USE_LIBTOOL= YES 17USE_LIBTOOL= YES
18GNU_CONFIGURE= YES 18GNU_CONFIGURE= YES
19USE_TOOLS+= gmake pkg-config 19USE_TOOLS+= gmake pkg-config
20 20
21.include "../../mk/bsd.prefs.mk" 21.include "../../mk/bsd.prefs.mk"
22 22
23CONFIGURE_ARGS+= --enable-glamor 23CONFIGURE_ARGS+= --enable-glamor
24 24
25.if ${OPSYS} == "SunOS" 25.if ${OPSYS} == "SunOS"
26CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4 26CONFIGURE_ENV+= DRIVER_MAN_SUFFIX=4
27.endif 27.endif
28 28
29BUILDLINK_API_DEPENDS.modular-xorg-server+= \ 29BUILDLINK_API_DEPENDS.modular-xorg-server+= modular-xorg-server>=1.18.1
30 modular-xorg-server>=1.17.2nb6 
31.include "../../x11/modular-xorg-server/buildlink3.mk" 30.include "../../x11/modular-xorg-server/buildlink3.mk"
32 31
33.include "../../devel/zlib/buildlink3.mk" 32.include "../../devel/zlib/buildlink3.mk"
34.include "../../x11/fontsproto/buildlink3.mk" 33.include "../../x11/fontsproto/buildlink3.mk"
35.include "../../x11/glproto/buildlink3.mk" 34.include "../../x11/glproto/buildlink3.mk"
36BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.58 35BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.58
37.include "../../x11/libdrm/buildlink3.mk" 36.include "../../x11/libdrm/buildlink3.mk"
38.include "../../x11/randrproto/buildlink3.mk" 37.include "../../x11/randrproto/buildlink3.mk"
39.include "../../x11/renderproto/buildlink3.mk" 38.include "../../x11/renderproto/buildlink3.mk"
40.include "../../x11/videoproto/buildlink3.mk" 39.include "../../x11/videoproto/buildlink3.mk"
41.include "../../x11/xf86driproto/buildlink3.mk" 40.include "../../x11/xf86driproto/buildlink3.mk"
42.include "../../x11/xf86miscproto/buildlink3.mk" 41.include "../../x11/xf86miscproto/buildlink3.mk"
43.include "../../x11/xextproto/buildlink3.mk" 42.include "../../x11/xextproto/buildlink3.mk"
cvs diff -r1.23 -r1.24 pkgsrc/x11/xf86-video-ati/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/xf86-video-ati/distinfo 2016/01/06 14:53:04 1.23
+++ pkgsrc/x11/xf86-video-ati/distinfo 2016/02/09 01:20:44 1.24
@@ -1,8 +1,6 @@ @@ -1,8 +1,6 @@
1$NetBSD: distinfo,v 1.23 2016/01/06 14:53:04 wiz Exp $ 1$NetBSD: distinfo,v 1.24 2016/02/09 01:20:44 wiz Exp $
2 2
3SHA1 (xf86-video-ati-7.6.1.tar.bz2) = b517c7fc8e7df0fb0ece0c9a5446b092ec944479 3SHA1 (xf86-video-ati-7.6.1.tar.bz2) = b517c7fc8e7df0fb0ece0c9a5446b092ec944479
4RMD160 (xf86-video-ati-7.6.1.tar.bz2) = beb0dcf6b17d0a89602add06036e9230d81b8b43 4RMD160 (xf86-video-ati-7.6.1.tar.bz2) = beb0dcf6b17d0a89602add06036e9230d81b8b43
5SHA512 (xf86-video-ati-7.6.1.tar.bz2) = b829b1db2088161a2486f396a9b36afd6fbbc765fb495450fb1c2de33951e6270c7ef6665c8275c66dfc6509af71b9882c342d236fc0537ff0dde117683c4891 5SHA512 (xf86-video-ati-7.6.1.tar.bz2) = b829b1db2088161a2486f396a9b36afd6fbbc765fb495450fb1c2de33951e6270c7ef6665c8275c66dfc6509af71b9882c342d236fc0537ff0dde117683c4891
6Size (xf86-video-ati-7.6.1.tar.bz2) = 823043 bytes 6Size (xf86-video-ati-7.6.1.tar.bz2) = 823043 bytes
7SHA1 (patch-src_radeon__drm__queue.c) = 00879f05cc3b105e43b677eb056bf1b4171b7c3f 
8SHA1 (patch-src_radeon__kms.c) = 4703aea7857f0eb4511eabb7ea8d7d5d5f70a24d 
File Deleted: pkgsrc/x11/xf86-video-ati/patches/Attic/patch-src_radeon__drm__queue.c
File Deleted: pkgsrc/x11/xf86-video-ati/patches/Attic/patch-src_radeon__kms.c