Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
summaryrefslogtreecommitdiff
path: root/hardened/xorg/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'hardened/xorg/media-libs')
-rw-r--r--hardened/xorg/media-libs/mesa/Manifest23
-rw-r--r--hardened/xorg/media-libs/mesa/files/digest-mesa-6.5-r43
-rw-r--r--hardened/xorg/media-libs/mesa/mesa-6.5-r3.ebuild13
-rw-r--r--hardened/xorg/media-libs/mesa/mesa-6.5-r4.ebuild348
-rw-r--r--hardened/xorg/media-libs/mesa/mesa-6.5.2-r1.ebuild4
5 files changed, 18 insertions, 373 deletions
diff --git a/hardened/xorg/media-libs/mesa/Manifest b/hardened/xorg/media-libs/mesa/Manifest
index 9a46b02..14fb0cb 100644
--- a/hardened/xorg/media-libs/mesa/Manifest
+++ b/hardened/xorg/media-libs/mesa/Manifest
@@ -61,14 +61,10 @@ SHA256 e28519d7ae719bc106f7d4239799580474d1b69a2254ede3b2179a5e50655fe5 files/li
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.tar.bz2 3062363 RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd SHA1 a77368901b0731b662d0858aef2c405a7ddf6014 SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd
-EBUILD mesa-6.5-r3.ebuild 9167 RMD160 3010292963dd1e31748a4c6325dbeb2466a5836c SHA1 3290c59465fb57ac64e9f16276365e9d6811d564 SHA256 153bdcbb30c822e817e8b6722918117f238cade73a3e69a66d4dbd3ce8a013f4
-MD5 322719f46e0956b212398bb467c1aea5 mesa-6.5-r3.ebuild 9167
-RMD160 3010292963dd1e31748a4c6325dbeb2466a5836c mesa-6.5-r3.ebuild 9167
-SHA256 153bdcbb30c822e817e8b6722918117f238cade73a3e69a66d4dbd3ce8a013f4 mesa-6.5-r3.ebuild 9167
-EBUILD mesa-6.5-r4.ebuild 9264 RMD160 86c8699d8bacc4c1daf21f2c876b827cc15890ad SHA1 47549e33940d2e465bcce8c17d71f445b1216209 SHA256 b8933685afa32b41155a76de7a236a3589f6c2a4e7a9415efe324eeba0f56641
-MD5 39eda827e978c4a0212ea38ca2a86c8f mesa-6.5-r4.ebuild 9264
-RMD160 86c8699d8bacc4c1daf21f2c876b827cc15890ad mesa-6.5-r4.ebuild 9264
-SHA256 b8933685afa32b41155a76de7a236a3589f6c2a4e7a9415efe324eeba0f56641 mesa-6.5-r4.ebuild 9264
+EBUILD mesa-6.5-r3.ebuild 9269 RMD160 de1e779dff0cd3a337fdfc23b9322f30a176fe1a SHA1 39e58a48c2acb122c10d1a8b9dd24c5c721b4e7e SHA256 938cc124eefbf36a56d7c2ed588579ee76b4559098aec3c474f3588447d9bbdb
+MD5 9a27fc4a2e8715622c710c338fbdd060 mesa-6.5-r3.ebuild 9269
+RMD160 de1e779dff0cd3a337fdfc23b9322f30a176fe1a mesa-6.5-r3.ebuild 9269
+SHA256 938cc124eefbf36a56d7c2ed588579ee76b4559098aec3c474f3588447d9bbdb mesa-6.5-r3.ebuild 9269
EBUILD mesa-6.5.1-r1.ebuild 8566 RMD160 bb69d2b35da1e262f5c0d31266967ed588cbc152 SHA1 0e16c52af81e06c88779365e408a03b0fd1ce986 SHA256 dd893e8470d2a422795bac8cdb874d7c38952257208a5820b5e03087d1ae141f
MD5 227f3897206468e4f0cb6778c5036329 mesa-6.5.1-r1.ebuild 8566
RMD160 bb69d2b35da1e262f5c0d31266967ed588cbc152 mesa-6.5.1-r1.ebuild 8566
@@ -77,10 +73,10 @@ EBUILD mesa-6.5.1-r4.ebuild 9325 RMD160 4c47b730c5da06d578270e8c8a506bcd183a5a63
MD5 402ba128e34a3566d6d058ad2eda0939 mesa-6.5.1-r4.ebuild 9325
RMD160 4c47b730c5da06d578270e8c8a506bcd183a5a63 mesa-6.5.1-r4.ebuild 9325
SHA256 8f492fd251ae5948a6a4627f2146288d337c853bdeb63161192d48aebc31140b mesa-6.5.1-r4.ebuild 9325
-EBUILD mesa-6.5.2-r1.ebuild 9037 RMD160 04e8cee181fd7d1a214a1c27ce230162fc9f54de SHA1 f4d7e712c067d80866ae92abb338906f52a3999d SHA256 b41f677eb85895ee3c3213198847494b30a23587172e54cf2ffc42f68099c808
-MD5 636e643ca07ca8670167a71063c897e9 mesa-6.5.2-r1.ebuild 9037
-RMD160 04e8cee181fd7d1a214a1c27ce230162fc9f54de mesa-6.5.2-r1.ebuild 9037
-SHA256 b41f677eb85895ee3c3213198847494b30a23587172e54cf2ffc42f68099c808 mesa-6.5.2-r1.ebuild 9037
+EBUILD mesa-6.5.2-r1.ebuild 9026 RMD160 b8baa7c3ad5e79ef67f63cc941647d0c17fef1ad SHA1 d982c427b4cd73657f596ce6de442d895de1b999 SHA256 d58e3103876739ece0c35c9cdea7f3a8aaf209b43456ebefe98e3540fcfbf09d
+MD5 339646fe6b9f4df2e8829469d7c1df13 mesa-6.5.2-r1.ebuild 9026
+RMD160 b8baa7c3ad5e79ef67f63cc941647d0c17fef1ad mesa-6.5.2-r1.ebuild 9026
+SHA256 d58e3103876739ece0c35c9cdea7f3a8aaf209b43456ebefe98e3540fcfbf09d mesa-6.5.2-r1.ebuild 9026
EBUILD mesa-6.5.2.ebuild 8985 RMD160 c08e39f10a72027722071a9fa6caf37cebc312a0 SHA1 792fd696d6254ce8e4b0c3b1e29317ec0554bb02 SHA256 8724b3d005228dcdfdfc05c799272a16bb73c310af895eede7caab693f3b8ef6
MD5 430f13380cc4d0fbb3b2bda923fd0a4d mesa-6.5.2.ebuild 8985
RMD160 c08e39f10a72027722071a9fa6caf37cebc312a0 mesa-6.5.2.ebuild 8985
@@ -92,9 +88,6 @@ SHA256 8aaef3acbc0dca54146e87953c739b0d04cc8a8452954d32ef9f64addabe2286 TODO 206
MD5 80bc8bfb6472d4dcbad6e14a2595c1a9 files/digest-mesa-6.5-r3 241
RMD160 069ddf1320b547a5a5cf1af3d0611a6c35398c7e files/digest-mesa-6.5-r3 241
SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/digest-mesa-6.5-r3 241
-MD5 80bc8bfb6472d4dcbad6e14a2595c1a9 files/digest-mesa-6.5-r4 241
-RMD160 069ddf1320b547a5a5cf1af3d0611a6c35398c7e files/digest-mesa-6.5-r4 241
-SHA256 5a5ab578d50f251808ddf18cd61f6e5518224168555fc288725a8466892b4f88 files/digest-mesa-6.5-r4 241
MD5 c5825b910eaf2092a073b33f7db2d640 files/digest-mesa-6.5.1-r1 247
RMD160 7e176dbe4570a0c74add11e3166b2596361d14f6 files/digest-mesa-6.5.1-r1 247
SHA256 fcc814f186f772d396d230867bc9eeeaa1f1f348f6b53aa1bbcf23ff73ccde8f files/digest-mesa-6.5.1-r1 247
diff --git a/hardened/xorg/media-libs/mesa/files/digest-mesa-6.5-r4 b/hardened/xorg/media-libs/mesa/files/digest-mesa-6.5-r4
deleted file mode 100644
index 79639c7..0000000
--- a/hardened/xorg/media-libs/mesa/files/digest-mesa-6.5-r4
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 61beda590bfc5b4a12e979d5f2d70d7a MesaLib-6.5.tar.bz2 3062363
-RMD160 6006bfdfed8a2425059c31ee699b5aca4d5f57cd MesaLib-6.5.tar.bz2 3062363
-SHA256 dcacf4c18af89b57e66dc7ba39e24c3b74ff6f83b8745bcc1390170a4190eebd MesaLib-6.5.tar.bz2 3062363
diff --git a/hardened/xorg/media-libs/mesa/mesa-6.5-r3.ebuild b/hardened/xorg/media-libs/mesa/mesa-6.5-r3.ebuild
index 0461db4..f0eddbe 100644
--- a/hardened/xorg/media-libs/mesa/mesa-6.5-r3.ebuild
+++ b/hardened/xorg/media-libs/mesa/mesa-6.5-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild,v 1.13 2006/10/11 02:26:49 dberkholz Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5-r3.ebuild,v 1.14 2007/04/07 04:56:07 vapier Exp $
inherit eutils toolchain-funcs multilib flag-o-matic portability
@@ -36,7 +36,7 @@ IUSE="${IUSE_VIDEO_CARDS}
motif
nptl"
-RESTRICT="stricter"
+#RESTRICT="stricter"
RDEPEND="dev-libs/expat
x11-libs/libX11
x11-libs/libXext
@@ -99,6 +99,9 @@ src_unpack() {
epatch ${FILESDIR}/change-default-dri-driver-dir-X7.1.patch
epatch ${FILESDIR}/6.4-multilib-fix.patch
epatch ${FILESDIR}/6.5-re-order-context-destruction.patch
+ epatch ${FILESDIR}/6.5-fix-radeon-PCIE.patch
+ epatch ${FILESDIR}/6.5-pic-textrel-fix.patch
+
# Don't compile debug code with USE=-debug - bug #125004
if ! use debug; then
@@ -246,10 +249,10 @@ src_install() {
# anywhere.
dodir /usr/$(get_libdir)/dri
exeinto /usr/$(get_libdir)/dri
- ebegin "Installing drivers to ${EXEDESTTREE}"
+ ebegin "Installing drivers to /usr/$(get_libdir)/dri"
DRI_SO=$(find ${S}/lib* -name '*_dri.so')
doexe ${DRI_SO}
- eend
+ eend $?
if ! use motif; then
rm ${D}/usr/include/GL/GLwMDrawA.h
diff --git a/hardened/xorg/media-libs/mesa/mesa-6.5-r4.ebuild b/hardened/xorg/media-libs/mesa/mesa-6.5-r4.ebuild
deleted file mode 100644
index e693004..0000000
--- a/hardened/xorg/media-libs/mesa/mesa-6.5-r4.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# 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-r4.ebuild,v 1.2 2006/08/25 20:53:37 hanno 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"
-
-#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.1
- x11-libs/libICE
- app-admin/eselect-opengl
- motif? ( virtual/motif )
- doc? ( app-doc/opengl-manpages )
- !<=x11-base/xorg-x11-6.9"
-DEPEND="${RDEPEND}
- x11-misc/makedepend
- x11-proto/inputproto
- x11-proto/xextproto
- !hppa? ( x11-proto/xf86driproto )
- x11-proto/xf86vidmodeproto
- >=x11-proto/glproto-1.4.4
- 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 [[ ${KERNEL} == "FreeBSD" ]]; then
- CONFIG="freebsd"
- 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}
-
- epatch ${FILESDIR}/6.4-dont-install-gles-headers.patch
- epatch ${FILESDIR}/change-default-dri-driver-dir-X7.1.patch
- epatch ${FILESDIR}/6.4-multilib-fix.patch
- epatch ${FILESDIR}/6.5-re-order-context-destruction.patch
- epatch ${FILESDIR}/6.5-fix-radeon-PCIE.patch
- epatch ${FILESDIR}/6.5-pic-textrel-fix.patch
-
- # 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 default dri drivers directory
- echo "DEFINES += -DDEFAULT_DRIVER_DIR='\"/usr/$(get_libdir)/dri\"'" >> ${HOSTCONF}
-
- # Do we want thread-local storage (TLS)?
- if use nptl; then
- echo "ARCH_FLAGS += -DGLX_USE_TLS" >> ${HOSTCONF}
- fi
-
- # Configurable DRI drivers
- if use video_cards_i810; then
- add_drivers i810 i915
- 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
-
- # Defaults based on X.Org 6.9, with some changes
- if [[ ! -n "${VIDEO_CARDS}" ]]; then
- if use alpha; then
- add_drivers mga tdfx r128 r200 r300 radeon
- elif use amd64; then
- add_drivers i915 mga r128 r200 r300 radeon tdfx
- elif use arm; then
- add_drivers mga r128 r200 r300 radeon
- elif use hppa; then
- # no accelerated 3D on hppa
- true
- elif use ia64; then
- add_drivers mach64 mga r128 r200 r300 radeon tdfx unichrome
- elif use mips; then
- # no accelerated 3D on mips
- true
- elif use ppc; then
- add_drivers mach64 mga r128 r200 r300 radeon tdfx
- elif use ppc64; then
- add_drivers mga r128 r200 r300 radeon
- elif use sparc; then
- add_drivers ffb mach64
- elif use x86; then
- add_drivers i810 i915 mach64 mga r128 r200 r300 radeon s3v savage \
- sis tdfx trident unichrome
- fi
- 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
-
- # 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
-}
-
-src_compile() {
- emake -j1 ${CONFIG} || die "Build failed"
-}
-
-src_install() {
- dodir /usr
- make \
- DESTDIR=${D}/usr \
- INCLUDE_DIR=${D}/usr/include \
- LIB_DIR=${D}/usr/$(get_libdir) \
- install || die "Installation failed"
-
- ##
- # Install the actual drivers --- 'make install' doesn't install them
- # anywhere.
- dodir /usr/$(get_libdir)/dri
- exeinto /usr/$(get_libdir)/dri
- ebegin "Installing drivers to ${EXEDESTTREE}"
- DRI_SO=$(find ${S}/lib* -name '*_dri.so')
- doexe ${DRI_SO}
- eend
-
- 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.060500 /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} $@"
-}
diff --git a/hardened/xorg/media-libs/mesa/mesa-6.5.2-r1.ebuild b/hardened/xorg/media-libs/mesa/mesa-6.5.2-r1.ebuild
index 9042794..4a75254 100644
--- a/hardened/xorg/media-libs/mesa/mesa-6.5.2-r1.ebuild
+++ b/hardened/xorg/media-libs/mesa/mesa-6.5.2-r1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2007 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-r1.ebuild,v 1.1 2007/02/19 22:21:17 joshuabaergen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-6.5.2-r1.ebuild,v 1.4 2007/04/29 05:59:04 ticho Exp $
inherit eutils toolchain-funcs multilib flag-o-matic portability
@@ -14,7 +14,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~mips ~ppc ppc64 ~sh ~sparc x86 ~x86-fbsd"
IUSE_VIDEO_CARDS="
video_cards_i810
video_cards_mach64