diff options
| -rw-r--r-- | media-libs/mesa/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/mesa/Manifest | 4 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-7.3-r1.ebuild | 282 |
3 files changed, 291 insertions, 2 deletions
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog index bf472971a03d..cfe004aff3d6 100644 --- a/media-libs/mesa/ChangeLog +++ b/media-libs/mesa/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/mesa # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.192 2009/02/03 15:56:57 remi Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.193 2009/03/07 13:35:22 remi Exp $ + +*mesa-7.3-r1 (07 Mar 2009) + + 07 Mar 2009; Rémi Cardona <remi@gentoo.org> +mesa-7.3-r1.ebuild: + add 60+ patches from the 7.4 branch 03 Feb 2009; Rémi Cardona <remi@gentoo.org> mesa-7.3.ebuild: only pull in the git eclass when PV==9999, fixes bug #257461 diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index a05da82cdbcc..c8e872a61eba 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -8,12 +8,14 @@ DIST MesaLib-7.1.tar.bz2 3338885 RMD160 e03960762a35eeb56755105fda5ba1b580c7dacc DIST MesaLib-7.2-rc1.tar.gz 4369849 RMD160 3ac078dc0cb0335f3b1405edc0ab1fb8101c4601 SHA1 df1facac6d677729bac9bfa47a5e8adbd756853c SHA256 dd2935c5b8a632108d7253f336a3b2c5e266ca2ef4f98a33a1eb8ba42f429ff3 DIST MesaLib-7.2.tar.bz2 3341919 RMD160 1e7c2cc6aa27ebaf7e726ac2086c10a5155d0832 SHA1 a6dce814cc56a562890ab79cf4e205f62459a29c SHA256 a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 DIST MesaLib-7.3.tar.bz2 3368281 RMD160 ee0b06d375d1ea91dc26ae96c807918e1d3cb7c8 SHA1 24e6278a95f5913c6a6230ab50c32c5cb13b84dc SHA256 64e6e2ea556c44af7eaeea083a514a23e4f896b7856da4f006125ffc30c4379b +DIST mesa-7.3-gentoo-patches-01.tar.bz2 34342 RMD160 547e3d1e8a72cd7df13bf699c181a5f8d36bff33 SHA1 51310d802ad1ee8b660fc7cf77c37b5478f3794a SHA256 e3d27046f73b6fc3d89e06fdfce9d065fa79705f59950b65350fa55bd539e56a EBUILD mesa-6.5.2-r1.ebuild 9095 RMD160 1fa3608b454b5d54d33d538329ed7d23670a1773 SHA1 3718811497844756f136f1f4b8e8ae1da0727212 SHA256 affc70f27691d575aef42c7f9f0a89d8abd75497bcaf324cb53ad56cfd5fcdb7 EBUILD mesa-7.0.3.ebuild 10140 RMD160 14b25168416b1f61b1e67d70d1e55ef8f34ede10 SHA1 217cd7beca39d30c9701db48629703307417d9de SHA256 7f52a916190562886251df4bfa7b0c98c8e93b431ff5b9ace3cf2beff9df10de EBUILD mesa-7.1.ebuild 7237 RMD160 9cf2b1f7023071ef801019c3a08334b01668bf8d SHA1 676cf950fdf14f456a97ec31d9786b4d5be8dba0 SHA256 4ec3a9067bf52019442d6bd42649fb3f7be0ab1a93cabee9515e2a076cd1b370 EBUILD mesa-7.1_rc3.ebuild 7494 RMD160 f78b4ef8e8781e7e7012350ecea1a0c048c5e7e8 SHA1 7e8183500e2bfd3617ce4e6c8d3b52577d72c3de SHA256 a481646904644e43a29de1a2af08f0772479412c72fb92c99edf037a385e9003 EBUILD mesa-7.2.ebuild 7176 RMD160 b386204b4fccc206356c1b926e000f8f5c42925d SHA1 5734c06cd36e31611876349c06f0227e43cdc5a9 SHA256 4e40d7ded71ace962a90fc886b1ecb8d85f39fe21c036dbb69564aba1f5d4b81 EBUILD mesa-7.2_rc1.ebuild 7132 RMD160 a7b92fcc0153b2a6fc3fa8283a8525fad5ea110a SHA1 3e19f3c937d14c792317cbce4ca4e0be96678be6 SHA256 71e7a8a8229ef6a137fe85f3d18febb27fb9e6d5b845816448daa9669291a5ad +EBUILD mesa-7.3-r1.ebuild 7235 RMD160 cbcdd697453956feeee05d0e20a3e0c5c902bda2 SHA1 46cce504f3a6bd4c1c25f4900bd214ba3f1151fb SHA256 96e9afd3f866811b658f9cb462dcc5116b1a35e2dda15808373d1a11ddcbc42e EBUILD mesa-7.3.ebuild 7071 RMD160 729bc0b3a28af45585928c83317c43ed8902c4c1 SHA1 f0ea190b3b0096cca8963ddae533622c18c25797 SHA256 efa93e8b8ac824322ddd00f54dc498c247ab744da6b0be76161a6b49f89da600 -MISC ChangeLog 35889 RMD160 c1cad0e9917f47a7fe76e71bfff63315be2b5963 SHA1 5d2f8de1b0bdcaadec29627fea8167b51cb273b2 SHA256 40c4780d6700995592db779846049086d7090fa5511065c15326ba01ec3def4e +MISC ChangeLog 36024 RMD160 b8f68340e7a67106c4f978d79345e1d69c17fb73 SHA1 0b552958aec1f847ab274d051d8690dc309f266c SHA256 81fab1cbb1e0f93d14cdeef97e5690b8b8477350ae0a3c3c485a171501738f1c MISC metadata.xml 251 RMD160 e6e718c1f8c8ab33331fcdc2ed16dc7da35d04aa SHA1 a753e5190a6008a77db021b70d5962cbc2e9e488 SHA256 689bc8ac5839e4eb6173899024bf1f6169a5d3f3a1e82e4cdd80011e3e43a8de diff --git a/media-libs/mesa/mesa-7.3-r1.ebuild b/media-libs/mesa/mesa-7.3-r1.ebuild new file mode 100644 index 000000000000..46a18fab189b --- /dev/null +++ b/media-libs/mesa/mesa-7.3-r1.ebuild @@ -0,0 +1,282 @@ +# Copyright 1999-2009 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.3-r1.ebuild,v 1.1 2009/03/07 13:35:22 remi Exp $ + +GIT=$([[ ${PV} = 9999* ]] && echo "git") +EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" + +inherit autotools multilib flag-o-matic ${GIT} 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/" +if [[ $PV = *_rc* ]]; then + SRC_URI="http://www.mesa3d.org/beta/${MY_SRC_P}.tar.gz" +elif [[ $PV = 9999 ]]; then + SRC_URI="" +else + SRC_URI="mirror://sourceforge/mesa3d/${MY_SRC_P}.tar.bz2 + mirror://gentoo/${P}-gentoo-patches-01.tar.bz2" +fi +LICENSE="LGPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE_VIDEO_CARDS=" + video_cards_intel + 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 + pic + motif + nptl + xcb + kernel_FreeBSD" + +RDEPEND="app-admin/eselect-opengl + dev-libs/expat + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXxf86vm + x11-libs/libXi + x11-libs/libXmu + x11-libs/libXdamage + >=x11-libs/libdrm-2.4.3 + x11-libs/libICE + motif? ( x11-libs/openmotif ) + doc? ( app-doc/opengl-manpages ) + !<=x11-base/xorg-x11-6.9" +DEPEND="${RDEPEND} + !<=x11-proto/xf86driproto-2.0.3 + dev-util/pkgconfig + x11-misc/makedepend + x11-proto/inputproto + x11-proto/xextproto + !hppa? ( x11-proto/xf86driproto ) + >=x11-proto/dri2proto-1.99.3 + 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 + +pkg_setup() { + if use xcb; then + if ! built_with_use x11-libs/libX11 xcb; then + msg="You must build libX11 with xcb enabled." + eerror ${msg} + die ${msg} + fi + fi + + if use debug; then + append-flags -g + fi + + # 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() { + if [[ $PV = 9999 ]]; then + git_src_unpack + else + unpack ${A} + fi + cd "${S}" + + [[ $PV = 9999 ]] || \ + EPATCH_FORCE="yes" EPATCH_SOURCE="${WORKDIR}/patches" \ + EPATCH_SUFFIX="patch" epatch + + # FreeBSD 6.* doesn't have posix_memalign(). + [[ ${CHOST} == *-freebsd6.* ]] && sed -i -e "s/-DHAVE_POSIX_MEMALIGN//" configure.ac + + # 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 + + eautoreconf +} + +src_compile() { + local myconf + + # This is where we might later change to build xlib/osmesa + myconf="${myconf} --with-driver=dri" + + # Do we want thread-local storage (TLS)? + myconf="${myconf} $(use_enable nptl glx-tls)" + + # 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 + driver_enable video_cards_radeon radeon r200 r300 + driver_enable video_cards_s3virge s3v + 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_trident trident + driver_enable video_cards_via unichrome + + # Set drivers to everything on which we ran driver_enable() + myconf="${myconf} --with-dri-drivers=${DRI_DRIVERS}" + + # Deactivate assembly code for pic build + myconf="${myconf} $(use_enable pic asm)" + + # Sparc assembly code is not working + myconf="${myconf} $(use_enable sparc asm)" + + myconf="${myconf} --disable-glut" + + myconf="${myconf} --without-demos" + + myconf="${myconf} $(use_enable xcb)" + + # Get rid of glut includes + rm -f "${S}"/include/GL/glut*h + + myconf="${myconf} $(use_enable motif glw)" + + econf ${myconf} || die + emake || die +} + +src_install() { + dodir /usr + emake \ + DESTDIR="${D}" \ + install || die "Installation failed" + + if ! use motif; then + rm "${D}"/usr/include/GL/GLwMDrawA.h + fi + + # Don't install private headers + rm -f "${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 + + # 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} +} + +# $1 - VIDEO_CARDS flag +# other args - names of DRI drivers to enable +driver_enable() { + case $# in + # for enabling unconditionally + 1) + DRI_DRIVERS="${DRI_DRIVERS},$1" + ;; + *) + if use $1; then + shift + for i in $@; do + DRI_DRIVERS="${DRI_DRIVERS},${i}" + done + fi + ;; + esac +} |