From: Nick Bowler Date: Sat, 4 Dec 2010 20:25:27 +0000 (-0500) Subject: mesa: Remove ebuilds. X-Git-Url: https://git.draconx.ca/gitweb/gentoo-draconx.git/commitdiff_plain/af86ecbd63794370b15f07dd23eae05e19823fea mesa: Remove ebuilds. 7.9 is in the tree now. --- diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest deleted file mode 100644 index ac5daf8..0000000 --- a/media-libs/mesa/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX 0001-i965-Fix-the-response-len-of-masked-sampler-messages.patch 2137 RMD160 08118ad35fec06fa5aeb7ca828cf763178158fb5 SHA1 40f5a8767d87244880544a26c6b1cdbd02edef22 SHA256 7a9ab83d98fced49ae2668b7e1f9a01a3a865246e0599bba61a4288af5e92773 -AUX unfuck-mesa-78.patch 507 RMD160 6029da8fb23561fae9caeed320d3692649a94168 SHA1 47db42b1cab0a87349a91e7fcf28cefe04f6da3c SHA256 2c537e36af2ac8877266bede05c3a108a60b4864d4e067c1828e6e606864c0e3 -DIST MesaLib-7.7.1.tar.bz2 4990250 RMD160 2f0dcc017aa97c364538a9fd29d5cdb247ab7880 SHA1 31500d7e3e3bbf9288b3bee4fbddd26a5e0b7782 SHA256 dc44f73e50d2ccdb96e7b72cc71e56024c198a228112c69c5e86dbc610fd4e84 -DIST MesaLib-7.8.1.tar.bz2 5137426 RMD160 b7b989342dc80a2a12456c17882e652db7bd86cd SHA1 1c15c62f845ef9b648366aa804410f68f7f79172 SHA256 b0b46e5abfd75db44501e308125fa92bcf1c91d91e97a043a3b1764cfa0907fa -EBUILD mesa-7.7.1.ebuild 6042 RMD160 1a975d055edfae21b0deb19a06a09c1fbc3f4299 SHA1 b6c204b0d760184d9028fe3adc6d86e91d71ed48 SHA256 84deea5a48d4c11981523fe8d2e63defc33b1cfe6ee81d5b447074d4797fc0ca -EBUILD mesa-7.8.1.ebuild 5991 RMD160 cf9d70a3b9b5e9aacf8f9d2c669582f9312f8219 SHA1 d724dd115204cc302a3a6763e834df116fd58504 SHA256 1160432d9f7948bb35a4e3cd7d11dcd99564ae7ca62ed300a821168f1e5f7816 diff --git a/media-libs/mesa/files/0001-i965-Fix-the-response-len-of-masked-sampler-messages.patch b/media-libs/mesa/files/0001-i965-Fix-the-response-len-of-masked-sampler-messages.patch deleted file mode 100644 index 5aa9da2..0000000 --- a/media-libs/mesa/files/0001-i965-Fix-the-response-len-of-masked-sampler-messages.patch +++ /dev/null @@ -1,64 +0,0 @@ -From 7ee4db50b10ab2d8fdfc4781f26b84041cf568d7 Mon Sep 17 00:00:00 2001 -From: Eric Anholt -Date: Wed, 10 Mar 2010 10:38:20 -0800 -Subject: [PATCH] i965: Fix the response len of masked sampler messages for 8-wide dispatch. - -The bad response length would hang the GPU with a masked sample in a -shader using control flow. For 8-wide, the response length is always -4, and masked slots are just not written to. brw_wm_glsl.c already -allocates registers in the right locations. - -Fixes piglit glsl-fs-bug25902 (fd.o bug #25902). -(cherry picked from commit f6d210c284751ac50a8d6358de7e75a1ff1e4ac7) -(cherry picked from commit dc8c0359448cdae7b367552ba58783c04b199778) ---- - src/mesa/drivers/dri/i965/brw_eu_emit.c | 18 +++++++++++++++--- - 1 files changed, 15 insertions(+), 3 deletions(-) - -diff --git a/src/mesa/drivers/dri/i965/brw_eu_emit.c b/src/mesa/drivers/dri/i965/brw_eu_emit.c -index f69d529..82f2fda 100644 ---- a/src/mesa/drivers/dri/i965/brw_eu_emit.c -+++ b/src/mesa/drivers/dri/i965/brw_eu_emit.c -@@ -1290,7 +1290,7 @@ void brw_SAMPLE(struct brw_compile *p, - GLuint simd_mode) - { - GLboolean need_stall = 0; -- -+ - if (writemask == 0) { - /*printf("%s: zero writemask??\n", __FUNCTION__); */ - return; -@@ -1327,8 +1327,14 @@ void brw_SAMPLE(struct brw_compile *p, - /* printf("need stall %x %x\n", newmask , writemask); */ - } - else { -+ GLboolean dispatch_16 = GL_FALSE; -+ - struct brw_reg m1 = brw_message_reg(msg_reg_nr); -- -+ -+ guess_execution_size(p->current, dest); -+ if (p->current->header.execution_size == BRW_EXECUTE_16) -+ dispatch_16 = GL_TRUE; -+ - newmask = ~newmask & WRITEMASK_XYZW; - - brw_push_insn_state(p); -@@ -1343,7 +1349,13 @@ void brw_SAMPLE(struct brw_compile *p, - - src0 = retype(brw_null_reg(), BRW_REGISTER_TYPE_UW); - dest = offset(dest, dst_offset); -- response_length = len * 2; -+ -+ /* For 16-wide dispatch, masked channels are skipped in the -+ * response. For 8-wide, masked channels still take up slots, -+ * and are just not written to. -+ */ -+ if (dispatch_16) -+ response_length = len * 2; - } - } - --- -1.6.4.4 - diff --git a/media-libs/mesa/files/unfuck-mesa-78.patch b/media-libs/mesa/files/unfuck-mesa-78.patch deleted file mode 100644 index bd5043c..0000000 --- a/media-libs/mesa/files/unfuck-mesa-78.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c -index 3aed253..e92ab97 100644 ---- a/src/mesa/drivers/dri/intel/intel_screen.c -+++ b/src/mesa/drivers/dri/intel/intel_screen.c -@@ -126,7 +126,7 @@ intelDRI2Invalidate(__DRIdrawable *drawable) - static const struct __DRI2flushExtensionRec intelFlushExtension = { - { __DRI2_FLUSH, __DRI2_FLUSH_VERSION }, - intelDRI2Flush, -- intelDRI2Invalidate, -+ dri2InvalidateDrawable, - }; - - static __DRIimage * diff --git a/media-libs/mesa/mesa-7.7.1.ebuild b/media-libs/mesa/mesa-7.7.1.ebuild deleted file mode 100644 index cfe3edd..0000000 --- a/media-libs/mesa/mesa-7.7.1.ebuild +++ /dev/null @@ -1,223 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.7.1.ebuild,v 1.1 2010/03/29 14:57:56 scarabeus Exp $ - -EAPI="2" - -EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git" - EXPERIMENTAL="true" -fi - -inherit autotools multilib flag-o-matic ${GIT_ECLASS} portability versionator - -OPENGL_DIR="xorg-x11" - -MY_PN="${PN/m/M}" -MY_P="${MY_PN}-${PV/_/-}" -MAJOR_MINOR=$(get_version_component_range 1-2) -MY_SRC_P="${MY_PN}Lib-${PV/_/-}" -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="http://mesa3d.sourceforge.net/" - -#SRC_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2" -if [[ $PV = 9999* ]]; then - SRC_URI="${SRC_PATCHES}" -else - SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${PV}/${MY_SRC_P}.tar.bz2 - ${SRC_PATCHES}" -fi - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" - -VIDEO_CARDS="intel mach64 mga none nouveau r128 radeon radeonhd savage sis sunffb svga tdfx via" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - debug +gallium motif +nptl pic selinux +xcb kernel_FreeBSD" - -# keep correct libdrm and dri2proto dep -# keep blocks in rdepend for binpkg -RDEPEND=" - !=app-admin/eselect-opengl-1.1.1-r2 - dev-libs/expat - >=x11-libs/libdrm-2.4.17 - x11-libs/libICE - x11-libs/libX11[xcb?] - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXxf86vm - motif? ( x11-libs/openmotif ) -" -DEPEND="${RDEPEND} - dev-util/pkgconfig - x11-misc/makedepend - >=x11-proto/dri2proto-1.99.3 - >=x11-proto/glproto-1.4.8 - x11-proto/inputproto - >=x11-proto/xextproto-7.0.99.1 - x11-proto/xf86driproto - x11-proto/xf86vidmodeproto -" - -S="${WORKDIR}/${MY_P}" - -# Think about: ggi, svga, fbcon, no-X configs - -pkg_setup() { - # gcc 4.2 has buggy ivopts - if [[ $(gcc-version) = "4.2" ]]; then - append-flags -fno-ivopts - fi - - # recommended by upstream - append-flags -ffast-math -} - -src_unpack() { - [[ $PV = 9999* ]] && git_src_unpack || unpack ${A} -} - -src_prepare() { - # apply patches - if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/patches" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - # FreeBSD 6.* doesn't have posix_memalign(). - [[ ${CHOST} == *-freebsd6.* ]] && \ - sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac - - epatch "${FILESDIR}/0001-i965-Fix-the-response-len-of-masked-sampler-messages.patch" - - eautoreconf -} - -src_configure() { - local myconf r600 - - # Configurable DRI drivers - driver_enable swrast - driver_enable video_cards_intel i810 i915 i965 - driver_enable video_cards_mach64 mach64 - driver_enable video_cards_mga mga - driver_enable video_cards_r128 r128 - # ATI has two implementations as video_cards - driver_enable video_cards_radeon radeon r200 r300 r600 - driver_enable video_cards_radeonhd r300 r600 - driver_enable video_cards_savage savage - driver_enable video_cards_sis sis - driver_enable video_cards_sunffb ffb - driver_enable video_cards_tdfx tdfx - driver_enable video_cards_via unichrome - - myconf="${myconf} $(use_enable gallium)" - if use gallium; then - elog "You have enabled gallium infrastructure." - elog "This infrastructure currently support these drivers:" - elog " Intel: driver not really functional, thus disabled." - elog " Nouveau: only available implementation. Experimental Quality." - elog " Radeon: implementation up to the r500. Testing Quality." - elog " Svga: VMWare Virtual GPU driver. Hic sunt leones." - echo - myconf="${myconf} - --disable-gallium-intel - --with-state-trackers=glx,dri,egl - $(use_enable video_cards_svga gallium-svga) - $(use_enable video_cards_nouveau gallium-nouveau)" - #$(use_enable video_cards_intel gallium-intel)" - if use video_cards_radeon || use video_cards_radeonhd; then - myconf="${myconf} --enable-gallium-radeon" - else - myconf="${myconf} --disable-gallium-radeon" - fi - else - if use video_cards_nouveau || use video_cards_svga; then - elog "SVGA and nouveau drivers are available only via gallium interface." - elog "Enable gallium useflag if you insist to use them." - fi - fi - - # --with-driver=dri|xlib|osmesa || do we need osmesa? - econf \ - --disable-option-checking \ - --with-driver=dri \ - --disable-glut \ - --without-demos \ - $(use_enable debug) \ - $(use_enable motif glw) \ - $(use_enable motif) \ - $(use_enable nptl glx-tls) \ - $(use_enable xcb) \ - $(use_enable !pic asm) \ - --with-dri-drivers=${DRI_DRIVERS} \ - ${myconf} -} - -src_install() { - dodir /usr - emake DESTDIR="${D}" install || die "Installation failed" - - # Remove redundant headers - # GLUT thing - rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed." - # Glew includes - rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \ - || die "Removing glew includes failed." - - # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib - # because user can eselect desired GL provider. - 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.{la,a,so*}; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \ - || die "Failed to move ${x}" - fi - done - 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 \ - || die "Failed to move ${x}" - fi - done - eend $? -} - -pkg_postinst() { - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} -} - -# $1 - VIDEO_CARDS flag -# other args - names of DRI drivers to enable -driver_enable() { - case $# in - # for enabling unconditionally - 1) - DRI_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - DRI_DRIVERS+=",${i}" - done - fi - ;; - esac -} diff --git a/media-libs/mesa/mesa-7.8.1.ebuild b/media-libs/mesa/mesa-7.8.1.ebuild deleted file mode 100644 index 8f4d90d..0000000 --- a/media-libs/mesa/mesa-7.8.1.ebuild +++ /dev/null @@ -1,224 +0,0 @@ -# Copyright 1999-2010 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.8.1.ebuild,v 1.1 2010/04/06 08:43:11 scarabeus Exp $ - -EAPI=3 - -EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" - -if [[ ${PV} = 9999* ]]; then - GIT_ECLASS="git" - EXPERIMENTAL="true" -fi - -inherit autotools multilib flag-o-matic ${GIT_ECLASS} 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_PATCHES="mirror://gentoo/${P}-gentoo-patches-01.tar.bz2" -if [[ $PV = 9999* ]]; then - SRC_URI="${SRC_PATCHES}" -else - SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${PV}/${MY_SRC_P}.tar.bz2 - ${SRC_PATCHES}" -fi - -LICENSE="LGPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" - -VIDEO_CARDS="intel mach64 mga none nouveau r128 radeon radeonhd savage sis svga tdfx via" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - debug +gallium motif +nptl pic selinux +xcb kernel_FreeBSD" - -# keep correct libdrm and dri2proto dep -# keep blocks in rdepend for binpkg -RDEPEND=" - !=app-admin/eselect-opengl-1.1.1-r2 - dev-libs/expat - >=x11-libs/libdrm-2.4.19 - x11-libs/libICE - x11-libs/libX11[xcb?] - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXi - x11-libs/libXmu - x11-libs/libXxf86vm - motif? ( x11-libs/openmotif ) -" -DEPEND="${RDEPEND} - dev-util/pkgconfig - x11-misc/makedepend - >=x11-proto/dri2proto-2.2 - >=x11-proto/glproto-1.4.11 - x11-proto/inputproto - >=x11-proto/xextproto-7.0.99.1 - x11-proto/xf86driproto - x11-proto/xf86vidmodeproto -" - -S="${WORKDIR}/${MY_P}" - -# It is slow without texrels, if someone wants slow -# mesa without texrels +pic use is worth shot -QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*" -QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*" - -# Think about: ggi, svga, fbcon, no-X configs - -pkg_setup() { - # gcc 4.2 has buggy ivopts - if [[ $(gcc-version) = "4.2" ]]; then - append-flags -fno-ivopts - fi - - # recommended by upstream - append-flags -ffast-math -} - -src_unpack() { - [[ $PV = 9999* ]] && git_src_unpack || unpack ${A} -} - -src_prepare() { - # apply patches - if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then - EPATCH_FORCE="yes" \ - EPATCH_SOURCE="${WORKDIR}/patches" \ - EPATCH_SUFFIX="patch" \ - epatch - fi - # FreeBSD 6.* doesn't have posix_memalign(). - [[ ${CHOST} == *-freebsd6.* ]] && \ - sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac - - epatch "${FILESDIR}/unfuck-mesa-78.patch" - - eautoreconf -} - -src_configure() { - local myconf r600 - - # Configurable DRI drivers - driver_enable swrast - driver_enable video_cards_intel i810 i915 i965 - driver_enable video_cards_mach64 mach64 - driver_enable video_cards_mga mga - driver_enable video_cards_r128 r128 - # ATI has two implementations as video_cards - driver_enable video_cards_radeon radeon r200 r300 r600 - driver_enable video_cards_radeonhd r300 r600 - driver_enable video_cards_savage savage - driver_enable video_cards_sis sis - driver_enable video_cards_tdfx tdfx - driver_enable video_cards_via unichrome - - myconf="${myconf} $(use_enable gallium)" - if use gallium; then - elog "You have enabled gallium infrastructure." - elog "This infrastructure currently support these drivers:" - elog " Intel: works only i915." - elog " Nouveau: Support for nVidia NV30 and later cards." - elog " Radeon: Newest implementation of r300-r500 driver." - elog " Svga: VMWare Virtual GPU driver." - echo - myconf="${myconf} - --with-state-trackers=glx,dri,egl - $(use_enable video_cards_svga gallium-svga) - $(use_enable video_cards_nouveau gallium-nouveau) - $(use_enable video_cards_intel gallium-intel)" - if use video_cards_radeon || use video_cards_radeonhd; then - myconf="${myconf} --enable-gallium-radeon" - else - myconf="${myconf} --disable-gallium-radeon" - fi - else - if use video_cards_nouveau || use video_cards_svga; then - elog "SVGA and nouveau drivers are available only via gallium interface." - elog "Enable gallium useflag if you want to use them." - fi - fi - - # --with-driver=dri|xlib|osmesa || do we need osmesa? - econf \ - --disable-option-checking \ - --with-driver=dri \ - --disable-glut \ - --without-demos \ - $(use_enable debug) \ - $(use_enable motif glw) \ - $(use_enable motif) \ - $(use_enable nptl glx-tls) \ - $(use_enable xcb) \ - $(use_enable !pic asm) \ - --with-dri-drivers=${DRI_DRIVERS} \ - ${myconf} -} - -src_install() { - emake DESTDIR="${D}" install || die "Installation failed" - - # Remove redundant headers - # GLUT thing - rm -f "${D}"/usr/include/GL/glut*.h || die "Removing glut include failed." - # Glew includes - rm -f "${D}"/usr/include/GL/{glew,glxew,wglew}.h \ - || die "Removing glew includes failed." - - # Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib - # because user can eselect desired GL provider. - 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.{la,a,so*}; do - if [ -f ${x} -o -L ${x} ]; then - mv -f ${x} "${D}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \ - || die "Failed to move ${x}" - fi - done - 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 \ - || die "Failed to move ${x}" - fi - done - eend $? -} - -pkg_postinst() { - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} -} - -# $1 - VIDEO_CARDS flag -# other args - names of DRI drivers to enable -driver_enable() { - case $# in - # for enabling unconditionally - 1) - DRI_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - DRI_DRIVERS+=",${i}" - done - fi - ;; - esac -}