Version bump.
authorChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
Wed, 30 Nov 2011 01:11:02 +0000 (01:11 +0000)
committerChí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
Wed, 30 Nov 2011 01:11:02 +0000 (01:11 +0000)
Package-Manager: portage-2.2.0_alpha77/cvs/Linux x86_64

media-libs/mesa/ChangeLog
media-libs/mesa/Manifest
media-libs/mesa/mesa-7.11.2.ebuild [new file with mode: 0644]

index 7a458a62ac34d6835da4a980f9baf1ab0235096b..533d4036b98ea8300cb714000e7928ca0a4314df 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.371 2011/11/18 16:16:49 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.372 2011/11/30 01:11:02 chithanh Exp $
+
+*mesa-7.11.2 (30 Nov 2011)
+
+  30 Nov 2011; Chí-Thanh Christopher Nguyễn <chithanh@gentoo.org>
+  +mesa-7.11.2.ebuild:
+  Version bump.
 
 *mesa-7.11.1 (18 Nov 2011)
 
index 3d266d22a96851009d7cb9cfdb164045cdf22d15..5ccff906f989a7d1752beef2250d79f8ecf1d3fe 100644 (file)
@@ -5,6 +5,7 @@ AUX glx_ro_text_segm.patch 731 RMD160 6d2bd85591d6349fa45a5ee16c724859c640e902 S
 DIST MesaLib-7.10.2.tar.bz2 5863551 RMD160 4e5cfdf3b66f1b05d1aefd5267fe157e542f6ac2 SHA1 71bbb2686230f6334aa625a951b58b4b2d5d6aa0 SHA256 8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1
 DIST MesaLib-7.10.3.tar.bz2 6056837 RMD160 bd9800a0cf98560a4424742cac635b4c07a39647 SHA1 e1fe8bad90bb24cc4b25a42932c277a0e0d7a2ac SHA256 1e701fc839b872677ddca9ed8784d754c9da1fbeda98173980e06aa7df0e85c0
 DIST MesaLib-7.11.1.tar.bz2 6255382 RMD160 4d63a0485eaa26d61f08249b209245eed16b11bb SHA1 226ce14d3adf8fe5a6d98f785bb5f63d2a8656da SHA256 229a8b38502147fbbb99665ed9b892d194ebcb5f5875a1701a54acea94a9c8c9
+DIST MesaLib-7.11.2.tar.bz2 6257280 RMD160 656ded1db6c1f6fdd15a3f2cdee1b895d393bcea SHA1 5981ac2de8438e5f4a1f3561f2044d700c5f0de9 SHA256 57746aa8c60bc6f5596ec6c6c7274de40fa12edce5ec33fe899e704fa00b5357
 DIST MesaLib-7.11.tar.bz2 6559702 RMD160 1637654c0f8e9e581753057f439f41bfdf7d7638 SHA1 942358e42dcfaac966c643fe39375549c8638b68 SHA256 f8bf37a00882840a3e3d327576bc26a79ae7f4e18fe1f7d5f17a5b1c80dd7acf
 DIST MesaLib-7.9.2.tar.bz2 5648858 RMD160 d6665c1eb1035b9bebc743401355c39aaffcdf5c SHA1 973d27e49654b7bd1ed0d3c4c986d26d25ccabed SHA256 6b54c96ba0673c3f088bf9a56c2d64a6e54831a1065dedf0ac234d7cd5151253
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 RMD160 acc52b4f05b82a98e7994dc005699630270de360 SHA1 f38c616eeacbeebe597ed4bc98b84a41caa18108 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8
@@ -13,7 +14,8 @@ EBUILD mesa-7.10.2-r1.ebuild 9748 RMD160 e3ca8a49aa5d3daf45ef6d345b0bebb0a012c33
 EBUILD mesa-7.10.2.ebuild 9774 RMD160 b75a68b3d4caeef288b9a6cfb8263b48c78b7a52 SHA1 7a541614024109dab19977e2f235b0453c1f43c6 SHA256 42884b1fc5fb6680b495ae6410644409542038658f7ffe0cdb003792d433d796
 EBUILD mesa-7.10.3.ebuild 9769 RMD160 cbc97f2c5326c42f6b33170a8254cdf505509574 SHA1 8c90f700553861a8bd5a0248662e01de9cd8b431 SHA256 2e12b5c0a56aa5179170defe2d5d0b80941b27674bd5b753ecfe4ab9f9c4f033
 EBUILD mesa-7.11.1.ebuild 9974 RMD160 620ebe68da91032fe93d20a4fd573195fa6e0780 SHA1 6b32aef7116151954f692733b008431a9086b83c SHA256 f5f7bb5ce8c882195bc909b099a27d0b29915a24ba4db86172c4d09e4f1fe8e1
+EBUILD mesa-7.11.2.ebuild 9974 RMD160 b93cc80b09f6eda4032c02883c620baf9aa62eb2 SHA1 455258163b164d003d0a590bda721537ba781fb3 SHA256 f2637fce6e3b3087f559448db1c61e40de6f450dc753433b692d258cda9d333d
 EBUILD mesa-7.11.ebuild 9933 RMD160 2782ea92c7ddcb8f7ba3fac056bbb79e801ec2f6 SHA1 f7dd1ee93771534927750204605d9fcb0057ed80 SHA256 75e2423ea2a1852b55f87621ae965c9beb8c0a364981235755e2a53be4ca627f
 EBUILD mesa-7.9.2.ebuild 8916 RMD160 624eba5aca74c86386abd7ea66662b41bf4060df SHA1 9240ed7fba8bcf59169b8b6fa0800485d1a4f320 SHA256 2054a5b8158966ebd27faf79f405bbbe2c41d4b3d5f4144fb3653638ff79c047
-MISC ChangeLog 61183 RMD160 fca80721673b4c54d52b836371ac8174e3ace914 SHA1 79fbd1a85040b83c2c093ec4859b3d4dba4be7dc SHA256 1c15333e17bfec518bcd2ee17fcc4d03b809a1af9f08a06b5fef1d72ae10e903
+MISC ChangeLog 61320 RMD160 15e3f696b57011227ab90d098d87fbf0f53b415f SHA1 12ef71f9a965e8b494cce37f3a914036f7cae739 SHA256 9ab3a19db72060a520c07dcfdd3586a71ae7a7e9fc14f9ad3c2a295169328276
 MISC metadata.xml 1112 RMD160 ccbed5173730a7834b49d396e8c21c34fbd76815 SHA1 4924cab46899fad81f756e83aa9828e34dc0e9b0 SHA256 26b8ea75bc460bcf93526619701504bbe65c0ac9a0f448b561b3d11cee1bc126
diff --git a/media-libs/mesa/mesa-7.11.2.ebuild b/media-libs/mesa/mesa-7.11.2.ebuild
new file mode 100644 (file)
index 0000000..af4f84a
--- /dev/null
@@ -0,0 +1,369 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-7.11.2.ebuild,v 1.1 2011/11/30 01:11:02 chithanh Exp $
+
+EAPI=3
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+       GIT_ECLASS="git-2"
+       EXPERIMENTAL="true"
+fi
+
+inherit base autotools multilib flag-o-matic python toolchain-funcs ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV/_/-}"
+MY_SRC_P="${MY_PN}Lib-${PV/_/-}"
+
+FOLDER="${PV/_rc*/}"
+
+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/${FOLDER}/${MY_SRC_P}.tar.bz2
+               ${SRC_PATCHES}"
+fi
+
+LICENSE="MIT LGPL-3 SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+INTEL_CARDS="intel"
+RADEON_CARDS="radeon"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} mach64 mga nouveau r128 savage sis vmware tdfx via"
+for card in ${VIDEO_CARDS}; do
+       IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+       bindist +classic debug +egl +gallium gbm gles +llvm motif +nptl openvg osmesa pic pax_kernel selinux shared-dricore +shared-glapi kernel_FreeBSD"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.24"
+# not a runtime dependency of this package, but dependency of packages which
+# depend on this package, bug #342393
+EXTERNAL_DEPEND="
+       >=x11-proto/dri2proto-2.2
+       >=x11-proto/glproto-1.4.11
+"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="${EXTERNAL_DEPEND}
+       !<x11-base/xorg-server-1.7
+       !<=x11-proto/xf86driproto-2.0.3
+       classic? ( app-admin/eselect-mesa )
+       gallium? ( app-admin/eselect-mesa )
+       app-admin/eselect-opengl
+       dev-libs/expat
+       gbm? ( sys-fs/udev )
+       x11-libs/libICE
+       >=x11-libs/libX11-1.3.99.901
+       x11-libs/libXdamage
+       x11-libs/libXext
+       x11-libs/libXi
+       x11-libs/libXmu
+       x11-libs/libXxf86vm
+       motif? ( x11-libs/openmotif )
+       gallium? (
+               llvm? ( >=sys-devel/llvm-2.8 )
+       )
+       ${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+"
+for card in ${INTEL_CARDS}; do
+       RDEPEND="${RDEPEND}
+               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+       "
+done
+
+for card in ${RADEON_CARDS}; do
+       RDEPEND="${RDEPEND}
+               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+       "
+done
+
+DEPEND="${RDEPEND}
+       =dev-lang/python-2*
+       dev-libs/libxml2[python]
+       dev-util/pkgconfig
+       sys-devel/bison
+       sys-devel/flex
+       x11-misc/makedepend
+       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 the 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, 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
+       # workaround toc-issue wrt #386545
+       use ppc64 && append-flags -mminimal-toc
+
+       python_set_active_version 2
+       python_pkg_setup
+}
+
+src_unpack() {
+       default
+       [[ $PV = 9999* ]] && git-2_src_unpack
+}
+
+src_prepare() {
+       # apply patches
+       if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
+               EPATCH_FORCE="yes" \
+               EPATCH_SOURCE="${WORKDIR}/patches" \
+               EPATCH_SUFFIX="patch" \
+               epatch
+       fi
+       # fix for hardened pax_kernel, bug 240956
+       [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
+
+       # FreeBSD 6.* doesn't have posix_memalign().
+       if [[ ${CHOST} == *-freebsd6.* ]]; then
+               sed -i \
+                       -e "s/-DHAVE_POSIX_MEMALIGN//" \
+                       configure.ac || die
+       fi
+       # Solaris needs some recent POSIX stuff in our case
+       if [[ ${CHOST} == *-solaris* ]] ; then
+               sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
+               sed -i -e 's/uint/unsigned int/g' src/egl/drivers/glx/egl_glx.c || die
+       fi
+
+       # In order for mesa to complete it's build process we need to use a tool
+       # that it compiles. When we cross compile this clearly does not work
+       # so we require mesa to be built on the host system first. -solar
+       if tc-is-cross-compiler; then
+               sed -i -e "s#^GLSL_CL = .*\$#GLSL_CL = glsl_compiler#g" \
+                       "${S}"/src/mesa/shader/slang/library/Makefile || die
+       fi
+
+       base_src_prepare
+
+       eautoreconf
+}
+
+src_configure() {
+       local myconf
+
+       if use classic; then
+       # Configurable DRI drivers
+               driver_enable swrast
+               driver_enable video_cards_intel i810 i915 i965
+               driver_enable video_cards_nouveau nouveau
+               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 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
+       fi
+
+       myconf+="
+               $(use_enable !bindist texture-float)
+               $(use_enable gles gles1)
+               $(use_enable gles gles2)
+               $(use_enable egl)
+       "
+       if use egl; then
+               use shared-glapi || die "egl needs shared-glapi. Please either enable shared-glapi or disable the egl use flag ."
+               myconf+="
+                       --with-egl-platforms=x11$(use gbm && echo ",drm")
+                       $(use_enable gallium gallium-egl)
+               "
+       fi
+
+       if use !gallium && use !classic; then
+               ewarn "You enabled neither classic nor gallium USE flags. No hardware"
+               ewarn "drivers will be built."
+       fi
+       if use gallium; then
+               myconf+="
+                       --with-state-trackers=glx,dri$(use egl && echo ",egl")$(use openvg && echo ",vega")
+                       $(use_enable llvm gallium-llvm)
+                       $(use_enable openvg)
+               "
+               gallium_enable swrast
+               gallium_enable video_cards_vmware svga
+               gallium_enable video_cards_nouveau nouveau
+               gallium_enable video_cards_intel i915 i965
+               gallium_enable video_cards_radeon r300 r600
+       fi
+
+       # x86 hardened pax_kernel needs glx-rts, bug 240956
+       if use pax_kernel; then
+               myconf+="
+                       $(use_enable x86 glx-rts)
+               "
+       fi
+
+       # --with-driver=dri|xlib|osmesa || do we need osmesa?
+       econf \
+               --disable-option-checking \
+               --with-driver=dri \
+               --disable-glut \
+               --without-demos \
+               --enable-xcb \
+               $(use_enable debug) \
+               $(use_enable gbm) \
+               $(use_enable motif glw) \
+               $(use_enable motif) \
+               $(use_enable nptl glx-tls) \
+               $(use_enable osmesa) \
+               $(use_enable !pic asm) \
+               $(use_enable shared-dricore) \
+               $(use_enable shared-glapi) \
+               --with-dri-drivers=${DRI_DRIVERS} \
+               --with-gallium-drivers=${GALLIUM_DRIVERS} \
+               ${myconf}
+}
+
+src_install() {
+       base_src_install
+
+       # Save the glsl-compiler for later use
+       if ! tc-is-cross-compiler; then
+               dobin "${S}"/src/glsl/glsl_compiler || die
+       fi
+       # Remove redundant headers
+       # GLUT thing
+       rm -f "${ED}"/usr/include/GL/glut*.h || die "Removing glut include failed."
+       # Glew includes
+       rm -f "${ED}"/usr/include/GL/{glew,glxew,wglew}.h \
+               || die "Removing glew includes failed."
+
+       # Install config file for eselect mesa
+       insinto /usr/share/mesa
+       newins "${FILESDIR}/eselect-mesa.conf.7.11" eselect-mesa.conf || die
+
+       # 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 "${ED}"/usr/$(get_libdir)/libGL.{la,a,so*}; do
+                       if [ -f ${x} -o -L ${x} ]; then
+                               mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/lib \
+                                       || die "Failed to move ${x}"
+                       fi
+               done
+               for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+                       if [ -f ${x} -o -L ${x} ]; then
+                               mv -f "${x}" "${ED}"/usr/$(get_libdir)/opengl/${OPENGL_DIR}/include \
+                                       || die "Failed to move ${x}"
+                       fi
+               done
+       eend $?
+
+       if use classic || use gallium; then
+                       ebegin "Moving DRI/Gallium drivers for dynamic switching"
+                       local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+                       keepdir /usr/$(get_libdir)/dri
+                       dodir /usr/$(get_libdir)/mesa
+                       for x in ${gallium_drivers[@]}; do
+                               if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then
+                                       mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+                                               || die "Failed to move ${x}"
+                                       insinto "/usr/$(get_libdir)/dri/"
+                                       if [ -f "${S}/$(get_libdir)/${x}" ]; then
+                                               insopts -m0755
+                                               doins "${S}/$(get_libdir)/${x}" || die "failed to install ${x}"
+                                       fi
+                               fi
+                       done
+                       for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+                               if [ -f ${x} -o -L ${x} ]; then
+                                       mv -f "${x}" "${x/dri/mesa}" \
+                                               || die "Failed to move ${x}"
+                               fi
+                       done
+                       pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+                       ln -s ../mesa/*.so . || die "Creating symlink failed"
+                       # remove symlinks to drivers known to eselect
+                       for x in ${gallium_drivers[@]}; do
+                               if [ -f ${x} -o -L ${x} ]; then
+                                       rm "${x}" || die "Failed to remove ${x}"
+                               fi
+                       done
+                       popd
+               eend $?
+       fi
+}
+
+pkg_postinst() {
+       # Switch to the xorg implementation.
+       echo
+       eselect opengl set --use-old ${OPENGL_DIR}
+       # Select classic/gallium drivers
+       if use classic || use gallium; then
+               eselect mesa set --auto
+       fi
+
+       # warn about patent encumbered texture-float
+       if use !bindist; then
+               elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+               elog "enabled."
+       fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+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
+}
+
+gallium_enable() {
+       case $# in
+               # for enabling unconditionally
+               1)
+                       GALLIUM_DRIVERS+=",$1"
+                       ;;
+               *)
+                       if use $1; then
+                               shift
+                               for i in $@; do
+                                       GALLIUM_DRIVERS+=",${i}"
+                               done
+                       fi
+                       ;;
+       esac
+}