summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2004-11-18 16:25:24 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2004-11-18 16:25:24 +0000
commit00298ebf00ed0c90d894c481d285c276e60e25cb (patch)
tree99c8daa6ae11b318eab106daaac8da8717b243bb /x11-base
parentAdded gentoo patch, which consolidates common patches with the addition of so... (diff)
downloadhistorical-00298ebf00ed0c90d894c481d285c276e60e25cb.tar.gz
historical-00298ebf00ed0c90d894c481d285c276e60e25cb.tar.bz2
historical-00298ebf00ed0c90d894c481d285c276e60e25cb.zip
For USE=uclibc, stop building glxgears and glxinfo. But build GLU library again.
Diffstat (limited to 'x11-base')
-rw-r--r--x11-base/xorg-x11/ChangeLog7
-rw-r--r--x11-base/xorg-x11/Manifest4
-rw-r--r--x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild13
3 files changed, 15 insertions, 9 deletions
diff --git a/x11-base/xorg-x11/ChangeLog b/x11-base/xorg-x11/ChangeLog
index 3f39903c3907..9db5b47da44c 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.210 2004/11/17 18:32:11 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/ChangeLog,v 1.211 2004/11/18 16:25:24 spyderous Exp $
+
+ 18 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>;
+ xorg-x11-6.8.0-r4.ebuild:
+ For USE=uclibc, stop building glxgears and glxinfo. But build GLU library
+ again.
17 Nov 2004; Donnie Berkholz <spyderous@gentoo.org>; :
Update credits on xpm-secfix-thomas.diff.
diff --git a/x11-base/xorg-x11/Manifest b/x11-base/xorg-x11/Manifest
index fced86819678..8c9c3644cebe 100644
--- a/x11-base/xorg-x11/Manifest
+++ b/x11-base/xorg-x11/Manifest
@@ -1,11 +1,11 @@
MD5 ac1137a20503dcb8f9ba2939a2a766f6 metadata.xml 230
MD5 9215e5f10589329a5056f366aa6820e8 xorg-x11-6.7.0-r2.ebuild 38086
MD5 6ebaf0954dc02b95d2102bec0cd6bc43 xorg-x11-6.8.0-r1.ebuild 41340
-MD5 baf3a68db364366c91019c211ae1e9de ChangeLog 47676
+MD5 d63cd14602ca352f7fb5ab2c43938dc6 ChangeLog 47845
MD5 cb102f4f4368c4b252805362396cde47 xorg-x11-6.8.0-r2.ebuild 50246
MD5 223a7a19eeeceddfe21fc50e9de60db1 xorg-x11-6.7.0-r3.ebuild 38098
MD5 36ab39a05061ae51a552083a2cfdc565 xorg-x11-6.8.0-r3.ebuild 39792
-MD5 af30e48778191107f3cee51b30dc39f0 xorg-x11-6.8.0-r4.ebuild 50289
+MD5 ab909bf63d5dbc00b823ccc5b5384e7f xorg-x11-6.8.0-r4.ebuild 50328
MD5 a3314fbdc270d7d84ea14fd477b8d048 files/digest-xorg-x11-6.7.0-r2 904
MD5 70facbdb85b7ef2bc9b9b702442eda7e files/digest-xorg-x11-6.8.0-r1 908
MD5 d9a6c2ccdb525a489e8850cce8728dc3 files/digest-xorg-x11-6.8.0-r2 908
diff --git a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
index 90549531191c..66e65de3f998 100644
--- a/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild
+++ b/x11-base/xorg-x11/xorg-x11-6.8.0-r4.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-r4.ebuild,v 1.2 2004/11/17 18:24:04 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-x11/xorg-x11-6.8.0-r4.ebuild,v 1.3 2004/11/18 16:25:24 spyderous Exp $
# Set TDFX_RISKY to "yes" to get 16-bit, 1024x768 or higher on low-memory
# voodoo3 cards.
@@ -233,6 +233,12 @@ src_unpack() {
host_def_setup
+ # uclibc lacks sinf and cosf
+ if use uclibc; then
+ sed -i -e 's:GLXCLIENTDIRS = glxinfo glxgears:GLXCLIENTDIRS = :' \
+ ${S}/programs/Imakefile
+ fi
+
cd ${S}
if use doc; then
# These are not included anymore as they are obsolete
@@ -749,11 +755,6 @@ host_def_setup() {
use_build xv BuildXvLibrary
use_build xv BuildXvExt
- # uclibc love from iggy
- if use uclibc; then
- echo "#define BuildGLULibrary NO" >> config/cf/host.def
- fi
-
if use alpha; then
echo "#define XF86CardDrivers mga nv tga s3virge sis rendition \
i740 tdfx cirrus tseng fbdev \