summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <spyderous@gentoo.org>2004-11-17 17:43:07 +0000
committerDonnie Berkholz <spyderous@gentoo.org>2004-11-17 17:43:07 +0000
commitd37e25b1d9caebc5a081285f864b7742e930d7e4 (patch)
treefbf9ca76dad7a9efa66a6f3e69bc23e3156b70b6 /x11-base
parentNew revision, which fixes bugs #62408 and #66061 (Manifest recommit) (diff)
downloadgentoo-2-d37e25b1d9caebc5a081285f864b7742e930d7e4.tar.gz
gentoo-2-d37e25b1d9caebc5a081285f864b7742e930d7e4.tar.bz2
gentoo-2-d37e25b1d9caebc5a081285f864b7742e930d7e4.zip
Remove ppc64-specific relinking for dlloader issues, because it's fixed in 6.8. Requested by Markus Rothe <corsair@gentoo.org>.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog7
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild37
2 files changed, 7 insertions, 37 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 8d745eaee450..60b2c63a3be0 100644
--- a/x11-base/xorg-x11/ChangeLog
+++ b/x11-base/xorg-x11/ChangeLog
@@ -1,6 +1,11 @@
# 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.206 2004/11/17 17:38:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.207 2004/11/17 17:43:07 spyderous Exp $
+
+ 17 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.8.0-r3.ebuild:
+ Remove ppc64-specific relinking for dlloader issues, because it's fixed in
+ 6.8. Requested by Markus Rothe <corsair@gentoo.org>.
*xorg-x11-6.8.0-r3 (17 Nov 2004)
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild
index 0a800c8c008a..9938ddd3641f 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r3.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.8.0-r3.ebuild,v 1.1 2004/11/17 17:38:19 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r3.ebuild,v 1.2 2004/11/17 17:43:07 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -1342,44 +1342,9 @@ pkg_postinst() {
chmod 1777 ${x}
done
- if use ppc64
- then
- #The problem about display driver is fixed.
- cd ${ROOT}/usr/X11R6/$(get_libdir)/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/$(get_libdir)/modules/drivers/fbdev_drv.so ${ROOT}/usr/X11R6/$(get_libdir)/modules/drivers/fbdev_drv.so.orig ${ROOT}/usr/X11R6/$(get_libdir)/modules/linux/libfbdevhw.so ${ROOT}/usr/X11R6/$(get_libdir)/modules/libshadow.so ${ROOT}/usr/X11R6/$(get_libdir)/modules/libshadowfb.so ${ROOT}/usr/X11R6/$(get_libdir)/modules/libfb.so
- ld -rpath ${ROOT}/usr/X11R6/$(get_libdir)/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 ${ROOT}/usr/X11R6/$(get_libdir)/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/$(get_libdir)/modules/extensions
- mv libglx.so libglx.so.orig
- mv libdri.so libdri.so.orig
-
- ld -rpath ${ROOT}/usr/X11R6/$(get_libdir)/modules/extensions -shared -o libglx.so libglx.so.orig libGLcore.so
- ld -rpath ${ROOT}/usr/X11R6/$(get_libdir)/modules/extensions -shared -o libdri.so libdri.so.orig libglx.so
- fi
-
print_info
}
-pkg_prerm() {
-
- if use ppc64
- then
- cd ${ROOT}/usr/X11R6/$(get_libdir)/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/$(get_libdir)/modules/extensions
- mv libglx.so.orig libglx.so
- mv libdri.so.orig libdri.so
- fi
-}
-
pkg_postrm() {
# Fix problematic links