Fix UMS unresolved symbol when loading radeon in xorg-server-1.12.

Package-Manager: portage-2.2.0_alpha92/cvs/Linux x86_64

4 files changed, 82 insertions, 2 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index 1e801d03b2cb..11a01febd023 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for x11-drivers/xf86-video-ati
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.163 2012/03/08 00:54:03 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.164 2012/03/18 23:26:25 chithanh Exp $
+
+*xf86-video-ati-6.14.3-r1 (18 Mar 2012)
+
+  18 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +files/xf86-video-ati-6.14.3-pcitag.patch, +xf86-video-ati-6.14.3-r1.ebuild:
+  Fix UMS unresolved symbol when loading radeon in xorg-server-1.12.
 
   08 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
   xf86-video-ati-6.14.3.ebuild,
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index e811e83f9d67..ad65e9fd322e 100644
--- a/x11-drivers/xf86-video-ati/Manifest
+++ b/x11-drivers/xf86-video-ati/Manifest
@@ -1,4 +1,5 @@
 AUX xf86-video-ati-6.14.0-xorg-server-1.10.patch 1133 RMD160 489da229ad6494d9f21fe8f8e1c3d7884724bf97 SHA1 7cded8f5f48ee0c4af49602cafc8db46a56937b9 SHA256 609c43ad9e9860d4dabbafd14e9c4b96529375b256bf82c4276c20b5b8ab204b
+AUX xf86-video-ati-6.14.3-pcitag.patch 1450 RMD160 aa62bff417d36053da6767cc4041fcfb7cbd7a4e SHA1 8b53ebdd38ea080992812b27e3b54d88ccdbbd19 SHA256 05d7407da399a7cc0cfb98f5a8977384754075f2d03b17b3ef5c9d7aad297b1e
 AUX xf86-video-ati-6.14.3-xorg-server-1.12.patch 3637 RMD160 159b182b7139d9aeb5df5a6756fa4292c095d018 SHA1 3b42db2a94bee9935730866cc931a5005fd364d4 SHA256 9829b065815b85a805fc537e5e3cab6a4f0f523f5334493619b791c7622d8102
 DIST xf86-video-ati-6.13.2.tar.bz2 985673 RMD160 46f581fcd631c841b511bb7071a1aa2252fe9078 SHA1 f9d379a884a833829ab1942de4ad4f4766cdcd46 SHA256 d85f60081e5b71bf19da4ca48bce95a9e9df3635c8540dd2640785bedfbc36ee
 DIST xf86-video-ati-6.14.0.tar.bz2 1054336 RMD160 0997c743680b9924166365ab51a69c79e6975d38 SHA1 132a6b1ed6e03f7365659cdcf520516746a8fc27 SHA256 9dcaaf83e883808a49f67fc2af1deec3aa163feaa6ce957c1c028e22b959028b
@@ -9,6 +10,7 @@ EBUILD xf86-video-ati-6.13.2.ebuild 761 RMD160 47ec49e9615b8e063dbc5b1dd44b3a9ac
 EBUILD xf86-video-ati-6.14.0.ebuild 819 RMD160 cef707336652afb052e018347ab0bc9be8e7a688 SHA1 7b0b4e81d4d3f02e477fbc3aab634c7ae04017a7 SHA256 c2df919c39664b05b29c7dd3afd06d138c01db16ba0c894cc931b0b042978d91
 EBUILD xf86-video-ati-6.14.1.ebuild 551 RMD160 a789df7f4e3dd897ee74a2387ec8aab3d065eafa SHA1 a9a3eed2287c1096fb0847abf9a9b1879b53ca47 SHA256 6b6d1eb253fe402c2ea90de4ec0d621e0508f2b4794539e0b5946f7dd4af81c9
 EBUILD xf86-video-ati-6.14.2.ebuild 553 RMD160 99f7210b7b86bf1ece05efbce2782348d6a8d7dc SHA1 ed5493b5083fba914934531952670e116dffa914 SHA256 8fcf669215b4c2a21289e305d3840e37bec49d6259632a76a43255c81bf7cffa
+EBUILD xf86-video-ati-6.14.3-r1.ebuild 690 RMD160 eea9318e35e43299cdb3a67b013a04da330393a2 SHA1 22e6766e01f9955d414c51bf9d9ff7d0d240ae6c SHA256 eb2f5e17498ea861419554e73dad14fc84d5e65e5514af937395220e8124c7f9
 EBUILD xf86-video-ati-6.14.3.ebuild 639 RMD160 6a256e702dbb3d4a5da2c5d2917bc071e505d384 SHA1 66452585a36805aa25e513571547de01f6cb8b0d SHA256 0eaa1f11ae09baa57533e9f10ecde270ec394ba65b8cd393323f5b3fcb0fa8ca
-MISC ChangeLog 28946 RMD160 99be1bd136dbc02f122ee4f8c9bc62509457b776 SHA1 7c7f6cde9f7eb39c2adf3a627df124ed511d8e49 SHA256 c4e2e00d9e3c087e9a3b1890bdabbca72cb7d32da3abacca60d3925d38f88c35
+MISC ChangeLog 29205 RMD160 eed1d5a36288c93a7aab09b0b392797e69ce9719 SHA1 cf2de761d3cde99fcbcd02dd6b05330e5c708e5b SHA256 389594b899e365b86ac9d0900185211c75410a4dad8b3781bc955090dc651818
 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-pcitag.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-pcitag.patch
new file mode 100644
index 000000000000..96b2b815e7c2
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-pcitag.patch
@@ -0,0 +1,41 @@
+From 89452c08048c98fb5cc3dc551b3824be40d52cf2 Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <michel.daenzer@amd.com>
+Date: Tue, 08 Nov 2011 10:23:11 +0000
+Subject: UMS: Guard references to PCITAG / pciTag with XSERVER_LIBPCIACCESS (bug #42690)
+
+Should fix https://bugs.freedesktop.org/show_bug.cgi?id=42690 .
+
+Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+---
+diff --git a/src/radeon.h b/src/radeon.h
+index da95f8b..34f6f53 100644
+--- a/src/radeon.h
++++ b/src/radeon.h
+@@ -792,7 +792,9 @@ struct radeon_accel_state {
+ typedef struct {
+     EntityInfoPtr     pEnt;
+     pciVideoPtr       PciInfo;
++#ifndef XSERVER_LIBPCIACCESS
+     PCITAG            PciTag;
++#endif
+     int               Chipset;
+     RADEONChipFamily  ChipFamily;
+     RADEONErrata      ChipErrata;
+diff --git a/src/radeon_driver.c b/src/radeon_driver.c
+index 293897a..a9abd66 100644
+--- a/src/radeon_driver.c
++++ b/src/radeon_driver.c
+@@ -3023,9 +3023,11 @@ Bool RADEONPreInit(ScrnInfoPtr pScrn, int flags)
+     }
+ 
+     info->PciInfo = xf86GetPciInfoForEntity(info->pEnt->index);
++#ifndef XSERVER_LIBPCIACCESS
+     info->PciTag  = pciTag(PCI_DEV_BUS(info->PciInfo),
+ 			   PCI_DEV_DEV(info->PciInfo),
+ 			   PCI_DEV_FUNC(info->PciInfo));
++#endif
+     info->MMIOAddr = PCI_REGION_BASE(info->PciInfo, 2, REGION_MEM) & ~0xffULL;
+     info->MMIOSize = PCI_REGION_SIZE(info->PciInfo, 2);
+ 	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "TOTO SAYS %016llx\n", 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3-r1.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3-r1.ebuild
new file mode 100644
index 000000000000..fefa97fc6a2f
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3-r1.ebuild,v 1.1 2012/03/18 23:26:25 chithanh Exp $
+
+EAPI=4
+
+XORG_EAUTORECONF=yes
+XORG_DRI=always
+inherit xorg-2
+
+DESCRIPTION="ATI video driver"
+
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE=""
+
+RDEPEND="x11-libs/libdrm[video_cards_radeon]"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.14.3-xorg-server-1.12.patch
+	"${FILESDIR}"/${PN}-6.14.3-pcitag.patch
+)
+
+pkg_setup() {
+	xorg-2_pkg_setup
+	XORG_CONFIGURE_OPTIONS=(
+		--enable-dri
+		--enable-kms
+		--enable-exa
+	)
+}