New version. This is the one that's expected to be in X.Org 7.0. Fix libGL.* symlink...
authorDonnie Berkholz <dberkholz@gentoo.org>
Wed, 30 Nov 2005 20:24:43 +0000 (20:24 +0000)
committerDonnie Berkholz <dberkholz@gentoo.org>
Wed, 30 Nov 2005 20:24:43 +0000 (20:24 +0000)
Package-Manager: portage-2.0.53_rc7

media-libs/mesa/ChangeLog
media-libs/mesa/Manifest
media-libs/mesa/files/digest-mesa-6.4.1 [new file with mode: 0644]
media-libs/mesa/mesa-6.4.1.ebuild [new file with mode: 0644]

index 3c4b42bc304627bebb39eae13b5bfd95e6f32cb8..723b0c37907868c8ba39b62c83227db2a46a3012 100644 (file)
@@ -1,6 +1,16 @@
 # 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.52 2005/11/27 20:18:19 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.53 2005/11/30 20:24:43 spyderous Exp $
+
+*mesa-6.4.1 (30 Nov 2005)
+
+  30 Nov 2005; Donnie Berkholz <spyderous@gentoo.org>; +mesa-6.4.1.ebuild:
+  New version. This is the one that's expected to be in X.Org 7.0. Fix libGL.*
+  symlink deletion so the dot really matches a dot instead of any character,
+  so other symlinks don't get deleted. (#110840) Build with PIC, since it
+  hasn't been shown to slow it down. Remove commented-out lines about OSMesa.
+  Keep using 6.4-dont-install-gles-headers.patch, so don't delete it when
+  pulling 6.4.
 
   27 Nov 2005; Joshua Baergen <joshuabaergen@gentoo.org> mesa-6.4-r1.ebuild:
   Added Diego's patch for FreeBSD support. Closes bug #111145.
index 8cc430c75ae1db5ea1768c25df849528e2a8134c..f4a4f471d9de64b7e48713a323ffb3dad6734aa8 100644 (file)
@@ -1,19 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 5fc56024daec9c38ec3cc4c2956ddde4 ChangeLog 10334
+MD5 c0f7fe30df095a267fe9e620b03216b4 ChangeLog 10830
 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-r1 65
+MD5 063dc3bc1f6634ab506e9c8ca8bb05c0 files/digest-mesa-6.4.1 67
 MD5 f0ebdc72043e76ad7eddc4ad91349927 files/lib/libGL.la 763
 MD5 9abdd26694e6f1d7bd93193f900acc6c files/lib/libGLU.la 752
 MD5 ceae0782c8844ebdc68ede6b4d8969d9 files/makedepend-location.patch 375
 MD5 a47cec2afd24d3eaba62bf5e9ea6311a mesa-6.4-r1.ebuild 5832
+MD5 a8087b21cb58264ea1dd4d1c0dc43cf8 mesa-6.4.1.ebuild 5845
 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDjShigIKl8Uu19MoRAjA7AKCA4uxTMRlA8K+wnKSyrqyBkOQzvgCffqJs
-ETXI/xXTpKDOPWhUm/D0haU=
-=8RZh
------END PGP SIGNATURE-----
diff --git a/media-libs/mesa/files/digest-mesa-6.4.1 b/media-libs/mesa/files/digest-mesa-6.4.1
new file mode 100644 (file)
index 0000000..0f4cbf1
--- /dev/null
@@ -0,0 +1 @@
+MD5 ea148c828ec6f645526451db1b8556f1 MesaLib-6.4.1.tar.bz2 2913887
diff --git a/media-libs/mesa/mesa-6.4.1.ebuild b/media-libs/mesa/mesa-6.4.1.ebuild
new file mode 100644 (file)
index 0000000..41d8e18
--- /dev/null
@@ -0,0 +1,208 @@
+# 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.1.ebuild,v 1.1 2005/11/30 20:24:43 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 ~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}/6.4-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}
+       # bug #110840 - Build with PIC, since it hasn't been shown to slow it down
+       echo "PIC_FLAGS = -fPIC" >> ${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
+       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
+
+       # 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}
+}