summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2005-08-14 18:23:18 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2005-08-14 18:23:18 +0000
commitf22bd2bc14b07cc872a3a235ed976aa6820effa6 (patch)
tree3b858a7067273b025e3ae17d99bdf7e9eece6c33 /media-libs/mesa
parentAdded ~amd64 keywords. Closes Bug #97498. (diff)
downloadhistorical-f22bd2bc14b07cc872a3a235ed976aa6820effa6.tar.gz
historical-f22bd2bc14b07cc872a3a235ed976aa6820effa6.tar.bz2
historical-f22bd2bc14b07cc872a3a235ed976aa6820effa6.zip
Stop building EGL things, because they aren't ready upstream. Also the EGL demos rely on glut, which creates a circular dependency. Change the default DRI driver directory to the one we actually use. This should be enough to get direct rendering working.
Package-Manager: portage-2.0.51.22-r2
Diffstat (limited to 'media-libs/mesa')
-rw-r--r--media-libs/mesa/ChangeLog12
-rw-r--r--media-libs/mesa/Manifest6
-rw-r--r--media-libs/mesa/files/change-default-dri-driver-dir.patch11
-rw-r--r--media-libs/mesa/files/digest-mesa-6.3.1.1-r23
-rw-r--r--media-libs/mesa/files/dont-install-gles-headers.patch14
-rw-r--r--media-libs/mesa/mesa-6.3.1.1-r2.ebuild184
6 files changed, 228 insertions, 2 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index a4bb40656cc4..cc4e258a8a12 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -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.24 2005/08/12 22:13:08 spyderous Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.25 2005/08/14 18:23:18 spyderous Exp $
+
+*mesa-6.3.1.1-r2 (14 Aug 2005)
+
+ 14 Aug 2005; Donnie Berkholz <spyderous@gentoo.org>;
+ +files/change-default-dri-driver-dir.patch,
+ +files/dont-install-gles-headers.patch, +mesa-6.3.1.1-r2.ebuild:
+ Stop building EGL things, because they aren't ready upstream. Also the EGL
+ demos rely on glut, which creates a circular dependency. Change the default
+ DRI driver directory to the one we actually use. This should be enough to
+ get direct rendering working.
*mesa-6.3.1.1-r1 (12 Aug 2005)
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index aac35b59f3ce..87690fd3669b 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,12 +1,16 @@
-MD5 003378963696d551753d96d1aa72a1a7 ChangeLog 5054
+MD5 a50b0787ece0577c4bfcfad495126c39 ChangeLog 5518
MD5 7f0a62b636986a7f0c00bc3b2b15423b mesa-6.3.1.1.ebuild 4836
MD5 2bddb4082f270ed7e70da09ac76d475e mesa-6.3.1.1-r1.ebuild 5102
+MD5 799bcc5743c92f06dd781dda3f0e56f9 mesa-6.3.1.1-r2.ebuild 5420
MD5 327ad9473f146d09e0d0bd9198bb6a99 files/digest-mesa-6.3.1.1 129
MD5 dba6d6acff3459c88499ffb1aa802d63 files/fix-include-locations.patch 3046
MD5 14a7882e4e2dc41b7ef845dc11bd9a0c files/fix-xthreads-location.patch 1718
MD5 ceae0782c8844ebdc68ede6b4d8969d9 files/makedepend-location.patch 375
MD5 de65b33347d4dd56da17835ab42daf9a files/use-xthreads.patch 8355
MD5 2685b3ea6cabdd4da8929cfca0a03573 files/digest-mesa-6.3.1.1-r1 223
+MD5 2685b3ea6cabdd4da8929cfca0a03573 files/digest-mesa-6.3.1.1-r2 223
+MD5 3621c4e6ce01ff309d49348222756a64 files/dont-install-gles-headers.patch 479
+MD5 cdc08801bd33dadb19c29e4c91863c73 files/change-default-dri-driver-dir.patch 412
MD5 f0ebdc72043e76ad7eddc4ad91349927 files/lib/libGL.la 763
MD5 9abdd26694e6f1d7bd93193f900acc6c files/lib/libGLU.la 752
MD5 0883c9996cac1056781bdcd2aab60e66 files/lib/libOSMesa.la 765
diff --git a/media-libs/mesa/files/change-default-dri-driver-dir.patch b/media-libs/mesa/files/change-default-dri-driver-dir.patch
new file mode 100644
index 000000000000..36151d62b0ed
--- /dev/null
+++ b/media-libs/mesa/files/change-default-dri-driver-dir.patch
@@ -0,0 +1,11 @@
+--- Mesa-6.3.1.1.orig/src/glx/x11/dri_glx.c 2005-07-27 17:29:51.000000000 -0700
++++ Mesa-6.3.1.1/src/glx/x11/dri_glx.c 2005-08-14 11:09:54.000000000 -0700
+@@ -58,7 +58,7 @@
+
+ #ifndef DEFAULT_DRIVER_DIR
+ /* this is normally defined in the Imakefile */
+-#define DEFAULT_DRIVER_DIR "/usr/X11R6/lib/modules/dri"
++#define DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
+ #endif
+
+ static __DRIdriver *Drivers = NULL;
diff --git a/media-libs/mesa/files/digest-mesa-6.3.1.1-r2 b/media-libs/mesa/files/digest-mesa-6.3.1.1-r2
new file mode 100644
index 000000000000..c061afc4f2ea
--- /dev/null
+++ b/media-libs/mesa/files/digest-mesa-6.3.1.1-r2
@@ -0,0 +1,3 @@
+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
diff --git a/media-libs/mesa/files/dont-install-gles-headers.patch b/media-libs/mesa/files/dont-install-gles-headers.patch
new file mode 100644
index 000000000000..a58a69b4c33e
--- /dev/null
+++ b/media-libs/mesa/files/dont-install-gles-headers.patch
@@ -0,0 +1,14 @@
+diff -urN Mesa-6.3.1.1.orig/bin/installmesa Mesa-6.3.1.1/bin/installmesa
+--- Mesa-6.3.1.1.orig/bin/installmesa 2005-06-04 19:10:58.000000000 -0700
++++ Mesa-6.3.1.1/bin/installmesa 2005-08-14 11:01:11.000000000 -0700
+@@ -53,10 +53,8 @@
+
+ mkdir ${INCLUDE_DIR}
+ mkdir ${INCLUDE_DIR}/GL
+-mkdir ${INCLUDE_DIR}/GLES
+ mkdir ${LIB_DIR}
+ cp -f ${TOP}/include/GL/*.h ${INCLUDE_DIR}/GL
+-cp -f ${TOP}/include/GLES/*.h ${INCLUDE_DIR}/GLES
+ cp -fd ${TOP}/lib*/lib* ${LIB_DIR}
+
+ echo "Done."
diff --git a/media-libs/mesa/mesa-6.3.1.1-r2.ebuild b/media-libs/mesa/mesa-6.3.1.1-r2.ebuild
new file mode 100644
index 000000000000..98304eb9b656
--- /dev/null
+++ b/media-libs/mesa/mesa-6.3.1.1-r2.ebuild
@@ -0,0 +1,184 @@
+# 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-r2.ebuild,v 1.1 2005/08/14 18:23:18 spyderous Exp $
+
+inherit eutils toolchain-funcs
+
+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="~sparc ~x86"
+IUSE="motif"
+
+RDEPEND="dev-libs/expat
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXxf86vm
+ x11-libs/libXi
+ x11-libs/libXmu
+ >=x11-base/opengl-update-2.2.2
+ motif? ( virtual/motif )"
+DEPEND="${RDEPEND}
+ x11-misc/makedepend
+ >=x11-proto/glproto-1.4-r1"
+
+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}
+
+ # 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
+}
+
+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/*.la
+
+ # Create the two-number versioned libs (.so.#.#), since only .so.# and
+ # .so.#.#.# were made
+ dosym libGLU.so.1.3.060301 /usr/lib/libGLU.so.1.3
+ dosym libGLw.so.1.0.0 /usr/lib/libGLw.so.1.0
+ dosym libOSMesa.so.6.3.060301 /usr/lib/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
+ local opengl_implem="$(${ROOT}/usr/sbin/opengl-update --get-implementation)"
+ ${ROOT}/usr/sbin/opengl-update --use-old ${OPENGL_DIR}
+}