Update to xf86-video-radeonhd 1.0.0, the first official release.

4 files changed, 40 insertions, 27 deletions

diff --git a/x11/xf86-video-radeonhd/Makefile b/x11/xf86-video-radeonhd/Makefile
index 6ab2c650a2a..fbcf11529da 100644
--- a/x11/xf86-video-radeonhd/Makefile
+++ b/x11/xf86-video-radeonhd/Makefile
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/10/23 23:15:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2007/11/30 12:00:42 joerg Exp $
 #
 
-DISTNAME=	xf86-video-radeonhd-0.0.2
+DISTNAME=	xf86-video-radeonhd-1.0.0
 CATEGORIES=	x11
-MASTER_SITES=	http://home.tiscali.nl/rladan/distfiles/
+MASTER_SITES=	http://xorg.freedesktop.org/releases/individual/driver/
 EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	pkgsrc-users@NetBSD.org
+MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://ati.amd.com/
 COMMENT=	Modular X.org driver for Radeon HD series
 
@@ -15,18 +15,8 @@ GNU_CONFIGURE=	yes
 USE_TOOLS+=     gmake pkg-config
 
 .include "../../x11/modular-xorg-server/buildlink3.mk"
-
-.include "../../graphics/MesaLib/buildlink3.mk"
-.include "../../x11/fontsproto/buildlink3.mk"
-.include "../../x11/glproto/buildlink3.mk"
-.include "../../x11/libdrm/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/renderproto/buildlink3.mk"
-.include "../../x11/videoproto/buildlink3.mk"
-.include "../../x11/xf86driproto/buildlink3.mk"
-.include "../../x11/xf86miscproto/buildlink3.mk"
 .include "../../x11/xextproto/buildlink3.mk"
-.include "../../x11/xineramaproto/buildlink3.mk"
-.include "../../x11/xproto/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-video-radeonhd/distinfo b/x11/xf86-video-radeonhd/distinfo
index d72920a4fdd..b28c29c999d 100644
--- a/x11/xf86-video-radeonhd/distinfo
+++ b/x11/xf86-video-radeonhd/distinfo
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/10/23 23:15:20 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2007/11/30 12:00:42 joerg Exp $
 
-SHA1 (xf86-video-radeonhd-0.0.2.tar.bz2) = 77a19825ba293e979a0d30743ac712980e3e8b18
-RMD160 (xf86-video-radeonhd-0.0.2.tar.bz2) = e25eec2fce345e798d28d7a11243b90915f01568
-Size (xf86-video-radeonhd-0.0.2.tar.bz2) = 373119 bytes
-SHA1 (patch-aa) = 91aad60e64d8c9f3ca5f3fb04829993dcb6aa81d
+SHA1 (xf86-video-radeonhd-1.0.0.tar.bz2) = 84092b5df1e4dbf7cd69006f3e545c293e80873c
+RMD160 (xf86-video-radeonhd-1.0.0.tar.bz2) = a3898ada68ff96098c9fb592978d6ecc93558bb3
+Size (xf86-video-radeonhd-1.0.0.tar.bz2) = 410810 bytes
+SHA1 (patch-aa) = 54de992a8cfdd9691f76047e815ff8e61edb314c
+SHA1 (patch-ab) = 0eb4a1eb2d25ea2b069b1314bc1e53969399edd7
diff --git a/x11/xf86-video-radeonhd/patches/patch-aa b/x11/xf86-video-radeonhd/patches/patch-aa
index 3f9b6f7ba9f..9eee5bd7864 100644
--- a/x11/xf86-video-radeonhd/patches/patch-aa
+++ b/x11/xf86-video-radeonhd/patches/patch-aa
@@ -1,12 +1,12 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/10/23 23:15:20 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2007/11/30 12:00:42 joerg Exp $
 
---- src/rhd_id.c.orig	2007-10-24 00:59:09.000000000 +0200
-+++ src/rhd_id.c	2007-10-24 01:00:01.000000000 +0200
-@@ -698,6 +698,7 @@
+--- src/rhd_id.c.orig	2007-11-30 01:26:01.000000000 +0100
++++ src/rhd_id.c
+@@ -583,6 +583,7 @@ rhdCards[] =
      /* 0x9587 : RV630 : ATI Radeon HD 2600 Pro AGP */
      /* 0x9588 : RV630 : Radeon HD 2600 XT */
-     { 0x9588, 0x1002, 0x2542, "ATI Radeon HD 2600XT DDR4", DVI_BA10_DVI_AB01 },
-+    { 0x9588, 0x1448, 0x216C, "Gigabyte HD 2600 XT 256MB DDR3", DVI_BA10_DVI_AB01 },
-     { 0x9588, 0x174B, 0x2E42, "Sapphire HD 2600 XT", DVI_BA10_DVI_AB01 },
+     { 0x9588, 0x1002, 0x2542, "ATI Radeon HD 2600XT DDR4", RHD_CARD_FLAG_NONE, DVI_BA10_DVI_AB01 },
++    { 0x9588, 0x1448, 0x216C, "Gigabyte HD 2600 XT 256MB DDR3", RHD_CARD_FLAG_NONE, DVI_BA10_DVI_AB01 },
+     { 0x9588, 0x174B, 0x2E42, "Sapphire HD 2600 XT", RHD_CARD_FLAG_NONE, DVI_BA10_DVI_AB01 },
      /* 0x9589 : RV630 : Radeon HD 2600 Pro */
-     { 0x9589, 0x174B, 0xE410, "Sapphire HD 2600 Pro", DVI_BA10_DVI_AB01 },
+     { 0x9589, 0x174B, 0xE410, "Sapphire HD 2600 Pro", RHD_CARD_FLAG_NONE, DVI_BA10_DVI_AB01 },
diff --git a/x11/xf86-video-radeonhd/patches/patch-ab b/x11/xf86-video-radeonhd/patches/patch-ab
new file mode 100644
index 00000000000..04a4a4a8c2a
--- /dev/null
+++ b/x11/xf86-video-radeonhd/patches/patch-ab
@@ -0,0 +1,22 @@
+$NetBSD: patch-ab,v 1.1 2007/11/30 12:00:43 joerg Exp $
+
+--- git_version.sh.orig	2007-11-26 18:41:35.000000000 +0100
++++ git_version.sh
+@@ -136,7 +136,7 @@ unset git_errors ||:
+ if [ "x$git_found" = "xyes" ]; then
+     git_version=`git --version`
+     if [ "x$git_version" = "x" ]; then
+-        git_errors="${git_errors+"${git_errors}; "}error running 'git --version'"
++        git_errors="${git_errors+${git_errors}; }error running 'git --version'"
+     fi
+ fi
+ 
+@@ -148,7 +148,7 @@ if [ "x$(git-rev-parse --git-dir 2> /dev
+         # git-1.4 and probably earlier understand "git-rev-parse HEAD"
+         git_shaid=`git-rev-parse HEAD | $SED -n 's/^\(.\{8\}\).*/\1/p'`
+         if [ "x$git_shaid" = "x" ]; then
+-            git_errors="${git_errors+"${git_errors}; "}error running 'git-rev-parse HEAD'"
++            git_errors="${git_errors+${git_errors}; }error running 'git-rev-parse HEAD'"
+         fi
+         # git-1.4 and probably earlier understand "git-symbolic-ref HEAD"
+         git_branch=`git-symbolic-ref HEAD | $SED -n 's|^refs/heads/||p'`