commit:     518ccd752b69b2df8d729169761faac9d7c3cae9
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 13 00:49:09 2017 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 00:49:09 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=518ccd75

media-libs/mesa: Version bump to 17.2.0_rc4

 media-libs/mesa/Manifest               |   1 +
 media-libs/mesa/mesa-17.2.0_rc4.ebuild | 504 +++++++++++++++++++++++++++++++++
 2 files changed, 505 insertions(+)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index a6c23a54963..69107584602 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -10,3 +10,4 @@ DIST mesa-17.1.4.tar.xz 9899196 SHA256 
06f3b0e6a28f0d20b7f3391cf67fe89ae98ecd0a6
 DIST mesa-17.1.5.tar.xz 9901876 SHA256 
378516b171712687aace4c7ea8b37c85895231d7a6d61e1e27362cf6034fded9 SHA512 
a12671afd812b304e1db690b123a9de16332608541f71cc3ee9128a3630c81416d46255e5bdbf19e14e85716b218f447987b555e3bc0081b8b6f392556fa21e2
 WHIRLPOOL 
b3a94172df5061774e7746ca9f2191f0f04ff375cb76406e22a694141d185f650ce04b3fa4f89b054aa3348f3562886982b5b725680d9ab1cdd6108900da91b7
 DIST mesa-17.1.6.tar.xz 9868932 SHA256 
0686deadde1f126b20aa67e47e8c50502043eee4ecdf60d5009ffda3cebfee50 SHA512 
cf57f29a21208f0a9bc84157f806bcaf6fd0583352449fcb986b05773eeefc99c4040dc41b242782dd5aa9ff7f9c5312b17a4db82d87f600acf165b6acdfc95a
 WHIRLPOOL 
38d6043001798ea9876b55a45222b129596ae92ebb1cc2af36bb0cc8523acce11b38a658d0e8a8afad1b99a49f7d4cdc229b7a3cbb7c15d9858614a91a4994f8
 DIST mesa-17.2.0-rc3.tar.xz 10405100 SHA256 
bd417166bc55a74a20e7687738c2f081364637e40a0712989e04b3ba7e404ff2 SHA512 
34cc307e82f227fc0398185ac8a349c96631c47e407e883e80523850eeeb0eb4cc445780f61494c2ba81856965d8ae06819330fa54c149808a18db9e872c12b6
 WHIRLPOOL 
8ea40f6b4a6366b502cd2f2f1ab4bf371dab695b0ed86825a0f0abb36198adfd2d335cf43b668acc4606216a736be41fc735daee1b1b6b6060f4f044bc6f948f
+DIST mesa-17.2.0-rc4.tar.xz 10404796 SHA256 
b1dffaf414c9ef3df23ddf1f3ae4d35e85e296bf2def2fc9c0b402ff9d9a48fb SHA512 
a5e2727bd91185db440d94b273cc32e9907d3a64b3f5ea33d5888f7aa2bfec54d7db57eeee6109a8dc28e9efec97ea23e895117ba52f1963cb2bc2b22b718595
 WHIRLPOOL 
fea274533b7cf1652f7823afabf65b36a3d42fab957e604ee907ef281ccec5db82e25cfa171910dae25f2cc59eaff18a3340ce2464f7b5c0415a206d259bb4b5

diff --git a/media-libs/mesa/mesa-17.2.0_rc4.ebuild 
b/media-libs/mesa/mesa-17.2.0_rc4.ebuild
new file mode 100644
index 00000000000..f54779f9572
--- /dev/null
+++ b/media-libs/mesa/mesa-17.2.0_rc4.ebuild
@@ -0,0 +1,504 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git";
+
+if [[ ${PV} = 9999 ]]; then
+       GIT_ECLASS="git-r3"
+       EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/";
+
+if [[ $PV == 9999 ]]; then
+       SRC_URI=""
+else
+       SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz";
+       KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 
~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux 
~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="!bindist? ( bindist )"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 vivante 
vmware"
+for card in ${VIDEO_CARDS}; do
+       IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+       bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind
+       +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind
+       vdpau vulkan wayland xvmc xa"
+
+REQUIRED_USE="
+       d3d9?   ( dri3 gallium )
+       llvm?   ( gallium )
+       opencl? ( gallium llvm )
+       openmax? ( gallium )
+       gles1?  ( egl )
+       gles2?  ( egl )
+       vaapi? ( gallium )
+       vdpau? ( gallium )
+       vulkan? ( || ( video_cards_i965 video_cards_radeonsi )
+                 video_cards_radeonsi? ( llvm ) )
+       wayland? ( egl gbm )
+       xa?  ( gallium )
+       video_cards_freedreno?  ( gallium )
+       video_cards_intel?  ( classic )
+       video_cards_i915?   ( || ( classic gallium ) )
+       video_cards_i965?   ( classic )
+       video_cards_imx?    ( gallium )
+       video_cards_nouveau? ( || ( classic gallium ) )
+       video_cards_radeon? ( || ( classic gallium )
+                                                 gallium? ( x86? ( llvm ) 
amd64? ( llvm ) ) )
+       video_cards_r100?   ( classic )
+       video_cards_r200?   ( classic )
+       video_cards_r300?   ( gallium x86? ( llvm ) amd64? ( llvm ) )
+       video_cards_r600?   ( gallium )
+       video_cards_radeonsi?   ( gallium llvm )
+       video_cards_vc4? ( gallium )
+       video_cards_vivante? ( gallium gbm )
+       video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.82"
+# 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
+       abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] )
+       classic? ( app-eselect/eselect-mesa )
+       gallium? ( app-eselect/eselect-mesa )
+       >=app-eselect/eselect-opengl-1.3.0
+       >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+       >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+       >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+       >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}]
+       x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+       unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+       llvm? (
+               video_cards_radeonsi? (
+                       virtual/libelf:0=[${MULTILIB_USEDEP}]
+                       vulkan? ( >=sys-devel/llvm-3.9.0:=[${MULTILIB_USEDEP}] )
+               )
+               video_cards_r600? (
+                       virtual/libelf:0=[${MULTILIB_USEDEP}]
+               )
+               video_cards_radeon? (
+                       virtual/libelf:0=[${MULTILIB_USEDEP}]
+               )
+               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
+       )
+       opencl? (
+                               app-eselect/eselect-opencl
+                               dev-libs/libclc
+                               virtual/libelf:0=[${MULTILIB_USEDEP}]
+                       )
+       openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] )
+       vaapi? (
+               >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+               video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+       )
+       vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+       wayland? (
+               >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}]
+               >=dev-libs/wayland-protocols-1.8
+       )
+       xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+       
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+       video_cards_intel? (
+               !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+       )
+       video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+"
+for card in ${RADEON_CARDS}; do
+       RDEPEND="${RDEPEND}
+               video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+       "
+done
+RDEPEND="${RDEPEND}
+       video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# FIXME: kill the sys-devel/llvm[video_cards_radeon] compat once
+# LLVM < 3.9 is out of the game
+DEPEND="${RDEPEND}
+       ${PYTHON_DEPS}
+       llvm? (
+               video_cards_radeonsi? ( || (
+                       sys-devel/llvm[llvm_targets_AMDGPU]
+                       sys-devel/llvm[video_cards_radeon]
+               ) )
+       )
+       opencl? (
+                               >=sys-devel/llvm-3.6.0:=[${MULTILIB_USEDEP}]
+                               >=sys-devel/clang-3.6.0:=[${MULTILIB_USEDEP}]
+                               >=sys-devel/gcc-4.6
+       )
+       sys-devel/gettext
+       virtual/pkgconfig
+       valgrind? ( dev-util/valgrind )
+       >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}]
+       dri3? (
+               >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}]
+               >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}]
+       )
+       >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}]
+       >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}]
+       >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}]
+       >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}]
+"
+[[ ${PV} == 9999 ]] && DEPEND+="
+       sys-devel/bison
+       sys-devel/flex
+       $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+       !pic? (
+               usr/lib*/libglapi.so.0.0.0
+               usr/lib*/libGLESv1_CM.so.1.1.0
+               usr/lib*/libGLESv2.so.2.0.0
+               usr/lib*/libGL.so.1.2.0
+               usr/lib*/libOSMesa.so.8.0.0
+       )
+)"
+
+pkg_setup() {
+       # warning message for bug 459306
+       if use llvm && has_version sys-devel/llvm[!debug=]; then
+               ewarn "Mismatch between debug USE flags in media-libs/mesa and 
sys-devel/llvm"
+               ewarn "detected! This can cause problems. For details, see bug 
459306."
+       fi
+
+       if use llvm || use opencl; then
+               llvm_pkg_setup
+       fi
+       python-any-r1_pkg_setup
+}
+
+src_prepare() {
+       [[ ${PV} == 9999 ]] && eautoreconf
+       eapply_user
+}
+
+multilib_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-platforms=x11,surfaceless$(use wayland && echo 
",wayland")$(use gbm && echo ",drm")"
+       fi
+
+       if use gallium; then
+               myconf+="
+                       $(use_enable d3d9 nine)
+                       $(use_enable llvm)
+                       $(use_enable openmax omx)
+                       $(use_enable vaapi va)
+                       $(use_enable vdpau)
+                       $(use_enable xa)
+                       $(use_enable xvmc)
+               "
+               use vaapi && myconf+=" 
--with-va-libdir=/usr/$(get_libdir)/va/drivers"
+
+               gallium_enable swrast
+               gallium_enable video_cards_vc4 vc4
+               gallium_enable video_cards_vivante etnaviv
+               gallium_enable video_cards_vmware svga
+               gallium_enable video_cards_nouveau nouveau
+               gallium_enable video_cards_i915 i915
+               gallium_enable video_cards_imx imx
+               if ! use video_cards_i915 && \
+                       ! use video_cards_i965; 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
+
+               gallium_enable video_cards_freedreno freedreno
+               # opencl stuff
+               if use opencl; then
+                       myconf+="
+                               $(use_enable opencl)
+                               --with-clang-libdir="${EPREFIX}/usr/lib"
+                               "
+               fi
+       fi
+
+       if use vulkan; then
+               vulkan_enable video_cards_i965 intel
+               vulkan_enable video_cards_radeonsi radeon
+       fi
+
+       # x86 hardened pax_kernel needs glx-rts, bug 240956
+       if [[ ${ABI} == x86 ]]; then
+               myconf+=" $(use_enable pax_kernel glx-read-only-text)"
+       fi
+
+       # on abi_x86_32 hardened we need to have asm disable
+       if [[ ${ABI} == x86* ]] && use pic; then
+               myconf+=" --disable-asm"
+       fi
+
+       if use gallium; then
+               myconf+=" $(use_enable osmesa gallium-osmesa)"
+       else
+               myconf+=" $(use_enable osmesa)"
+       fi
+
+       # build fails with BSD indent, bug #428112
+       use userland_GNU || export INDENT=cat
+
+       ECONF_SOURCE="${S}" \
+       econf \
+               --enable-dri \
+               --enable-glx \
+               --enable-shared-glapi \
+               $(use_enable !bindist texture-float) \
+               $(use_enable d3d9 nine) \
+               $(use_enable debug) \
+               $(use_enable dri3) \
+               $(use_enable egl) \
+               $(use_enable gbm) \
+               $(use_enable gles1) \
+               $(use_enable gles2) \
+               $(use_enable nptl glx-tls) \
+               $(use_enable unwind libunwind) \
+               --enable-valgrind=$(usex valgrind auto no) \
+               --enable-llvm-shared-libs \
+               --with-dri-drivers=${DRI_DRIVERS} \
+               --with-gallium-drivers=${GALLIUM_DRIVERS} \
+               --with-vulkan-drivers=${VULKAN_DRIVERS} \
+               PYTHON2="${PYTHON}" \
+               ${myconf}
+}
+
+multilib_src_install() {
+       emake install DESTDIR="${D}"
+
+       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 "$(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}"
+                               fi
+                       done
+                       if use classic; then
+                               emake -C "${BUILD_DIR}/src/mesa/drivers/dri" 
DESTDIR="${D}" install
+                       fi
+                       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
+       if use opencl; then
+               ebegin "Moving Gallium/Clover OpenCL implementation for dynamic 
switching"
+               local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa"
+               dodir ${cl_dir}/{lib,include}
+               if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then
+                       mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \
+                       "${ED}"${cl_dir}
+               fi
+               if [ -f "${ED}/usr/include/CL/opencl.h" ]; then
+                       mv -f "${ED}"/usr/include/CL \
+                       "${ED}"${cl_dir}/include
+               fi
+               eend $?
+       fi
+
+       if use openmax; then
+               echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > 
"${T}/99mesaxdgomx"
+               doenvd "${T}"/99mesaxdgomx
+               keepdir /usr/share/mesa/xdg
+       fi
+}
+
+multilib_src_install_all() {
+       find "${ED}" -name '*.la' -delete
+       einstalldocs
+
+       if use !bindist; then
+               dodoc docs/patents.txt
+       fi
+
+       # Install config file for eselect mesa
+       insinto /usr/share/mesa
+       newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf
+}
+
+multilib_src_test() {
+       if use llvm; then
+               local llvm_tests='lp_test_arit lp_test_arit lp_test_blend 
lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format 
lp_test_printf lp_test_printf'
+               pushd src/gallium/drivers/llvmpipe >/dev/null || die
+               emake ${llvm_tests}
+               pax-mark m ${llvm_tests}
+               popd >/dev/null || die
+       fi
+       emake check
+}
+
+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
+
+       # Switch to mesa opencl
+       if use opencl; then
+               eselect opencl set --use-old ${PN}
+       fi
+
+       # run omxregister-bellagio to make the OpenMAX drivers known system-wide
+       if use openmax; then
+               ebegin "Registering OpenMAX drivers"
+               
BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \
+                       
OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \
+                       omxregister-bellagio
+               eend $?
+       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
+
+       if ! 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
+}
+
+pkg_prerm() {
+       if use openmax; then
+               rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister
+       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
+}
+
+vulkan_enable() {
+       case $# in
+               # for enabling unconditionally
+               1)
+                       VULKAN_DRIVERS+=",$1"
+                       ;;
+               *)
+                       if use $1; then
+                               shift
+                               for i in $@; do
+                                       VULKAN_DRIVERS+=",${i}"
+                               done
+                       fi
+                       ;;
+       esac
+}

Reply via email to