Add build fix for xorg-server-1.12.

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

4 files changed, 133 insertions, 4 deletions

diff --git a/x11-drivers/xf86-video-ati/ChangeLog b/x11-drivers/xf86-video-ati/ChangeLog
index 334e5175f48e..1e801d03b2cb 100644
--- a/x11-drivers/xf86-video-ati/ChangeLog
+++ b/x11-drivers/xf86-video-ati/ChangeLog
@@ -1,6 +1,11 @@
 # 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.162 2012/03/03 16:29:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/ChangeLog,v 1.163 2012/03/08 00:54:03 chithanh Exp $
+
+  08 Mar 2012; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  xf86-video-ati-6.14.3.ebuild,
+  +files/xf86-video-ati-6.14.3-xorg-server-1.12.patch:
+  Add build fix for xorg-server-1.12.
 
   03 Mar 2012; Brent Baude <ranger@gentoo.org> xf86-video-ati-6.14.3.ebuild:
   Marking xf86-video-ati-6.14.3 ppc64 stable for bug 394393
diff --git a/x11-drivers/xf86-video-ati/Manifest b/x11-drivers/xf86-video-ati/Manifest
index 5650acd93cce..e811e83f9d67 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-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
 DIST xf86-video-ati-6.14.1.tar.bz2 1058696 RMD160 0caa260c0b3dccf3444241e84bb04cdf02db8426 SHA1 89b8a64a23fc307646a11cd2c2636a8125fada8f SHA256 e457285096e1e40f53ae5b58b948906c69add5160cc38ce510f0d15e82d91c75
@@ -8,6 +9,6 @@ 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.ebuild 552 RMD160 6014647eeeb5b7257bc4ee69abcfe00300c8321b SHA1 5027820127f63241b3d4aaf63885491b7dffc01d SHA256 a8615760514f06e48c4d2f8e9b59af4206354a0c33f84814b809d9e091cf0f1f
-MISC ChangeLog 28749 RMD160 a43ec7f187a9053373ad25fd9e7b1c60a88bda65 SHA1 08290c9646b6a42745ef8655be54a95ea4a0bcab SHA256 10a60557eab86255b682835ce7b3c5be39eaf8bd96036cd340d34bf0c5151558
+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 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055
diff --git a/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-xorg-server-1.12.patch b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-xorg-server-1.12.patch
new file mode 100644
index 000000000000..43fa945f9aea
--- /dev/null
+++ b/x11-drivers/xf86-video-ati/files/xf86-video-ati-6.14.3-xorg-server-1.12.patch
@@ -0,0 +1,118 @@
+From c66ae235700f5efe64eb168327551b8f1d153c9c Mon Sep 17 00:00:00 2001
+From: Michel Dänzer <michel.daenzer@amd.com>
+Date: Mon, 13 Feb 2012 09:43:58 +0000
+Subject: Handle new xorg_list API.
+
+Fixes https://bugs.freedesktop.org/show_bug.cgi?id=45937
+
+Signed-off-by: Michel Dänzer <michel.daenzer@amd.com>
+---
+diff --git a/configure.ac b/configure.ac
+index 29f129a..0083325 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -234,10 +234,18 @@ AC_CHECK_DECL(XSERVER_LIBPCIACCESS,
+ 	      [#include "xorg-server.h"])
+ 
+ AC_CHECK_HEADERS([list.h],
+-		 [], [],
++		 [have_list_h="yes"], [have_list_h="no"],
+ 		 [#include <X11/Xdefs.h>
+ 		  #include "xorg-server.h"])
+ 
++if test "x$have_list_h" = xyes; then
++    AC_CHECK_DECL(xorg_list_init,
++		  [AC_DEFINE(HAVE_XORG_LIST, 1, [Have xorg_list API])], [],
++		  [#include <X11/Xdefs.h>
++		   #include "xorg-server.h"
++		   #include "list.h"])
++fi
++
+ CPPFLAGS="$SAVE_CPPFLAGS"
+ 
+ AM_CONDITIONAL(USE_EXA, test "x$USE_EXA" = xyes)
+diff --git a/src/radeon_dri2.c b/src/radeon_dri2.c
+index 835575f..cf905a1 100644
+--- a/src/radeon_dri2.c
++++ b/src/radeon_dri2.c
+@@ -40,6 +40,13 @@
+ 
+ #if HAVE_LIST_H
+ #include "list.h"
++#if !HAVE_XORG_LIST
++#define xorg_list			list
++#define xorg_list_init			list_init
++#define xorg_list_add			list_add
++#define xorg_list_del			list_del
++#define xorg_list_for_each_entry	list_for_each_entry
++#endif
+ #endif
+ 
+ #ifdef RADEON_DRI2
+@@ -515,11 +522,11 @@ typedef struct _DRI2FrameEvent {
+ 
+     Bool valid;
+ 
+-    struct list link;
++    struct xorg_list link;
+ } DRI2FrameEventRec, *DRI2FrameEventPtr;
+ 
+ typedef struct _DRI2ClientEvents {
+-    struct list   reference_list;
++    struct xorg_list   reference_list;
+ } DRI2ClientEventsRec, *DRI2ClientEventsPtr;
+ 
+ #if HAS_DEVPRIVATEKEYREC
+@@ -538,7 +545,7 @@ DevPrivateKey DRI2ClientEventsPrivateKey = &DRI2ClientEventsPrivateKeyIndex;
+     dixLookupPrivate(&(pClient)->devPrivates, DRI2ClientEventsPrivateKey))
+ 
+ static int
+-ListAddDRI2ClientEvents(ClientPtr client, struct list *entry)
++ListAddDRI2ClientEvents(ClientPtr client, struct xorg_list *entry)
+ {
+     DRI2ClientEventsPtr pClientPriv;
+     pClientPriv = GetDRI2ClientEvents(client);
+@@ -547,12 +554,12 @@ ListAddDRI2ClientEvents(ClientPtr client, struct list *entry)
+         return BadAlloc;
+     }
+ 
+-    list_add(entry, &pClientPriv->reference_list);
++    xorg_list_add(entry, &pClientPriv->reference_list);
+     return 0;
+ }
+ 
+ static void
+-ListDelDRI2ClientEvents(ClientPtr client, struct list *entry)
++ListDelDRI2ClientEvents(ClientPtr client, struct xorg_list *entry)
+ {
+     DRI2ClientEventsPtr pClientPriv;
+     pClientPriv = GetDRI2ClientEvents(client);
+@@ -560,7 +567,7 @@ ListDelDRI2ClientEvents(ClientPtr client, struct list *entry)
+     if (!pClientPriv) {
+         return;
+     }
+-    list_del(entry);
++    xorg_list_del(entry);
+ }
+ 
+ static void
+@@ -574,7 +581,7 @@ radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer d
+ 
+     switch (pClient->clientState) {
+     case ClientStateInitial:
+-        list_init(&pClientEventsPriv->reference_list);
++        xorg_list_init(&pClientEventsPriv->reference_list);
+         break;
+     case ClientStateRunning:
+         break;
+@@ -582,7 +589,7 @@ radeon_dri2_client_state_changed(CallbackListPtr *ClientStateCallback, pointer d
+     case ClientStateRetained:
+     case ClientStateGone:
+         if (pClientEventsPriv) {
+-            list_for_each_entry(ref, &pClientEventsPriv->reference_list, link) {
++            xorg_list_for_each_entry(ref, &pClientEventsPriv->reference_list, link) {
+                 ref->valid = FALSE;
+             }
+         }
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3.ebuild b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3.ebuild
index d0ed507c78a4..2d9d4874e17b 100644
--- a/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3.ebuild
+++ b/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3.ebuild
@@ -1,9 +1,10 @@
 # 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.ebuild,v 1.6 2012/03/03 16:29:35 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/xf86-video-ati/xf86-video-ati-6.14.3.ebuild,v 1.7 2012/03/08 00:54:03 chithanh Exp $
 
 EAPI=4
 
+XORG_EAUTORECONF=yes
 XORG_DRI=always
 inherit xorg-2
 
@@ -15,6 +16,10 @@ IUSE=""
 RDEPEND="x11-libs/libdrm[video_cards_radeon]"
 DEPEND="${RDEPEND}"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.14.3-xorg-server-1.12.patch
+)
+
 pkg_setup() {
 	xorg-2_pkg_setup
 	XORG_CONFIGURE_OPTIONS=(