From df0a0fd01b67e8b0460cd9d4a4471590c900f198 Mon Sep 17 00:00:00 2001 From: Donnie Berkholz Date: Mon, 14 Nov 2005 20:15:03 +0000 Subject: Install GLwDrawA.h, and if USE=motif, install GLwMDrawA.h. Reported by Stefaan De Roeck . Package-Manager: portage-2.0.53_rc7 --- media-libs/mesa/ChangeLog | 9 +- media-libs/mesa/Manifest | 6 +- media-libs/mesa/files/digest-mesa-6.4 | 1 - media-libs/mesa/files/digest-mesa-6.4-r1 | 1 + media-libs/mesa/mesa-6.4-r1.ebuild | 206 +++++++++++++++++++++++++++++++ media-libs/mesa/mesa-6.4.ebuild | 200 ------------------------------ 6 files changed, 218 insertions(+), 205 deletions(-) delete mode 100644 media-libs/mesa/files/digest-mesa-6.4 create mode 100644 media-libs/mesa/files/digest-mesa-6.4-r1 create mode 100644 media-libs/mesa/mesa-6.4-r1.ebuild delete mode 100644 media-libs/mesa/mesa-6.4.ebuild (limited to 'media-libs/mesa') diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 636fc72d6ef5..465d49af6c06 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,13 @@ # 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.49 2005/11/14 19:39:54 spyderous Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.50 2005/11/14 20:15:03 spyderous Exp $ + +*mesa-6.4-r1 (14 Nov 2005) + + 14 Nov 2005; Donnie Berkholz ; -mesa-6.4.ebuild, + +mesa-6.4-r1.ebuild: + Install GLwDrawA.h, and if USE=motif, install GLwMDrawA.h. Reported by + Stefaan De Roeck . 14 Nov 2005; Donnie Berkholz ; -files/dont-install-gles-headers.patch, diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 8aabd5b662c1..c3fdef7f757f 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,9 +1,9 @@ -MD5 5d3ebdde083ef12c3cc10b1dfddc9c83 ChangeLog 9832 +MD5 9313760d7012159128cc5d68de43a473 ChangeLog 10071 MD5 ae36bba4e878c77dc2e823ce00e98869 files/6.4-dont-install-gles-headers.patch 421 MD5 cdc08801bd33dadb19c29e4c91863c73 files/change-default-dri-driver-dir.patch 412 -MD5 e2670f5fb26fcc98a8067bbf937f217a files/digest-mesa-6.4 65 +MD5 e2670f5fb26fcc98a8067bbf937f217a files/digest-mesa-6.4-r1 65 MD5 f0ebdc72043e76ad7eddc4ad91349927 files/lib/libGL.la 763 MD5 9abdd26694e6f1d7bd93193f900acc6c files/lib/libGLU.la 752 MD5 ceae0782c8844ebdc68ede6b4d8969d9 files/makedepend-location.patch 375 -MD5 fda69368cfbc0adac4e46a982eead039 mesa-6.4.ebuild 5649 +MD5 a492f38a45a690c73ccef5d0f84683ce mesa-6.4-r1.ebuild 5769 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 diff --git a/media-libs/mesa/files/digest-mesa-6.4 b/media-libs/mesa/files/digest-mesa-6.4 deleted file mode 100644 index 95ad7a03847b..000000000000 --- a/media-libs/mesa/files/digest-mesa-6.4 +++ /dev/null @@ -1 +0,0 @@ -MD5 85a84e47a3f718f752f306b9e0954ef6 MesaLib-6.4.tar.bz2 2928503 diff --git a/media-libs/mesa/files/digest-mesa-6.4-r1 b/media-libs/mesa/files/digest-mesa-6.4-r1 new file mode 100644 index 000000000000..95ad7a03847b --- /dev/null +++ b/media-libs/mesa/files/digest-mesa-6.4-r1 @@ -0,0 +1 @@ +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 new file mode 100644 index 000000000000..8235a1b28bb6 --- /dev/null +++ b/media-libs/mesa/mesa-6.4-r1.ebuild @@ -0,0 +1,206 @@ +# 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.1 2005/11/14 20:15:03 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 ~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 ) + !> ${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/media-libs/mesa/mesa-6.4.ebuild b/media-libs/mesa/mesa-6.4.ebuild deleted file mode 100644 index 204001276f49..000000000000 --- a/media-libs/mesa/mesa-6.4.ebuild +++ /dev/null @@ -1,200 +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.ebuild,v 1.3 2005/11/11 22:22:15 matsuu 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 ~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 ) - !> ${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.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} -} -- cgit v1.2.3-65-gdbad