diff options
author | Anthony G. Basile <blueness@gentoo.org> | 2013-09-29 20:54:55 -0400 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2013-09-29 20:54:55 -0400 |
commit | e50e1c5d333669f298afe5527840e8af590b5ae8 (patch) | |
tree | fc9cb0fd4a4f947b64a2fab0a4974bbe57b91fba | |
parent | media-gfx/gimp: fix bug #477794 (diff) | |
download | hardened-dev-e50e1c5d333669f298afe5527840e8af590b5ae8.tar.gz hardened-dev-e50e1c5d333669f298afe5527840e8af590b5ae8.tar.bz2 hardened-dev-e50e1c5d333669f298afe5527840e8af590b5ae8.zip |
media-libs/mesa: version bump
-rw-r--r-- | media-libs/mesa/Manifest | 2 | ||||
-rw-r--r-- | media-libs/mesa/mesa-9.1.6-r99.ebuild | 421 |
2 files changed, 423 insertions, 0 deletions
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 1337a029..db89d909 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -4,6 +4,8 @@ AUX mesa-8.0-dont-require-llvm-for-r300.patch 916 SHA256 560f224a12b47fb86bd2ecb AUX mesa-8.1-dont-require-llvm-for-r300.patch 861 SHA256 7ca0a7135834448ea7ca27903a40bf3b0a39325613f8a66a718407aa28504fbf SHA512 a2e7ed3b9b51c3a9a98d83c8fdeb8b777a4877fac25e969b01ff92d6971c10dda9f64e6310c739597ad7ba04106c72925ee5931417f2b8d764f9bd799efd2142 WHIRLPOOL a82863366507835ec0a6562f70389e0d050fd23ea25e7c113ef4a0e1298a1543afa8c1fa51c90ece83f41ac6f3bda6083fd50b8f1292b863cd320186fba8f732 AUX mesa-9.0.1-remove-debug_symbol_name_glibc.patch 737 SHA256 66b9ad32cc2c07c731b71e487ff1c71961cb4151eadc2333d9b977cbb4457979 SHA512 0505969eef8f03f249c452a155e48b3c6b842e56b85e3383350a2b5c041bb759dd196729f9dce335e035a79630d5cd0274fc4c8de57a185217c7a999872720c7 WHIRLPOOL affa42d72c30e1dd959690ae9105d973c561ece9a9db8e7bf304f6f6ff72a957b06dba83205e4e4adde156291c0fc2313cc5821b70489cf8176c3284456fa29f DIST MesaLib-9.1.2.tar.bz2 6122642 SHA256 0695115f7a900624db9ade4f5bd32f4b885d9273eed020fb12b7e29a953143db SHA512 80a09c76b43ad039d8d577f0d9e2b33038847aa8815a1a5251badec626dfe2e7b4c0dfa445f8ce388d4af052147da388ebac0c3265f48e42e3fda4147bfaa578 WHIRLPOOL ea5fe473813111ae08d64bbe9183a11454449ccf419cc689f644afc127ce7b1fd8cb5344682afae13f7db0a2d1d3b90ae418802805d4cee2f6d46d1d26953d1d +DIST MesaLib-9.1.6.tar.bz2 6134267 SHA256 e632dff0acafad0a59dc208d16dedb37f7bd58f94c5d58c4b51912e41d005e3d SHA512 b23d0cc3515b56636f73c4d3247212f8c731c967f5ecf8c247a3bd359038ed374c23eb1bb0da17a9152f8b8d984acd134fa9823d9349285287e58676419b4d40 WHIRLPOOL 4e3c07c893060f77cade242d904c1ec4c1c2982b6b3d9ff188b3d809ad8592408c34bd71276f0e8dfa38bce58a82e146b25064cfa50d3ce6d52a7b69a694690a DIST mesa-9.1-gentoo-patches-05.tar.bz2 3301 SHA256 975ff594dc1eb2aa46f8079b3bd3e2e34d08c47c6c76c66ece6c967c40278d63 SHA512 5f4393d09108d520130e7bc5e0513a73581b16682ad9826f7828a1aa052ca0f2841f9b1fcae43cc108f0ba6c54ae131504603f2e422ca3b71aceb337019a2256 WHIRLPOOL 6e640d2d660e9dd669497f378810c12913e64a2623a66a31e73cdf3e55a3d71c94a039f7e3c4ab8aaf23720ab85e7dbf7649cac7d64ab9cd5ff2f24840d31b02 EBUILD mesa-9.1.2-r99.ebuild 10937 SHA256 2aa09c6cb848f4f361e8b8c45d9f10973439a6b7112248ec6d6f5f532ea6a82f SHA512 45dab07e328c9e509e5a39ea68fd9c3021171ca4cec79232808120831e0196c7fd998dbc42860b4d853b46cf6b3e5936b7abf2bfadb6b7ab7e24b80571588bcc WHIRLPOOL bac603959804343f9bb8703f0be129238d28716a61ffc868624fb015b9942b746d0a43ad1b10eb3c681577250375d6892147f2fbc4f63042ed579ba3d3144464 +EBUILD mesa-9.1.6-r99.ebuild 11085 SHA256 b35b4664f99112da5848094423238619d3ffa6341de5df50673e4d3500f7dff6 SHA512 8d4e34f8b8fbc3e6b533b98da9e81696f48d324d6e42f9a41cd8a0b230d18b9aa0624fadcf4074332cc0ab004e87316c54562c49d14a1722f76e58698f1c6454 WHIRLPOOL 804ed2b676a32ff340814ceeabd307637fb97e635cdfe4559e8dc61affa284ce32cca1ce369234eb282caaf0de52e2ab61a81fc4410872dc733a29913b6d6efa MISC metadata.xml 1655 SHA256 10685b37193fccd3f7f91c1c32b69181994ff82c86c868dbced4acfe26582c1a SHA512 402df88cb1b632927b81ff5e6c832802bf99eadcd86309e4f3b8de8caf756ae1c1075f8d5819cb9c39888ad5d66df695e035ace669823b40d930a31b9494bfb3 WHIRLPOOL 081b23fc5341a1cbbdfb4b850efa7b2708e3f2924222186b7dd8cf142b387b5761cc36ac3b78a9a1e3adfe3b56b03f018131a31d332ca5c5e45cfff67b84ddb0 diff --git a/media-libs/mesa/mesa-9.1.6-r99.ebuild b/media-libs/mesa/mesa-9.1.6-r99.ebuild new file mode 100644 index 00000000..55042bdf --- /dev/null +++ b/media-libs/mesa/mesa-9.1.6-r99.ebuild @@ -0,0 +1,421 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.1.6.ebuild,v 1.2 2013/09/29 11:07:40 ago Exp $ + +EAPI=5 + +EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-2" + EXPERIMENTAL="true" +fi + +PYTHON_COMPAT=( python{2_6,2_7} ) + +inherit base autotools multilib flag-o-matic python-single-r1 toolchain-funcs ${GIT_ECLASS} + +OPENGL_DIR="xorg-x11" + +MY_PN="${PN/m/M}" +MY_P="${MY_PN}-${PV/_rc/-rc}" +MY_SRC_P="${MY_PN}Lib-${PV/_rc/-rc}" + +FOLDER="${PV/_rc*/}" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="http://mesa3d.sourceforge.net/" + +#SRC_PATCHES="mirror://gentoo/${PN}-9.1-gentoo-patches-05.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 + +# The code is MIT/X11. +# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0 +LICENSE="MIT SGI-B-2.0" +SLOT="0" +KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" + +INTEL_CARDS="i915 i965 intel" +RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" +VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} nouveau vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl + openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau + wayland xvmc xa xorg kernel_FreeBSD" + +REQUIRED_USE=" + llvm? ( gallium ) + openvg? ( egl gallium ) + gbm? ( shared-glapi ) + gles1? ( egl ) + gles2? ( egl ) + r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) + wayland? ( egl ) + xa? ( gallium ) + xorg? ( gallium ) + video_cards_intel? ( || ( classic gallium ) ) + video_cards_i915? ( || ( classic gallium ) ) + video_cards_i965? ( classic ) + video_cards_nouveau? ( || ( classic gallium ) ) + video_cards_radeon? ( || ( classic gallium ) ) + video_cards_r100? ( classic ) + video_cards_r200? ( classic ) + video_cards_r300? ( gallium ) + video_cards_r600? ( gallium ) + video_cards_radeonsi? ( gallium llvm ) + video_cards_vmware? ( gallium ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.42" +# 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 + classic? ( app-admin/eselect-mesa ) + gallium? ( app-admin/eselect-mesa ) + >=app-admin/eselect-opengl-1.2.7 + dev-libs/expat + gbm? ( virtual/udev ) + >=x11-libs/libX11-1.3.99.901 + x11-libs/libXdamage + x11-libs/libXext + x11-libs/libXxf86vm + >=x11-libs/libxcb-1.8.1 + vdpau? ( >=x11-libs/libvdpau-0.4.1 ) + wayland? ( >=dev-libs/wayland-1.0.3 ) + xorg? ( + x11-base/xorg-server:=[-minimal] + x11-libs/libdrm[libkms] + ) + xvmc? ( >=x11-libs/libXvMC-1.0.6 ) + ${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} + llvm? ( + >=sys-devel/llvm-2.9 + r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) + video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) + ) + ${PYTHON_DEPS} + dev-libs/libxml2[python,${PYTHON_USEDEP}] + sys-devel/bison + sys-devel/flex + virtual/pkgconfig + >=x11-proto/dri2proto-2.6 + >=x11-proto/glproto-1.4.15-r1 + >=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() { + # workaround toc-issue wrt #386545 + use ppc64 && append-flags -mminimal-toc + + python-single-r1_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 + + # relax the requirement that r300 must have llvm, bug 380303 + epatch "${FILESDIR}"/${PN}-8.1-dont-require-llvm-for-r300.patch + + # fix for hardened pax_kernel, bug 240956 + [[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch + + epatch "${FILESDIR}"/${PN}-9.0.1-remove-debug_symbol_name_glibc.patch + + # 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 + fi + + # Tests fail against python-3, bug #407887 + sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die + + base_src_prepare + + eautoreconf +} + +src_configure() { + local myconf + + if use classic; then + # Configurable DRI drivers + driver_enable swrast + + # Intel code + driver_enable video_cards_i915 i915 + driver_enable video_cards_i965 i965 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + driver_enable video_cards_intel i915 i965 + fi + + # Nouveau code + driver_enable video_cards_nouveau nouveau + + # ATI code + driver_enable video_cards_r100 radeon + driver_enable video_cards_r200 r200 + if ! use video_cards_r100 && \ + ! use video_cards_r200; then + driver_enable video_cards_radeon radeon r200 + fi + fi + + if use egl; then + myconf+=" + --with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm") + $(use_enable gallium gallium-egl) + " + fi + + if use gallium; then + myconf+=" + $(use_enable llvm gallium-llvm) + $(use_enable openvg) + $(use_enable r600-llvm-compiler) + $(use_enable vdpau) + $(use_enable xvmc) + " + gallium_enable swrast + gallium_enable video_cards_vmware svga + gallium_enable video_cards_nouveau nouveau + gallium_enable video_cards_i915 i915 + if ! use video_cards_i915; then + gallium_enable video_cards_intel i915 + fi + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + fi + + # x86 hardened pax_kernel needs glx-rts, bug 240956 + if use pax_kernel; then + myconf+=" + $(use_enable x86 glx-rts) + " + fi + + # build fails with BSD indent, bug #428112 + use userland_GNU || export INDENT=cat + + econf \ + --enable-dri \ + --enable-glx \ + $(use_enable !bindist texture-float) \ + $(use_enable debug) \ + $(use_enable egl) \ + $(use_enable gbm) \ + $(use_enable gles1) \ + $(use_enable gles2) \ + $(use_enable nptl glx-tls) \ + $(use_enable osmesa) \ + $(use_enable !pic asm) \ + $(use_enable shared-glapi) \ + $(use_enable xa) \ + $(use_enable xorg) \ + --with-dri-drivers=${DRI_DRIVERS} \ + --with-gallium-drivers=${GALLIUM_DRIVERS} \ + PYTHON2="${PYTHON}" \ + ${myconf} +} + +src_install() { + base_src_install + + find "${ED}" -name '*.la' -exec rm -f {} + || die + + if use !bindist; then + dodoc docs/patents.txt + fi + + # Install config file for eselect mesa + insinto /usr/share/mesa + newins "${FILESDIR}/eselect-mesa.conf.8.1" eselect-mesa.conf + + # 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" + local x + local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/" + dodir ${gl_dir}/{lib,extensions,include/GL} + for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do + if [ -f ${x} -o -L ${x} ]; then + mv -f "${x}" "${ED}${gl_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}${gl_dir}"/include/GL \ + || die "Failed to move ${x}" + fi + done + for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do + if [ -d ${x} ]; then + mv -f "${x}" "${ED}${gl_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}" + 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} + + # switch to xorg-x11 and back if necessary, bug #374647 comment 11 + OLD_IMPLEM="$(eselect opengl show)" + if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then + eselect opengl set ${OPENGL_DIR} + eselect opengl set ${OLD_IMPLEM} + fi + + # 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. Please see patents.txt for an explanation." + fi + + local using_radeon r_flag + for r_flag in ${RADEON_CARDS}; do + if use video_cards_${r_flag}; then + using_radeon=1 + break + fi + done + + if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then + elog "Note that in order to have full S3TC support, it is necessary to install" + elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice" + elog "textures in some apps, and some others even require this to run." + 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 +} |