summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2005-08-10 06:17:14 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2005-08-10 06:17:14 +0000
commit7fe407d1a79b5a075497a61590c81c13ac601003 (patch)
treec600001e28e5f730b7bf8e95efd3bd541c904e56 /media-libs
parentAdd pkg_postinst() to run opengl-update so mesa will build. (diff)
downloadhistorical-7fe407d1a79b5a075497a61590c81c13ac601003.tar.gz
historical-7fe407d1a79b5a075497a61590c81c13ac601003.tar.bz2
historical-7fe407d1a79b5a075497a61590c81c13ac601003.zip
Add fix_opengl_symlinks() from xorg-x11, to set up the libGL symlinks.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/mesa/ChangeLog5
-rw-r--r--media-libs/mesa/Manifest4
-rw-r--r--media-libs/mesa/mesa-6.3.1.1.ebuild15
3 files changed, 20 insertions, 4 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index ba80c2e9d7ae..b496ede699b7 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/mesa
# Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.11 2005/08/10 05:42:06 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.12 2005/08/10 06:17:14 spyderous Exp $
+
+ 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild:
+ Add fix_opengl_symlinks() from xorg-x11, to set up the libGL symlinks.
10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; mesa-6.3.1.1.ebuild:
Stop cleaning out /usr/lib/opengl/xorg-x11, now that two other packages also
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index fb722f53b6d7..83e079c95b1a 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,5 +1,5 @@
-MD5 fcaf15f7fd23602c9350efd04adff7be ChangeLog 1663
-MD5 b412a7f57a8806cee10d41e15b286b8f mesa-6.3.1.1.ebuild 3715
+MD5 8980d28bf4941587c358459dfa0d4b75 ChangeLog 1813
+MD5 3cab3aaf3d20635eab25f3d995a336e3 mesa-6.3.1.1.ebuild 4024
MD5 327ad9473f146d09e0d0bd9198bb6a99 files/digest-mesa-6.3.1.1 129
MD5 14a7882e4e2dc41b7ef845dc11bd9a0c files/fix-xthreads-location.patch 1718
MD5 de65b33347d4dd56da17835ab42daf9a files/use-xthreads.patch 8355
diff --git a/media-libs/mesa/mesa-6.3.1.1.ebuild b/media-libs/mesa/mesa-6.3.1.1.ebuild
index c5e1207d6170..054c0397b4ad 100644
--- a/media-libs/mesa/mesa-6.3.1.1.ebuild
+++ b/media-libs/mesa/mesa-6.3.1.1.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/media-libs/mesa/mesa-6.3.1.1.ebuild,v 1.2 2005/08/10 05:42:06 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.3.1.1.ebuild,v 1.3 2005/08/10 06:17:14 spyderous Exp $
inherit eutils toolchain-funcs
@@ -85,6 +85,7 @@ src_compile() {
src_install() {
dodir /usr
make DESTDIR=${D}/usr install || die "Installation failed"
+ fix_opengl_symlinks
dynamic_libgl_install
# Install libtool archives
@@ -106,6 +107,18 @@ pkg_postinst() {
switch_opengl_implem
}
+fix_opengl_symlinks() {
+ # Remove invalid symlinks
+ local LINK
+ for LINK in $(find ${D}/usr/$(get_libdir) \
+ -name libGL.* -type l); do
+ rm -f ${LINK}
+ done
+ # Create required symlinks
+ dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so
+ dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1
+}
+
dynamic_libgl_install() {
# next section is to setup the dynamic libGL stuff
ebegin "Moving libGL and friends for dynamic switching"