diff options
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/mesa/ChangeLog | 22 | ||||
| -rw-r--r-- | media-libs/mesa/Manifest | 9 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-6.3.1.1.ebuild | 49 |
3 files changed, 67 insertions, 13 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 5d7612703de6..b53fecb780b5 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,26 @@ # 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.18 2005/08/10 22:36:01 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.19 2005/08/11 17:38:36 fmccor Exp $ + + 11 Aug 2005; Ferris McCormick <fmccor@gentoo.org> mesa-6.3.1.1.ebuild: + Following changes build a reunning libGL for sparc testing and set + a sane set of DRI drivers, depending on USE=dri flag: + 1. With dri, sparc assembly appears to be unusable. This is because + the build and directory structures have been changed so that the + actual initialization code moves to the dri drivers themselves + when sparc assembly is built. Correcting this is nontrivial, + because the glx build uses hard-defined source names and paths. + 2. With USE=dri, on sparc build only a subset of the full complement + of drivers. For now, DRI_DIRS = fb ffb mach64 mga radeon savage + 3. Without USE=dri, change the target to (generic) linux-sparc. In + this case, architecture is actually set by CFLAGS passed in to the + configure target, and both glx-capable and stand-alone versions + of libGL are built. + 4. For testing, and perhaps ultimately for performance, on sparc, unless + USE=dri, do not fix_opengl_symlinks + With these changes in place, + LD_LIBRARY_PATH=<path-to-libGL>:<path-to-libGLU> some-libGL-program + works fine. 10 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>; +files/fix-include-locations.patch, mesa-6.3.1.1.ebuild: diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 92c2fe5252aa..40429ae48b07 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,10 +1,7 @@ -MD5 0790d353bd61afb9360e42030f2365b2 ChangeLog 3152 -MD5 dc882a67d7d45ff8b13961a5bdca9c11 mesa-6.3.1.1.ebuild 4341 -MD5 ceae0782c8844ebdc68ede6b4d8969d9 files/makedepend-location.patch 375 +MD5 da7a32a4a112550e1a3d7f8ae3880ff5 ChangeLog 4285 +MD5 9beaeae24e13a13fee81380562ebc318 mesa-6.3.1.1.ebuild 5659 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 MD5 dba6d6acff3459c88499ffb1aa802d63 files/fix-include-locations.patch 3046 -MD5 f0ebdc72043e76ad7eddc4ad91349927 files/lib/libGL.la 763 -MD5 9abdd26694e6f1d7bd93193f900acc6c files/lib/libGLU.la 752 -MD5 0883c9996cac1056781bdcd2aab60e66 files/lib/libOSMesa.la 765 +MD5 ceae0782c8844ebdc68ede6b4d8969d9 files/makedepend-location.patch 375 diff --git a/media-libs/mesa/mesa-6.3.1.1.ebuild b/media-libs/mesa/mesa-6.3.1.1.ebuild index d4dd26b744c7..2f38c6aa3e75 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.9 2005/08/10 22:36:01 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.3.1.1.ebuild,v 1.10 2005/08/11 17:38:36 fmccor Exp $ inherit eutils toolchain-funcs @@ -18,7 +18,7 @@ SRC_URI="http://xorg.freedesktop.org/extras/${MY_P}.tar.gz LICENSE="LGPL-2" SLOT="0" KEYWORDS="~sparc ~x86" -IUSE="motif" +IUSE="dri motif" RDEPEND="dev-libs/expat x11-libs/libX11 @@ -47,6 +47,16 @@ pkg_setup() { CONFIG="linux-dri-x86-64" elif use ppc; then CONFIG="linux-dri-ppc" + elif use sparc; then + if use dri; then + ## Is this best for sparc-dri???? + einfo "Using generic skeleton for sparc dri" + CONFIG="linux-dri" + else + ## Use generic sparc; CFLAGS will get the arch. options right. + einfo "Basing on generic-sparc, no dri, CFLAGS fix architecture" + CONFIG="linux-sparc" + fi else CONFIG="linux-dri" fi @@ -66,9 +76,30 @@ src_unpack() { # Set up linux-dri configs echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF} if use sparc; then - echo "ASM_FLAGS = -DUSE_SPARC_ASM" >> ${HOSTCONF} - echo "ASM_SOURCES = \$(SPARC_SOURCES) \$(SPARC_API)" >> ${HOSTCONF} - echo "DRIVER_DIRS = " >> ${HOSTCONF} + # Kill this; we don't want /usr/X11R6/lib ever to be searched in this + # build. + echo "EXTRA_LIB_PATH =" >> ${HOSTCONF} + if use dri; then + einfo "Set specific sparc dri drivers" + echo "DRI_DIRS = fb ffb mach64 mga radeon savage" >> ${HOSTCONF} + einfo "But if we do this, assembly support seems broken" + # Kill it explicitly. + echo "ASM_FLAGS =" >> ${HOSTCONF} + echo "ASM_SOURCES =" >> ${HOSTCONF} + else + einfo "Not dri; kill DRI_DIRS (we build glx + standalone)" + ## Not needed, most likely, because not used for this target. + echo "DRI_DIRS =" >> ${HOSTCONF} + echo "DRIVER_DIRS =" >> ${HOSTCONF} + ## + # This target tries to build lots of demos, which we don't need. + echo "PROGRAM_DIRS = " >> ${HOSTCONF} + einfo "And, we should be able to use the assembler code" + einfo "But we can't because of mesa restructuring" + # echo "ASM_FLAGS = -DUSE_SPARC_ASM" >> ${HOSTCONF} + # echo "ASM_SOURCES = \$(SPARC_SOURCES) \$(SPARC_API)" >> ${HOSTCONF} + ## + fi fi echo "CC = $(tc-getCC)" >> ${HOSTCONF} echo "CXX = $(tc-getCXX)" >> ${HOSTCONF} @@ -93,7 +124,13 @@ src_compile() { src_install() { dodir /usr make DESTDIR=${D}/usr install || die "Installation failed" - fix_opengl_symlinks + if use sparc; then + einfo "Check for sparc; keep old link unless we have a dri interface" + if use dri; then + einfo "Fixing links." + fix_opengl_symlinks + fi + fi dynamic_libgl_install # Install libtool archives |