(fd.o #4073) Fix compilation failures at fbmmx.c. Patch from Diego Pettenó <flameeyes@gentoo.org>.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 51 insertions, 6 deletions

diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog
index b94f3b0a790e..1bc1113b9af7 100644
--- a/x11-base/xorg-server/ChangeLog
+++ b/x11-base/xorg-server/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-base/xorg-server
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.25 2005/08/16 20:54:54 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.26 2005/08/17 18:48:54 spyderous Exp $
+
+  17 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+  +files/xorg-server-fbmmx-local.patch, xorg-server-0.99.1-r3.ebuild:
+  (fd.o #4073) Fix compilation failures at fbmmx.c. Patch from Diego Pettenó
+  <flameeyes@gentoo.org>.
 
   16 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-server-0.99.1-r3.ebuild:
diff --git a/x11-base/xorg-server/Manifest b/x11-base/xorg-server/Manifest
index c2f51805461b..72a84fe09399 100644
--- a/x11-base/xorg-server/Manifest
+++ b/x11-base/xorg-server/Manifest
@@ -1,8 +1,8 @@
 MD5 df5ff89b3c13c5675d9ab657f295f58a xorg-server-0.99.1-r1.ebuild 3021
-MD5 43934557e8a9c0390c7d7e973f29e77b ChangeLog 4527
+MD5 c81d4ad5a07ee109581d1ccac5a00c65 ChangeLog 4757
 MD5 c0a77bd0dcd1c32a59067a8ddf824ba3 xorg-server-0.99.1.ebuild 2888
 MD5 511b3c7ae8112f4e2e7cb3a83e95c6e4 xorg-server-0.99.1-r2.ebuild 3229
-MD5 8c5d5dc3d3590cff5912082d6b2d45ac xorg-server-0.99.1-r3.ebuild 3529
+MD5 c7231ba008017e256977731d37b4bb9b xorg-server-0.99.1-r3.ebuild 3553
 MD5 139d1af499d5fd30cbb118284544e3f6 files/xorg-composite.patch 2397
 MD5 44296a07d7ed76922dd604d93b00ab18 files/digest-xorg-server-0.99.1 137
 MD5 44296a07d7ed76922dd604d93b00ab18 files/digest-xorg-server-0.99.1-r1 137
@@ -11,3 +11,4 @@ MD5 b74f0fa343d7769d89aec580ae334f4d files/check-for-glproto.patch 876
 MD5 bf2ef74202eb0877dc40a8d0f5b38430 files/digest-xorg-server-0.99.1-r2 239
 MD5 bf2ef74202eb0877dc40a8d0f5b38430 files/digest-xorg-server-0.99.1-r3 239
 MD5 15b113cf1db95c72eb12426c0f2bf9ae files/xorg-server-0.99.1-x86_64-1.patch 452
+MD5 f176158b79ddb098f9ffb61551423eb1 files/xorg-server-fbmmx-local.patch 1210
diff --git a/x11-base/xorg-server/files/xorg-server-fbmmx-local.patch b/x11-base/xorg-server/files/xorg-server-fbmmx-local.patch
new file mode 100644
index 000000000000..d31aff5198c3
--- /dev/null
+++ b/x11-base/xorg-server/files/xorg-server-fbmmx-local.patch
@@ -0,0 +1,38 @@
+https://bugs.freedesktop.org/show_bug.cgi?id=4073
+
+xorg-server compilation dies, 2 undefined symbols
+
+diff -ur fb.orig/fbmmx.c fb/fbmmx.c
+--- xorg-server-0.99.1/fb.orig/fbmmx.c	2005-08-13 20:37:45 +0000
++++ xorg-server-0.99.1/fb/fbmmx.c	2005-08-13 20:35:13 +0000
+@@ -2315,7 +2315,7 @@
+              "pop %%eax\n"
+              "mov $0x0, %%edx\n"
+              "xor %%ebx, %%eax\n"
+-             "jz skip\n"
++             "jz 1f\n"
+ 
+              "mov $0x00000000, %%eax\n"
+              "cpuid\n"
+@@ -2324,7 +2324,7 @@
+              "mov %%ecx, %3\n"
+              "mov $0x00000001, %%eax\n"
+              "cpuid\n"
+-             "skip:\n"
++             "1:\n"
+              "pop %%ebx\n"
+              "mov %%edx, %0\n"
+              : "=r" (result), 
+@@ -2355,10 +2355,10 @@
+                     "cpuid\n"
+                     "xor %%edx, %%edx\n"
+                     "cmp $0x1, %%eax\n"
+-                    "jge skip2\n"
++                    "jge 2f\n"
+                     "mov $0x80000001, %%eax\n"
+                     "cpuid\n"
+-                    "skip2:\n"
++                    "2:\n"
+                     "mov %%edx, %0\n"
+                     "pop %%ebx\n"
+                     : "=r" (result)
diff --git a/x11-base/xorg-server/xorg-server-0.99.1-r3.ebuild b/x11-base/xorg-server/xorg-server-0.99.1-r3.ebuild
index 9a4bea660d04..46852e5944c1 100644
--- a/x11-base/xorg-server/xorg-server-0.99.1-r3.ebuild
+++ b/x11-base/xorg-server/xorg-server-0.99.1-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r3.ebuild,v 1.9 2005/08/16 20:54:54 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/xorg-server-0.99.1-r3.ebuild,v 1.10 2005/08/17 18:48:54 spyderous Exp $
 
 # Must be before x-modular eclass is inherited
 # Hack to make sure autoreconf gets run
@@ -14,10 +14,11 @@ MESA_PN="Mesa"
 MESA_PV="6.3.1.1"
 MESA_P="${MESA_PN}-${MESA_PV}"
 
-PATCHES="${WORKDIR}/xorg-server-0.99.1-update-to-CVS-HEAD-20050811-1.patch
+PATCHES="${WORKDIR}/${P}-update-to-CVS-HEAD-20050811-1.patch
 	${FILESDIR}/check-for-glproto.patch
 	${FILESDIR}/fix-xf86misc-typo.patch
-	${FILESDIR}/${P}-x86_64-1.patch"
+	${FILESDIR}/${P}-x86_64-1.patch
+	${FILESDIR}/${PN}-fbmmx-local.patch"
 
 SRC_URI="${SRC_URI}
 	glx? ( http://xorg.freedesktop.org/extras/${MESA_P}.tar.gz )