diff options
author | Donnie Berkholz <spyderous@gentoo.org> | 2005-12-09 15:11:38 +0000 |
---|---|---|
committer | Donnie Berkholz <spyderous@gentoo.org> | 2005-12-09 15:11:38 +0000 |
commit | 02d70c7dec1ebbf4be0d9ebe554333ff3a47fc43 (patch) | |
tree | 6395a739674ce6aee9ec83da853f85a4cf1b0107 | |
parent | Stable on sparc (diff) | |
download | gentoo-2-02d70c7dec1ebbf4be0d9ebe554333ff3a47fc43.tar.gz gentoo-2-02d70c7dec1ebbf4be0d9ebe554333ff3a47fc43.tar.bz2 gentoo-2-02d70c7dec1ebbf4be0d9ebe554333ff3a47fc43.zip |
Pull old versions.
(Portage version: 2.0.53)
-rw-r--r-- | media-libs/mesa/ChangeLog | 5 | ||||
-rw-r--r-- | media-libs/mesa/files/digest-mesa-6.4-r1 | 1 | ||||
-rw-r--r-- | media-libs/mesa/mesa-6.4-r1.ebuild | 208 | ||||
-rw-r--r-- | x11-base/xorg-server/ChangeLog | 8 |
4 files changed, 11 insertions, 211 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 5e82905b70fd..200214ab84b5 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.55 2005/12/02 06:26:51 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.56 2005/12/09 15:08:35 spyderous Exp $ + + 09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; -mesa-6.4-r1.ebuild: + Pull old versions. 02 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; files/6.4.1-amd64-include-assyntax.patch: diff --git a/media-libs/mesa/files/digest-mesa-6.4-r1 b/media-libs/mesa/files/digest-mesa-6.4-r1 deleted file mode 100644 index 95ad7a03847b..000000000000 --- a/media-libs/mesa/files/digest-mesa-6.4-r1 +++ /dev/null @@ -1 +0,0 @@ -MD5 85a84e47a3f718f752f306b9e0954ef6 MesaLib-6.4.tar.bz2 2928503 diff --git a/media-libs/mesa/mesa-6.4-r1.ebuild b/media-libs/mesa/mesa-6.4-r1.ebuild deleted file mode 100644 index 5e807957bb06..000000000000 --- a/media-libs/mesa/mesa-6.4-r1.ebuild +++ /dev/null @@ -1,208 +0,0 @@ -# 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.4-r1.ebuild,v 1.4 2005/11/30 04:17:24 vapier Exp $ - -inherit eutils toolchain-funcs multilib - -# Arches that need to define their own sets of DRI drivers, please do so in -# a variable up here, and use that variable below. This helps us to separate the -# data from the code. -DRI_DRIVERS_SPARC="ffb mach64 mga radeon savage" - -OPENGL_DIR="xorg-x11" - -MY_PN="${PN/m/M}" -MY_P="${MY_PN}-${PV}" -MY_SRC_P="${MY_PN}Lib-${PV}" -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="http://mesa3d.sourceforge.net/" -SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2" -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~amd64 ~arm ~ia64 ~mips ~ppc ~sh ~sparc ~x86" -IUSE="motif" - -RDEPEND="dev-libs/expat - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXxf86vm - x11-libs/libXi - x11-libs/libXmu - >=x11-libs/libdrm-1.0.5 - x11-libs/libICE - app-admin/eselect-opengl - motif? ( virtual/motif ) - !<=x11-base/xorg-x11-6.9" -DEPEND="${RDEPEND} - x11-misc/makedepend - x11-proto/xf86vidmodeproto - >=x11-proto/glproto-1.4-r1 - motif? ( x11-proto/printproto )" - -PROVIDE="virtual/opengl virtual/glu" - -S="${WORKDIR}/${MY_P}" - -# Think about: ggi, svga, fbcon, no-X configs - -pkg_setup() { - if [[ ${KERNEL} == "FreeBSD" ]]; then - CONFIG="freebsd" - elif use x86; then - CONFIG="linux-dri-x86" - # amd64 people need to look at this file to deal with lib64 issues, unless - # they're fine with hardcoded lib64. - elif use amd64; then - CONFIG="linux-dri-x86-64" - elif use ppc; then - CONFIG="linux-dri-ppc" - else - CONFIG="linux-dri" - fi -} - -src_unpack() { - HOSTCONF="${S}/configs/${CONFIG}" - - unpack ${A} - cd ${S} - - epatch ${FILESDIR}/makedepend-location.patch - epatch ${FILESDIR}/${PV}-dont-install-gles-headers.patch - epatch ${FILESDIR}/change-default-dri-driver-dir.patch - - # Set up linux-dri configs - if use sparc; then - einfo "Define the sparc DRI drivers." - echo "DRI_DIRS = ${DRI_DRIVERS_SPARC}" >> ${HOSTCONF} - einfo "Explicitly note that sparc assembly code is not working." - echo "ASM_FLAGS =" >> ${HOSTCONF} - echo "ASM_SOURCES =" >> ${HOSTCONF} - fi - - # Kill this; we don't want /usr/X11R6/lib ever to be searched in this - # build. - echo "EXTRA_LIB_PATH =" >> ${HOSTCONF} - - echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF} - echo "CC = $(tc-getCC)" >> ${HOSTCONF} - echo "CXX = $(tc-getCXX)" >> ${HOSTCONF} - - # Removed glut, since we have separate freeglut/glut ebuilds - # Remove EGL, since Brian Paul says it's not ready for a release - echo "SRC_DIRS = glx/x11 mesa glu glw" >> ${HOSTCONF} - - # Get rid of glut includes - rm -f ${S}/include/GL/glut*h - - # r200 breaks without this, since it's the only EGL-enabled driver so far - echo "USING_EGL = 0" >> ${HOSTCONF} - - # Don't build EGL demos. EGL isn't ready for release, plus they produce a - # circular dependency with glut. - echo "PROGRAM_DIRS =" >> ${HOSTCONF} - - # Documented in configs/default - if use motif; then - # Add -lXm - echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF} - # Add GLwMDrawA.c - echo "GLW_SOURCES += GLwMDrawA.c" >> ${HOSTCONF} - fi - - # Fix install libdir - sed -i -e "s:LIB_DIR=\$1/lib:LIB_DIR=\$1/$(get_libdir):" \ - ${S}/bin/installmesa || die "sed failed" -} - -src_compile() { - emake -j1 ${CONFIG} || die "Build failed" -} - -src_install() { - dodir /usr - make DESTDIR=${D}/usr install || die "Installation failed" - - ## - # Install the actual drivers --- 'make install' doesn't install them - # anywhere. - dodir /usr/$(get_libdir)/xorg/modules/dri - exeinto /usr/$(get_libdir)/xorg/modules/dri - einfo "Installing drivers to ${EXEDESTTREE}." - find ${S}/lib* -name '*_dri.so' | xargs doexe - - insinto /usr/include/GL - doins ${S}/src/glw/GLwDrawA.h - if use motif; then - doins ${S}/src/glw/GLwMDrawA.h - fi - - fix_opengl_symlinks - dynamic_libgl_install - - # Install libtool archives - insinto /usr/$(get_libdir) - # (#67729) Needs to be lib, not $(get_libdir) - doins ${FILESDIR}/lib/libGLU.la - #doins ${FILESDIR}/lib/libOSMesa.la - insinto /usr/$(get_libdir)/opengl/xorg-x11/lib - doins ${FILESDIR}/lib/libGL.la - - # Create the two-number versioned libs (.so.#.#), since only .so.# and - # .so.#.#.# were made - dosym libGLU.so.1.3.060400 /usr/$(get_libdir)/libGLU.so.1.3 - dosym libGLw.so.1.0.0 /usr/$(get_libdir)/libGLw.so.1.0 - #dosym libOSMesa.so.6.3.060301 /usr/$(get_libdir)/libOSMesa.so.6.3 - - # libGLU doesn't get the plain .so symlink either - dosym libGLU.so.1 /usr/$(get_libdir)/libGLU.so - - # Figure out why libGL.so.1.5 is built (directfb), and why it's linked to - # as the default libGL.so.1 -} - -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" - dodir /usr/$(get_libdir)/opengl/${OPENGL_DIR}/{lib,extensions,include} - local x="" - for x in ${D}/usr/$(get_libdir)/libGL.so* \ - ${D}/usr/$(get_libdir)/libGL.la \ - ${D}/usr/$(get_libdir)/libGL.a; do - if [ -f ${x} -o -L ${x} ]; then - # libGL.a cause problems with tuxracer, etc - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib - fi - done - # glext.h added for #54984 - for x in ${D}/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} ${D}/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include - fi - done - eend 0 -} - -switch_opengl_implem() { - # Switch to the xorg implementation. - # Use new opengl-update that will not reset user selected - # OpenGL interface ... - echo - eselect opengl set --use-old ${OPENGL_DIR} -} diff --git a/x11-base/xorg-server/ChangeLog b/x11-base/xorg-server/ChangeLog index cf9aa8ecddd5..0ee7d2d038a7 100644 --- a/x11-base/xorg-server/ChangeLog +++ b/x11-base/xorg-server/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for x11-base/xorg-server # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.72 2005/12/06 07:02:35 joshuabaergen Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-base/xorg-server/ChangeLog,v 1.73 2005/12/09 15:11:38 spyderous Exp $ + + 09 Dec 2005; Donnie Berkholz <spyderous@gentoo.org>; + -xorg-server-0.99.2-r2.ebuild, -xorg-server-0.99.3.ebuild, + -xorg-server-0.99.3-r1.ebuild, -xorg-server-0.99.4.ebuild, + -xorg-server-0.99.4-r1.ebuild: + Pull old versions. *xorg-server-0.99.4-r2 (06 Dec 2005) |