# 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.41 2005/09/20 07:06:40 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.42 2005/10/12 16:42:03 spyderous Exp $
+
+ 12 Oct 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ -files/lib/libOSMesa.la, -mesa-6.3.1.1-r3.ebuild, -mesa-6.3.2.ebuild:
+ Pull old ebuilds. Current versions aren't using libOSMesa.la either, so pull
+ that too.
*mesa-6.3.2-r1 (20 Sep 2005)
MD5 2dee9c3d4502a160bd39c4bfd52c6243 mesa-6.3.2-r1.ebuild 5651
-MD5 add71e2d9cc3a75330ff1a409d06183c ChangeLog 8706
+MD5 b19700b97802c11d4e97a6147eb9188c ChangeLog 8925
MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
-MD5 df288751c07f1e0d0991d39d31241966 mesa-6.3.2.ebuild 5548
-MD5 732e680f02cf2bf622d1d94dbeaaa7d3 mesa-6.3.1.1-r3.ebuild 5825
-MD5 bd015b299e16dfdc191313c06776eb96 files/digest-mesa-6.3.2 67
MD5 a9b60dbab413bb1645804918f13b7378 files/mesa-add-dri-asm-files.patch 21517
MD5 bd015b299e16dfdc191313c06776eb96 files/digest-mesa-6.3.2-r1 67
MD5 ceae0782c8844ebdc68ede6b4d8969d9 files/makedepend-location.patch 375
MD5 3621c4e6ce01ff309d49348222756a64 files/dont-install-gles-headers.patch 479
MD5 cdc08801bd33dadb19c29e4c91863c73 files/change-default-dri-driver-dir.patch 412
-MD5 2685b3ea6cabdd4da8929cfca0a03573 files/digest-mesa-6.3.1.1-r3 223
MD5 f0ebdc72043e76ad7eddc4ad91349927 files/lib/libGL.la 763
MD5 9abdd26694e6f1d7bd93193f900acc6c files/lib/libGLU.la 752
-MD5 0883c9996cac1056781bdcd2aab60e66 files/lib/libOSMesa.la 765
+++ /dev/null
-MD5 9e05f987ec79f6374457bea343b063c2 Mesa-6.3.1.1.tar.gz 6379711
-MD5 34cdd11cc3d1786754439c7910d8cb38 libdrm-1.0.1.tar.gz 396571
-MD5 d48d25b86303ac5a58478bd5ccde6705 Mesa-6.3.1.1-update-to-CVS-HEAD-20050811.patch.gz 147868
+++ /dev/null
-MD5 0df27701df0924d17ddf41185efa8ce1 MesaLib-6.3.2.tar.bz2 3012145
+++ /dev/null
-# libOSMesa.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.4 (1.920 2001/04/24 23:26:18)
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libOSMesa.so.3'
-
-# Names of this library.
-library_names='libOSMesa.so.3.3 libOSMesa.so.3 libOSMesa.so'
-
-# The name of the static archive.
-old_library=''
-
-# Libraries that this one depends upon.
-dependency_libs=' -L/usr/lib -lGL -lSM -lICE -lXmu -lXt -lXext -lXi -lX11 -ldl -lpthread '
-
-# Version information for libOSMesa.
-current=4
-age=3
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/lib'
+++ /dev/null
-# 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-r3.ebuild,v 1.6 2005/09/06 18:56:37 spyderous Exp $
-
-inherit eutils toolchain-funcs multilib
-
-OPENGL_DIR="xorg-x11"
-
-LIBDRM_PV="1.0.1"
-LIBDRM_P="libdrm-${LIBDRM_PV}"
-
-MY_PN=${PN/m/M}
-MY_P=${MY_PN}-${PV}
-DESCRIPTION="OpenGL-like graphic library for Linux"
-HOMEPAGE="http://mesa3d.sourceforge.net/"
-SRC_URI="http://xorg.freedesktop.org/extras/${MY_P}.tar.gz
- http://xorg.freedesktop.org/extras/${LIBDRM_P}.tar.gz
- http://dev.gentoo.org/~spyderous/xorg-x11/Mesa-6.3.1.1-update-to-CVS-HEAD-20050811.patch.gz"
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
-IUSE="motif"
-
-RDEPEND="dev-libs/expat
- x11-libs/libX11
- x11-libs/libXext
- x11-libs/libXxf86vm
- x11-libs/libXi
- x11-libs/libXmu
- app-admin/eselect-opengl
- motif? ( virtual/motif )"
-DEPEND="${RDEPEND}
- x11-misc/makedepend
- >=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 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 ${WORKDIR}/Mesa-6.3.1.1-update-to-CVS-HEAD-20050811.patch
-# epatch ${FILESDIR}/fix-xthreads-location.patch
-# epatch ${FILESDIR}/use-xthreads.patch
- epatch ${FILESDIR}/makedepend-location.patch
-# epatch ${FILESDIR}/fix-include-locations.patch
- epatch ${FILESDIR}/dont-install-gles-headers.patch
- epatch ${FILESDIR}/change-default-dri-driver-dir.patch
-
- # Set up linux-dri configs
- echo "OPT_FLAGS = ${CFLAGS}" >> ${HOSTCONF}
- if use sparc; then
- # Kill this; we don't want /usr/X11R6/lib ever to be searched in this
- # build.
- echo "EXTRA_LIB_PATH =" >> ${HOSTCONF}
- einfo "Define the sparc DRI drivers."
- echo "DRI_DIRS = dri_client ffb mach64 mga radeon savage" >> ${HOSTCONF}
- einfo "Explicitly note that sparc assembly code is not working."
- echo "ASM_FLAGS =" >> ${HOSTCONF}
- echo "ASM_SOURCES =" >> ${HOSTCONF}
- fi
- echo "CC = $(tc-getCC)" >> ${HOSTCONF}
- echo "CXX = $(tc-getCXX)" >> ${HOSTCONF}
- echo "DRM_SOURCE_PATH=\$(TOP)/../${LIBDRM_P}" >> ${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 = -L\$(LIB_DIR) -l\$(GL_LIB) \$(EXTRA_LIB_PATH) -lXt -lX11 -lXm" >> ${HOSTCONF}
- echo "GLW_LIB_DEPS += -lXm" >> ${HOSTCONF}
- # Add GLwMDrawA.c
-# echo "GLW_SOURCES = GLwDrawA.c GLwMDrawA.c" >> ${HOSTCONF}
- 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
-
- 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.060301 /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
-
- # 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}
-}
+++ /dev/null
-# 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.2.ebuild,v 1.7 2005/09/06 18:56:37 spyderous 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 ~ppc ~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
- x11-libs/libICE
- app-admin/eselect-opengl
- motif? ( virtual/motif )"
-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 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}/dont-install-gles-headers.patch
- epatch ${FILESDIR}/change-default-dri-driver-dir.patch
- epatch ${FILESDIR}/mesa-add-dri-asm-files.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
-
- 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.060301 /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
-
- # 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}
-}
projects / gentoo.git / commitdiff