Build dlloader things for ppc64 and relink them properly (#56248).

3 files changed, 51 insertions, 4 deletions

diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 1274999eb719..3ec60cc1c9dc 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-base/xorg-x11
 # Copyright 2000-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.72 2004/07/11 03:22:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.73 2004/07/16 05:53:17 spyderous Exp $
+
+  16 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
+  xorg-x11-6.7.0-r1.ebuild:
+  Build dlloader things for ppc64 and relink them properly (#56248).
 
   10 Jul 2004; Donnie Berkholz <spyderous@gentoo.org>;
   xorg-x11-6.7.0-r1.ebuild:
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index fa56b368f9b0..1512b72ae1cc 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,4 +1,4 @@
 MD5 f33d86266389c80f7f24467eef8552e7 metadata.xml 232
-MD5 ecc5cd0e9d1285b6cdfa4a4c49619670 xorg-x11-6.7.0-r1.ebuild 39803
-MD5 d80432ea57701bd07ab93e3d7022d7f4 ChangeLog 16464
+MD5 7c8bb0c90e0228dc81a21367fec411f3 xorg-x11-6.7.0-r1.ebuild 41494
+MD5 ab55885c82e4e185bad39bb8eb01174a ChangeLog 16617
 MD5 c557d93f0e90a66a8b781b5ad898a3c9 files/digest-xorg-x11-6.7.0-r1 906
diff --git a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
index 4e0fb6f34242..9479220144ed 100644
--- a/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.24 2004/07/11 03:22:12 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.7.0-r1.ebuild,v 1.25 2004/07/16 05:53:17 spyderous Exp $
 
 # Libraries which are now supplied in shared form that were not in the past
 # include:  libFS.so, libGLw.so, libI810XvMC.so, libXRes.so, libXfontcache.so,
@@ -402,6 +402,14 @@ host_def_setup() {
 				XF86OSCardDrivers XF86ExtraCardDrivers" >> config/cf/host.def
 		fi
 
+		if use ppc64
+		then
+			echo "#define MakeDllModules YES" >> config/cf/host.def
+			echo "#define XF86VgaHw YES" >> config/cf/host.def
+			echo "#define XF86FBDevHw YES" >> config/cf/host.def
+			echo "#define XF86CardDrivers fbdev v4l ati vga nv" >> config/cf/host.def
+		fi
+
 		if use sparc
 		then
 			echo "#define XF86CardDrivers sunffb sunleo suncg6 suncg3 suncg14 \
@@ -1353,9 +1361,44 @@ pkg_postinst() {
 		chmod 1777 ${x}
 	done
 
+	if use ppc64
+	then
+		#The problem about display driver is fixed.
+		cd ${ROOT}/usr/X11R6/lib/modules/drivers
+		mv fbdev_drv.so fbdev_drv.so.orig
+		mv ati_drv.so ati_drv.so.orig
+		mv nv_drv.so nv_drv.so.orig
+
+		ld -shared -o ${ROOT}/usr/X11R6/lib/modules/drivers/fbdev_drv.so ${ROOT}/usr/X11R6/lib/modules/drivers/fbdev_drv.so.orig ${ROOT}/usr/X11R6/lib/modules/linux/libfbdevhw.so ${ROOT}/usr/X11R6/lib/modules/libshadow.so ${ROOT}/usr/X11R6/lib/modules/libshadowfb.so ${ROOT}/usr/X11R6/lib/modules/libfb.so
+		ld -rpath /usr/X11R6/lib/modules/drivers -shared -o ati_drv.so ati_drv.so.orig radeon_drv.so atimisc_drv.so fbdev_drv.so r128_drv.so vga_drv.so
+		ld -rpath /usr/X11R6/lib/modules/drivers -shared -o nv_drv.so nv_drv.so.orig fbdev_drv.so vga_drv.so
+
+		#The problem about DRI module and GLX module is fixed.
+		cd ${ROOT}/usr/X11R6/lib/modules/extensions
+		mv libglx.so libglx.so.orig
+		mv libdri.so libdri.so.orig
+
+		ld -rpath ${ROOT}/usr/X11R6/lib/modules/extensions -shared -o libglx.so libglx.so.orig libGLcore.so
+		ld -rpath ${ROOT}/usr/X11R6/lib/modules/extensions -shared -o libdri.so libdri.so.orig libglx.so
+	fi
+
 	print_info
 }
 
+pkg_prerm() {
+
+	if use ppc64
+	then
+		cd ${ROOT}/usr/X11R6/lib/modules/drivers
+		mv fbdev_drv.so.orig fbdev_drv.so
+		mv ati_drv.so.orig ati_drv.so
+		mv nv_drv.so.orig nv_drv.so
+		cd ${ROOT}/usr/X11R6/lib/modules/extensions
+		mv libglx.so.orig libglx.so
+		mv libdri.so.orig libdri.so
+	fi
+}
+
 pkg_postrm() {
 
 	# Fix problematic links