From: Joshua Baergen Date: Mon, 4 Dec 2006 23:40:17 +0000 (+0000) Subject: New mesa release with numerous bugfixes and improvements. Introduces the X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3b2aa46390f010fdc378836c6c30a0c22704dc71;p=gentoo.git New mesa release with numerous bugfixes and improvements. Introduces the i915tex driver, which takes advantage of the new DRI memory manager. You'll need a newer kernel DRM to use it than is currently available in the tree. Package-Manager: portage-2.1.2_rc2-r5 --- diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 681f07b85daf..35b044e7a22e 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/mesa # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.127 2006/12/01 18:16:05 gustavoz Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.128 2006/12/04 23:40:17 joshuabaergen Exp $ + +*mesa-6.5.2 (04 Dec 2006) + + 04 Dec 2006; Joshua Baergen +mesa-6.5.2.ebuild: + New mesa release with numerous bugfixes and improvements. Introduces the + i915tex driver, which takes advantage of the new DRI memory manager. You'll + need a newer kernel DRM to use it than is currently available in the tree. 01 Dec 2006; Gustavo Zacarias mesa-6.5.1-r1.ebuild: Stable on hppa diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index b000a4ea3c9e..b5ad3d23b587 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 6.4-dont-install-gles-headers.patch 421 RMD160 70713f143d080b444089a95712efd227227c523f SHA1 ffdf556a66229d0417d5d7e7833c8e9bfdb39741 SHA256 8f636c2e09ac7fdab0d06ebe62af5a311b52a03bf7b7bdecf4789a6e30e0777e MD5 ae36bba4e878c77dc2e823ce00e98869 files/6.4-dont-install-gles-headers.patch 421 RMD160 70713f143d080b444089a95712efd227227c523f files/6.4-dont-install-gles-headers.patch 421 @@ -63,6 +60,7 @@ RMD160 d7241f061f4f0abbab57920cfaa480ad819bf9cb files/radeon-texture-problem.pat SHA256 01d74821fedfd3409d5aa5c7620c2d51e7f1ddad63b6b01d4bd25595afdfbbea files/radeon-texture-problem.patch 363 DIST MesaLib-6.4.2.tar.bz2 2913009 RMD160 6bf1afc0d3bd3f5e3b5c1a019838f40603446509 SHA1 4f042bdf38c9eb62e04660bd18566e7ca50d8640 SHA256 bc84da436f9d92485dfa1c6670689c6807950a8372637c9952f689a1e1f9aa86 DIST MesaLib-6.5.1.tar.bz2 3138257 RMD160 23f8714787b053b2c41d020c7af211a02e5beab3 SHA1 cd3b314808534b0306c7f89e9a72c9c23dbff239 SHA256 e2669c9757e37f9073f539d75ced7f8f7a45b6bbb16081929ca2a306cde59df0 +DIST MesaLib-6.5.2.tar.bz2 3295166 RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 SHA1 ba860bb6ee57c02202342dfd5927464a068ea18f SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f DIST MesaLib-6.5.2_pre20061102.tar.bz2 3258845 RMD160 857f9099578cdd8dceaef779dcc5281a53eb1520 SHA1 e45bdc403001d84b91e0a4c9de0194de631f0f80 SHA256 2f1889a32bf9dbc031daa793fb919d83278b8cceb17c05d58373696e7dd14b90 DIST MesaLib-6.5.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd EBUILD mesa-6.4.2-r2.ebuild 9490 RMD160 c03fd23481b7c6509be8797f8f255a4df26b1ac3 SHA1 10b5c03c5479700f851496c49b62a27b9a0ae5b9 SHA256 3cee6cfb5a2a0df1abda0b46d62d8166fa69564bcd8e5ec971b446ea594c3efa @@ -85,14 +83,18 @@ EBUILD mesa-6.5.1-r2.ebuild 8979 RMD160 8f4abf9c4b64d2bb9deb1b4b8f5bde05ff5d94fe MD5 170a7fc9abbfbc49ea96da8547bebc53 mesa-6.5.1-r2.ebuild 8979 RMD160 8f4abf9c4b64d2bb9deb1b4b8f5bde05ff5d94fe mesa-6.5.1-r2.ebuild 8979 SHA256 20693be3ecc219304fc9c83311e7d454fe851cadad7638c403a2989442511dc6 mesa-6.5.1-r2.ebuild 8979 +EBUILD mesa-6.5.2.ebuild 8754 RMD160 d7b9f53d24f0aecc47e703de909d8c745d20eba8 SHA1 f96df4541be341cd5c5231d6eab55449b286ecae SHA256 19e3e07bdcd003205987dc86e3f8b1dd7fbcd3f0aea7c17763eb93eb93a1f653 +MD5 ac3845b1648c81bc5ca33a98353dc658 mesa-6.5.2.ebuild 8754 +RMD160 d7b9f53d24f0aecc47e703de909d8c745d20eba8 mesa-6.5.2.ebuild 8754 +SHA256 19e3e07bdcd003205987dc86e3f8b1dd7fbcd3f0aea7c17763eb93eb93a1f653 mesa-6.5.2.ebuild 8754 EBUILD mesa-6.5.2_pre20061102.ebuild 8901 RMD160 93b8c7640094419e7ebca5b16009e21c2b271134 SHA1 5dc1563e0c6d2acea725c85a5afbf2808ef69ce0 SHA256 8e830692f64a7e9889bb328d3a57f8280d3707e475ffe93acaefb7cd183b22d4 MD5 03d66454ffc4405b6bac92072636b87f mesa-6.5.2_pre20061102.ebuild 8901 RMD160 93b8c7640094419e7ebca5b16009e21c2b271134 mesa-6.5.2_pre20061102.ebuild 8901 SHA256 8e830692f64a7e9889bb328d3a57f8280d3707e475ffe93acaefb7cd183b22d4 mesa-6.5.2_pre20061102.ebuild 8901 -MISC ChangeLog 22929 RMD160 599bee8aabe0eb0dcb24b9a2f91aa128d07460a8 SHA1 39838e038a09cf32c667db65455a91e6acd5836b SHA256 b4b3be28ed1b1a4f3b9a03d7ea204e5a6111c2e26330083fa58a4dffa02a93e9 -MD5 9820f28e228e349ee46d6a654376ddad ChangeLog 22929 -RMD160 599bee8aabe0eb0dcb24b9a2f91aa128d07460a8 ChangeLog 22929 -SHA256 b4b3be28ed1b1a4f3b9a03d7ea204e5a6111c2e26330083fa58a4dffa02a93e9 ChangeLog 22929 +MISC ChangeLog 23271 RMD160 1e5fceba0037707b4bd9539d3a89a8db6d2c1768 SHA1 20ddbc0a27119211ac765a46c39c693ef28f2c00 SHA256 9342d37e20974fb6c1dbe3d6188ff02a9dce9a3ea60907f208ce88a7b6d68384 +MD5 017c1699df0ced66a48c8044b7d69e7e ChangeLog 23271 +RMD160 1e5fceba0037707b4bd9539d3a89a8db6d2c1768 ChangeLog 23271 +SHA256 9342d37e20974fb6c1dbe3d6188ff02a9dce9a3ea60907f208ce88a7b6d68384 ChangeLog 23271 MISC metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 SHA1 6f78f604e3d079d39189b40aaaa1ddb06182ad91 SHA256 5101ab0d4cc8c7125eea733c44e86962769bd77acaf53b69223b9cadcdd29055 MD5 a37bab73e2f24b213932c30997d3d360 metadata.xml 156 RMD160 c1274bdccf57603d580de0075ba07a35b7509560 metadata.xml 156 @@ -112,13 +114,9 @@ SHA256 fcc814f186f772d396d230867bc9eeeaa1f1f348f6b53aa1bbcf23ff73ccde8f files/di MD5 c5825b910eaf2092a073b33f7db2d640 files/digest-mesa-6.5.1-r2 247 RMD160 7e176dbe4570a0c74add11e3166b2596361d14f6 files/digest-mesa-6.5.1-r2 247 SHA256 fcc814f186f772d396d230867bc9eeeaa1f1f348f6b53aa1bbcf23ff73ccde8f files/digest-mesa-6.5.1-r2 247 +MD5 c0c5f49d272303a5fb0883697d6594ef files/digest-mesa-6.5.2 247 +RMD160 5e03f47a1a56342ba577b02e917b260302afb1a7 files/digest-mesa-6.5.2 247 +SHA256 f9339d87fc164d7137d1f589bb7a5995d6a19302bf26d4002f92e9bf4d1a9821 files/digest-mesa-6.5.2 247 MD5 c1924992ed29ad94b3742d166a693af3 files/digest-mesa-6.5.2_pre20061102 283 RMD160 baf86e2e02d00b0d764f05dd248094f1158b7f65 files/digest-mesa-6.5.2_pre20061102 283 SHA256 6d0f97c088bd7aecbd6ff11cde00357d554ec3a39b888c908c2f9509dd9f5628 files/digest-mesa-6.5.2_pre20061102 283 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.5-ecc0.1.6 (GNU/Linux) - -iD8DBQFFcHFvKRy60XGEcJIRAiryAKCHgNesOdevOIY2XiJ9Ijw+2z61KACfUzEK -jaWUkpMUXIvdz3hkvpcMdW4= -=PDJT ------END PGP SIGNATURE----- diff --git a/media-libs/mesa/files/digest-mesa-6.5.2 b/media-libs/mesa/files/digest-mesa-6.5.2 new file mode 100644 index 000000000000..ee5bf2382d08 --- /dev/null +++ b/media-libs/mesa/files/digest-mesa-6.5.2 @@ -0,0 +1,3 @@ +MD5 e4d894181f1859651658b3704633e10d MesaLib-6.5.2.tar.bz2 3295166 +RMD160 9a92d69110c066ae6734bcaafb78f222ac2df6d3 MesaLib-6.5.2.tar.bz2 3295166 +SHA256 137f50a30461d51eb9af5aac737bc788d536354cf47b26129b97bde6e41fb85f MesaLib-6.5.2.tar.bz2 3295166 diff --git a/media-libs/mesa/mesa-6.5.2.ebuild b/media-libs/mesa/mesa-6.5.2.ebuild new file mode 100644 index 000000000000..c18fc847bfb3 --- /dev/null +++ b/media-libs/mesa/mesa-6.5.2.ebuild @@ -0,0 +1,323 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2.ebuild,v 1.1 2006/12/04 23:40:17 joshuabaergen Exp $ + +inherit eutils toolchain-funcs multilib flag-o-matic portability + +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="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE_VIDEO_CARDS=" + video_cards_i810 + video_cards_mach64 + video_cards_mga + video_cards_none + video_cards_r128 + video_cards_radeon + video_cards_s3virge + video_cards_savage + video_cards_sis + video_cards_sunffb + video_cards_tdfx + video_cards_trident + video_cards_via" +IUSE="${IUSE_VIDEO_CARDS} + debug + doc + hardened + motif + nptl + xcb" + +RESTRICT="stricter" +RDEPEND="dev-libs/expat + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm + x11-libs/libXi + x11-libs/libXmu + >=x11-libs/libdrm-2.0.2 + x11-libs/libICE + app-admin/eselect-opengl + motif? ( virtual/motif ) + doc? ( app-doc/opengl-manpages ) + !<=x11-base/xorg-x11-6.9 + xcb? ( x11-libs/libxcb )" +DEPEND="${RDEPEND} + dev-util/pkgconfig + x11-misc/makedepend + x11-proto/inputproto + x11-proto/xextproto + !hppa? ( x11-proto/xf86driproto ) + x11-proto/xf86vidmodeproto + >=x11-proto/glproto-1.4.8 + motif? ( x11-proto/printproto )" + +S="${WORKDIR}/${MY_P}" + +# Think about: ggi, svga, fbcon, no-X configs + +if use debug; then + if ! has splitdebug ${FEATURES}; then + RESTRICT="${RESTRICT} nostrip" + fi +fi + +pkg_setup() { + if use debug; then + strip-flags + append-flags -g + fi + + append-flags -fno-strict-aliasing + + if use x86-fbsd; then + CONFIG="freebsd-dri-x86" + elif use amd64-fbsd; then + CONFIG="freebsd-dri-amd64" + elif use kernel_FreeBSD; then + CONFIG="freebsd-dri" + elif use x86; then + CONFIG="linux-dri-x86" + 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} + + # FreeBSD 6.* doesn't have posix_memalign(). + [[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configs/freebsd{,-dri} + + # Don't compile debug code with USE=-debug - bug #125004 + if ! use debug; then + einfo "Removing DO_DEBUG defs in dri drivers..." + find src/mesa/drivers/dri -name *.[hc] -exec egrep -l "\#define\W+DO_DEBUG\W+1" {} \; | xargs sed -i -re "s/\#define\W+DO_DEBUG\W+1/\#define DO_DEBUG 0/" ; + fi + + # Set up libdir + echo "LIB_DIR = $(get_libdir)" >> ${HOSTCONF} + + # Set default dri drivers directory + echo 'DRI_DRIVER_SEARCH_DIR = /usr/$(LIB_DIR)/dri' >> ${HOSTCONF} + + # Do we want thread-local storage (TLS)? + if use nptl; then + echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF} + fi + + echo "X11_INCLUDES = `pkg-config --cflags-only-I x11`" >> ${HOSTCONF} + if use xcb; then + echo "DEFINES += -DUSE_XCB" >> ${HOSTCONF} + echo "X11_INCLUDES += `pkg-config --cflags-only-I xcb` `pkg-config --cflags-only-I x11-xcb` `pkg-config --cflags-only-I xcb-glx`" >> ${HOSTCONF} + echo "GL_LIB_DEPS += `pkg-config --libs xcb` `pkg-config --libs x11-xcb` `pkg-config --libs xcb-glx`" >> ${HOSTCONF} + fi + + # Configurable DRI drivers + if use video_cards_i810; then + add_drivers i810 i915 i915tex i965 + fi + if use video_cards_mach64; then + add_drivers mach64 + fi + if use video_cards_mga; then + add_drivers mga + fi + if use video_cards_r128; then + add_drivers r128 + fi + if use video_cards_radeon; then + add_drivers radeon r200 r300 + fi + if use video_cards_s3virge; then + add_drivers s3v + fi + if use video_cards_savage; then + add_drivers savage + fi + if use video_cards_sis; then + add_drivers sis + fi + if use video_cards_sunffb; then + add_drivers ffb + fi + if use video_cards_tdfx; then + add_drivers tdfx + fi + if use video_cards_trident; then + add_drivers trident + fi + if use video_cards_via; then + add_drivers unichrome + fi + + # Set drivers to everything on which we ran add_drivers() + echo "DRI_DIRS = ${DRI_DRIVERS}" >> ${HOSTCONF} + + if use hardened; then + einfo "Deactivating assembly code for hardened build" + echo "ASM_FLAGS =" >> ${HOSTCONF} + echo "ASM_SOURCES =" >> ${HOSTCONF} + echo "ASM_API =" >> ${HOSTCONF} + fi + + if use sparc; then + einfo "Sparc assembly code is not working; deactivating" + echo "ASM_FLAGS =" >> ${HOSTCONF} + echo "ASM_SOURCES =" >> ${HOSTCONF} + fi + + # Replace hardcoded /usr/X11R6 with this + echo "EXTRA_LIB_PATH = `pkg-config --libs-only-L x11`" >> ${HOSTCONF} + + echo 'CFLAGS = $(OPT_FLAGS) $(PIC_FLAGS) $(ARCH_FLAGS) $(DEFINES) $(ASM_FLAGS)' >> ${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 +} + +src_compile() { + emake -j1 ${CONFIG} || die "Build failed" +} + +src_install() { + dodir /usr + make \ + INSTALL_DIR="${D}/usr" \ + DRI_DRIVER_INSTALL_DIR="${D}/usr/\$(LIB_DIR)/dri" \ + INCLUDE_DIR="${D}/usr/include" \ + install || die "Installation failed" + + if ! use motif; then + rm ${D}/usr/include/GL/GLwMDrawA.h + fi + + # Don't install private headers + rm ${D}/usr/include/GL/GLw*P.h + + 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 + sed -e "s:\${libdir}:$(get_libdir):g" ${FILESDIR}/lib/libGL.la \ + > ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la + + # On *BSD libcs dlopen() and similar functions are present directly in + # libc.so and does not require linking to libdl. portability eclass takes + # care of finding the needed library (if needed) witht the dlopen_lib + # function. + sed -i -e 's:-ldl:'$(dlopen_lib)':g' \ + ${D}/usr/$(get_libdir)/libGLU.la \ + ${D}/usr/$(get_libdir)/opengl/xorg-x11/lib/libGL.la + + # Create the two-number versioned libs (.so.#.#), since only .so.# and + # .so.#.#.# were made + dosym libGLU.so.1.3.060502 /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 + if [[ ${CHOST} == *-freebsd* ]]; then + # FreeBSD doesn't use major.minor versioning, so the library is only + # libGL.so.1 and no libGL.so.1.2 is ever used there, thus only create + # libGL.so symlink and leave libGL.so.1 being the real thing + dosym libGL.so.1 /usr/$(get_libdir)/libGL.so + else + dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so + dosym libGL.so.1.2 /usr/$(get_libdir)/libGL.so.1 + fi +} + +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} +} + +add_drivers() { + DRI_DRIVERS="${DRI_DRIVERS} $@" +}