diff options
author | Tomas Chvatal <scarabeus@gentoo.org> | 2010-03-16 15:27:10 +0000 |
---|---|---|
committer | Tomas Chvatal <scarabeus@gentoo.org> | 2010-03-16 15:27:10 +0000 |
commit | c75c6cf308502d14955e4968c900dcb21fab969a (patch) | |
tree | be51f51bfe991180e29e4cc0463bb355b4979cad /media-libs | |
parent | Fix gid/uid mistake in fcrontab. Thanks to Moshe Kamenksy in bug #309325. (diff) | |
download | gentoo-2-c75c6cf308502d14955e4968c900dcb21fab969a.tar.gz gentoo-2-c75c6cf308502d14955e4968c900dcb21fab969a.tar.bz2 gentoo-2-c75c6cf308502d14955e4968c900dcb21fab969a.zip |
Version bump to latest RC's.
(Portage version: 2.2_rc65/cvs/Linux x86_64)
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/mesa/ChangeLog | 9 | ||||
-rw-r--r-- | media-libs/mesa/mesa-7.7.1_rc1.ebuild | 221 | ||||
-rw-r--r-- | media-libs/mesa/mesa-7.8_rc1.ebuild | 224 |
3 files changed, 453 insertions, 1 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index 813c9c381b0f..f607056cc85b 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/mesa # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.260 2010/01/23 18:28:50 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.261 2010/03/16 15:27:10 scarabeus Exp $ + +*mesa-7.8_rc1 (16 Mar 2010) +*mesa-7.7.1_rc1 (16 Mar 2010) + + 16 Mar 2010; Tomáš Chvátal <scarabeus@gentoo.org> + +mesa-7.7.1_rc1.ebuild, +mesa-7.8_rc1.ebuild: + Version bump to latest RC's. 23 Jan 2010; Tomáš Chvátal <scarabeus@gentoo.org> -mesa-7.5.1.ebuild: rm diff --git a/media-libs/mesa/mesa-7.7.1_rc1.ebuild b/media-libs/mesa/mesa-7.7.1_rc1.ebuild new file mode 100644 index 000000000000..d5f073d5846a --- /dev/null +++ b/media-libs/mesa/mesa-7.7.1_rc1.ebuild @@ -0,0 +1,221 @@ +# 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_rc1.ebuild,v 1.1 2010/03/16 15:27:10 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/${MAJOR_MINOR}/RC/${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=" + !<x11-base/xorg-server-1.7 + !<=x11-proto/xf86driproto-2.0.3 + >=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 + + 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_rc1.ebuild b/media-libs/mesa/mesa-7.8_rc1.ebuild new file mode 100644 index 000000000000..c4bf1af84e29 --- /dev/null +++ b/media-libs/mesa/mesa-7.8_rc1.ebuild @@ -0,0 +1,224 @@ +# 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_rc1.ebuild,v 1.1 2010/03/16 15:27:10 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 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/${MAJOR_MINOR}/RC/${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=" + !<x11-base/xorg-server-1.7 + !<=x11-proto/xf86driproto-2.0.3 + >=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-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 + + 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: 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 +} |