commit: 5da1cd850f5e57f3192a97c85420cebb8731e61a Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> AuthorDate: Tue Jul 9 20:24:07 2019 +0000 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> CommitDate: Tue Jul 9 20:24:07 2019 +0000 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=5da1cd85
media-libs/mesa: 19.1.2 version bump Package-Manager: Portage-2.3.68, Repoman-2.3.16 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> media-libs/mesa/Manifest | 4 +- media-libs/mesa/mesa-19.0.3.ebuild | 539 -------------------- media-libs/mesa/mesa-19.1.0.ebuild | 549 --------------------- .../{mesa-19.1.1-r1.ebuild => mesa-19.1.2.ebuild} | 6 +- 4 files changed, 3 insertions(+), 1095 deletions(-) diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 6f98f60..7af64d5 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -3,6 +3,4 @@ DIST mesa-18.2.8.tar.xz 11385224 BLAKE2B c6fbf71e2ab6837f91dfa996cf7e89e9cae22e2 DIST mesa-18.3.4.tar.xz 11875224 BLAKE2B 81d34349c644cc93b3ca525046cdd63a5aa2a16d8f6b841830a138c8e9e375fb0f75a17bd80b4c48ed573f4976dd6612b0773305a3bec982540914365c9925ff SHA512 e4ead944ba053aa05425e9e199d633f576dfa424976253fc32438e8db6da5e8d381122e4c4b7fb18f94177421f208bab5567cfec8d2692d104e266483ca02a99 DIST mesa-18.3.5.tar.xz 11882012 BLAKE2B 88279fe2f24c2a47c8857ad34382b7c8b64119632f1ec7ce8d0fe2afe669e01d2e071726f01e28b001be353d8d9ec1f0ef46d3ba1e64239d63221b100745e8ee SHA512 f229ac122eafee98d1a40c54adeb019eb4458cb67063db9ba760b265da0634fe77247c3c8cb5c5de5fd40f8545e35d45000a74af9257ebf4e2028156add8644c DIST mesa-18.3.6.tar.xz 11882744 BLAKE2B f0f0de6d4c40cf01c6b9cb97d772c6386deb3d08f66f2731fe60eff21edfa822b6d7a293fbf9e426acddbb58445b9b0e3c0b1bc8ae05e8b19e802872571449c2 SHA512 3a6dcaba99185e28d162b130bbd760fe87e6072065958189b28f41ea287ef041397897e098d93218a64802cf11c73806f7400a866bd8e5ed69694fa15c147487 -DIST mesa-19.0.3.tar.xz 11963844 BLAKE2B 7d8bae717c0a2a6143d3aee35852145a2032d40ad7f4edcd76eec46392f3917787592d13f9695de54a15ea5bcb3dec3181c418ddfb5b69a3e1b52fb796f04eab SHA512 aa170577252aa4157e4bd49076bbf6207e4aada9fc9f23b255de332e816f9c63e5661f752f2f276dd43e232a8926866004e2a2ff9ad4b411330969c2a9a7ffa0 -DIST mesa-19.1.0.tar.xz 10926676 BLAKE2B 87d21c2b79e6af7c020ca87d9ece79586d9a86ad4ce79df975b8bab4671d8d4f84b32e5146badeb337713ca6996338740b4d8f77ab4851f7b624fecc495c220e SHA512 25b186ae8037dedea5691e0b77b22f2065f3c877838378651726dfa1b34ef49dcc56f1dbd124e99285e5f14489db936a886a6740495b5b279e8363424bfb3433 -DIST mesa-19.1.1.tar.xz 10927620 BLAKE2B 503d7fb37144868c4e71e22fd310b7049265a6babf3b7ccd4f8d5a4db6a3b2e309e9e20006c913e02a0015750eaa9ca303165818b0b3542cdaa59e016817149c SHA512 73b190eeb0b5809217c04f39d90edc0844dac476d8284543013a4a8889a4be805bc15b43c91bbf0d3a36f35dc576e7085255f7012d207c74466e81cee7f67922 +DIST mesa-19.1.2.tar.xz 10930748 BLAKE2B 2f4882837902f02104db0198ecb8f24a48803fb9ff442c49b6b5055967c9f60662e3d65c92bb40391ee1824ac48ff1ef0c9db96adc0830bb11a3a83eb69ce1b5 SHA512 cab30694a409a5037996dd50cef1567eb9e0b83ed69cdb4fbc893a844ed35434fcd05023d48fce2831219866fa420500b53650c791bea286233f4cd6c2703e19 diff --git a/media-libs/mesa/mesa-19.0.3.ebuild b/media-libs/mesa/mesa-19.0.3.ebuild deleted file mode 100644 index 108122d..0000000 --- a/media-libs/mesa/mesa-19.0.3.ebuild +++ /dev/null @@ -1,539 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_5 python3_6 python3_7 ) - -inherit llvm meson multilib-minimal pax-utils python-any-r1 - -OPENGL_DIR="xorg-x11" - -MY_P="${P/_/-}" - -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" - EXPERIMENTAL="true" - inherit git-r3 -else - SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86" -fi - -LICENSE="MIT" -SLOT="0" -RESTRICT=" - !test? ( test ) -" - -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm - lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind - vdpau vulkan wayland xa xvmc" - -REQUIRED_USE=" - d3d9? ( dri3 || ( video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) - gles1? ( egl ) - gles2? ( egl ) - vulkan? ( dri3 - || ( video_cards_i965 video_cards_radeonsi ) - video_cards_radeonsi? ( llvm ) ) - wayland? ( egl gbm ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( classic ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_imx? ( gallium video_cards_vivante ) - 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_virgl? ( gallium ) - video_cards_vivante? ( gallium gbm ) - video_cards_vmware? ( gallium ) -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97" -RDEPEND=" - !app-eselect/eselect-mesa - >=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.13:=[${MULTILIB_USEDEP}] - x11-libs/libXfixes:=[${MULTILIB_USEDEP}] - libglvnd? ( - media-libs/libglvnd[${MULTILIB_USEDEP}] - !app-eselect/eselect-opengl - ) - !libglvnd? ( - >=app-eselect/eselect-opengl-1.3.0 - ) - gallium? ( - unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) - llvm? ( - video_cards_radeonsi? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_r600? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_radeon? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - ) - lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] ) - opencl? ( - dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}] - dev-libs/libclc - virtual/libelf:0=[${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}] ) - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) - ) - wayland? ( - >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.8 - ) - ${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] ) -" - -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. -# -# How to use it: -# 1. List all the working slots (with min versions) in ||, newest first. -# 2. Update the := to specify *max* version, e.g. < 9. -# 3. Specify LLVM_MAX_SLOT, e.g. 8. -LLVM_MAX_SLOT="8" -LLVM_DEPSTR=" - || ( - sys-devel/llvm:8[${MULTILIB_USEDEP}] - sys-devel/llvm:7[${MULTILIB_USEDEP}] - ) - <sys-devel/llvm-9:=[${MULTILIB_USEDEP}] -" -LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} -CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -RDEPEND="${RDEPEND} - llvm? ( - opencl? ( - video_cards_r600? ( - ${CLANG_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${CLANG_DEPSTR} - ) - ) - ) - ) - !opencl? ( - video_cards_r600? ( - ${LLVM_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${LLVM_DEPSTR} - ) - ) - ) - ) - ) -" -unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - opencl? ( - >=sys-devel/gcc-4.6 - ) - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - valgrind? ( dev-util/valgrind ) - x11-base/xorg-proto - x11-libs/libXrandr[${MULTILIB_USEDEP}] - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${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.0.0 - usr/lib*/libGLESv2.so.2.0.0 - usr/lib*/libGL.so.1.2.0 - usr/lib*/libOSMesa.so.8.0.0 - ) -)" - -PATCHES=( - "${FILESDIR}"/${PN}-17-execinfo.patch - "${FILESDIR}"/${PN}-17-musl-string_h.patch - "${FILESDIR}"/${PN}-18-musl-invocation_name.patch - "${FILESDIR}"/${PN}-18-musl-pthread.patch - "${FILESDIR}"/${PN}-18-musl-amdgpu-include-pthread.patch - "${FILESDIR}"/${PN}-18.2.4-add-disable-tls-support.patch -) - -llvm_check_deps() { - local flags=${MULTILIB_USEDEP} - if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi - then - flags+=",llvm_targets_AMDGPU(-)" - fi - - if use opencl; then - has_version "sys-devel/clang[${flags}]" || return 1 - fi - has_version "sys-devel/llvm[${flags}]" -} - -pkg_pretend() { - if use opencl; then - if ! use video_cards_r600 && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" - fi - fi - - if use vaapi; then - if ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" - fi - fi - - if use vdpau; then - if ! use video_cards_r300 && - ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau" - fi - fi - - if use xa; then - if ! use video_cards_freedreno && - ! use video_cards_nouveau && - ! use video_cards_vmware; then - ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" - fi - fi - - if use xvmc; then - if ! use video_cards_r600 && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" - fi - fi - - if ! use gallium; then - use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium" - use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" - use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" - use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" - use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" - use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" - use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" - use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" - fi - - if ! use llvm; then - use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" - fi -} - -python_check_deps() { - has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" -} - -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; then - llvm_pkg_setup - fi - python-any-r1_pkg_setup -} - -multilib_src_configure() { - local emesonargs=() - - if use classic; then - # Intel code - dri_driver_enable video_cards_i915 i915 - dri_driver_enable video_cards_i965 i965 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - dri_driver_enable video_cards_intel i915 i965 - fi - - # Nouveau code - dri_driver_enable video_cards_nouveau nouveau - - # ATI code - dri_driver_enable video_cards_r100 r100 - dri_driver_enable video_cards_r200 r200 - if ! use video_cards_r100 && \ - ! use video_cards_r200; then - dri_driver_enable video_cards_radeon r100 r200 - fi - fi - - emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") ) - - if use gallium; then - emesonargs+=( - $(meson_use llvm) - $(meson_use lm_sensors lmsensors) - $(meson_use unwind libunwind) - ) - - if use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_use d3d9 gallium-nine)) - else - emesonargs+=(-Dgallium-nine=false) - fi - - if use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_use vaapi gallium-va)) - use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) - else - emesonargs+=(-Dgallium-va=false) - fi - - if use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_use vdpau gallium-vdpau)) - else - emesonargs+=(-Dgallium-vdpau=false) - fi - - if use video_cards_freedreno || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_use xa gallium-xa)) - else - emesonargs+=(-Dgallium-xa=false) - fi - - if use video_cards_r600 || - use video_cards_nouveau; then - emesonargs+=($(meson_use xvmc gallium-xvmc)) - else - emesonargs+=(-Dgallium-xvmc=false) - fi - - 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_imx imx - - # Only one i915 driver (classic vs gallium). Default to classic. - if ! use classic; then - gallium_enable video_cards_i915 i915 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - gallium_enable video_cards_intel i915 - fi - 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 - gallium_enable video_cards_virgl virgl - - # opencl stuff - emesonargs+=( - -Dgallium-opencl="$(usex opencl icd disabled)" - ) - fi - - if use vulkan; then - vulkan_enable video_cards_i965 intel - vulkan_enable video_cards_radeonsi amd - fi - - # x86 hardened pax_kernel needs glx-rts, bug 240956 - if [[ ${ABI} == x86 ]]; then - emesonargs+=( $(meson_use pax_kernel glx-read-only-text) ) - fi - - # Disable glx tls support on musl - if use elibc_musl; then - emesonargs+=( -Dglx-tls=false ) - fi - - # on abi_x86_32 hardened we need to have asm disable - if [[ ${ABI} == x86* ]] && use pic; then - emesonargs+=( -Dasm=false ) - fi - - if use gallium; then - gallium_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) - else - dri_driver_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) - fi - - driver_list() { - local drivers="$(sort -u <<< "${1// /$'\n'}")" - echo "${drivers//$'\n'/,}" - } - - emesonargs+=( - $(meson_use test build-tests) - -Dglx=dri - -Dshared-glapi=true - $(meson_use dri3) - $(meson_use egl) - $(meson_use gbm) - $(meson_use gles1) - $(meson_use gles2) - $(meson_use libglvnd glvnd) - $(meson_use selinux) - -Dvalgrind=$(usex valgrind auto false) - -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") - -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") - -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install - - use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so* -} - -multilib_src_install_all() { - einstalldocs -} - -multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -t 100 -} - -pkg_postinst() { - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} -} - -# $1 - VIDEO_CARDS flag (check skipped for "--") -# other args - names of DRI drivers to enable -dri_driver_enable() { - if [[ $1 == -- ]] || use $1; then - shift - DRI_DRIVERS+=("$@") - fi -} - -gallium_enable() { - if [[ $1 == -- ]] || use $1; then - shift - GALLIUM_DRIVERS+=("$@") - fi -} - -vulkan_enable() { - if [[ $1 == -- ]] || use $1; then - shift - VULKAN_DRIVERS+=("$@") - fi -} diff --git a/media-libs/mesa/mesa-19.1.0.ebuild b/media-libs/mesa/mesa-19.1.0.ebuild deleted file mode 100644 index 468f224..0000000 --- a/media-libs/mesa/mesa-19.1.0.ebuild +++ /dev/null @@ -1,549 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python3_5 python3_6 python3_7 ) - -inherit llvm meson multilib-minimal pax-utils python-any-r1 - -OPENGL_DIR="xorg-x11" - -MY_P="${P/_/-}" - -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" - EXPERIMENTAL="true" - inherit git-r3 -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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -RESTRICT=" - !test? ( test ) -" - -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm - lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind - vdpau vulkan vulkan-overlay wayland xa xvmc" - -REQUIRED_USE=" - d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) - gles1? ( egl ) - gles2? ( egl ) - vulkan? ( dri3 - || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) - video_cards_radeonsi? ( llvm ) ) - vulkan-overlay? ( vulkan ) - wayland? ( egl gbm ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( classic ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_iris? ( 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_virgl? ( gallium ) - video_cards_vivante? ( gallium gbm ) - video_cards_vmware? ( gallium ) -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97" -RDEPEND=" - !app-eselect/eselect-mesa - >=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.13:=[${MULTILIB_USEDEP}] - x11-libs/libXfixes:=[${MULTILIB_USEDEP}] - libglvnd? ( - media-libs/libglvnd[${MULTILIB_USEDEP}] - !app-eselect/eselect-opengl - ) - !libglvnd? ( - >=app-eselect/eselect-opengl-1.3.0 - ) - gallium? ( - unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) - llvm? ( - video_cards_radeonsi? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_r600? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_radeon? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - ) - lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] ) - opencl? ( - dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}] - dev-libs/libclc - virtual/libelf:0=[${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}] ) - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) - ) - wayland? ( - >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.8 - ) - ${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] ) -" - -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. -# -# How to use it: -# 1. List all the working slots (with min versions) in ||, newest first. -# 2. Update the := to specify *max* version, e.g. < 10. -# 3. Specify LLVM_MAX_SLOT, e.g. 9. -LLVM_MAX_SLOT="9" -LLVM_DEPSTR=" - || ( - sys-devel/llvm:9[${MULTILIB_USEDEP}] - sys-devel/llvm:8[${MULTILIB_USEDEP}] - sys-devel/llvm:7[${MULTILIB_USEDEP}] - ) - sys-devel/llvm:=[${MULTILIB_USEDEP}] -" -LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} -CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -RDEPEND="${RDEPEND} - llvm? ( - opencl? ( - video_cards_r600? ( - ${CLANG_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${CLANG_DEPSTR} - ) - ) - ) - ) - !opencl? ( - video_cards_r600? ( - ${LLVM_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${LLVM_DEPSTR} - ) - ) - ) - ) - ) -" -unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - opencl? ( - >=sys-devel/gcc-4.6 - ) - sys-devel/bison - sys-devel/flex - sys-devel/gettext - virtual/pkgconfig - valgrind? ( dev-util/valgrind ) - x11-base/xorg-proto - x11-libs/libXrandr[${MULTILIB_USEDEP}] - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${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.0.0 - usr/lib*/libGLESv2.so.2.0.0 - usr/lib*/libGL.so.1.2.0 - usr/lib*/libOSMesa.so.8.0.0 - ) -)" - -PATCHES=( - "${FILESDIR}"/${PN}-19.1.0-execinfo.patch - "${FILESDIR}"/${PN}-18-musl-invocation_name.patch - "${FILESDIR}"/${PN}-18-musl-pthread.patch - "${FILESDIR}"/${PN}-18.2.4-add-disable-tls-support.patch -) - -llvm_check_deps() { - local flags=${MULTILIB_USEDEP} - if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi - then - flags+=",llvm_targets_AMDGPU(-)" - fi - - if use opencl; then - has_version "sys-devel/clang[${flags}]" || return 1 - fi - has_version "sys-devel/llvm[${flags}]" -} - -pkg_pretend() { - if use opencl; then - if ! use video_cards_r600 && - ! use video_cards_radeonsi; then - ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" - fi - fi - - if use vaapi; then - if ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" - fi - fi - - if use vdpau; then - if ! use video_cards_r300 && - ! use video_cards_r600 && - ! use video_cards_radeonsi && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau" - fi - fi - - if use xa; then - if ! use video_cards_freedreno && - ! use video_cards_nouveau && - ! use video_cards_vmware; then - ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" - fi - fi - - if use xvmc; then - if ! use video_cards_r600 && - ! use video_cards_nouveau; then - ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" - fi - fi - - if ! use gallium; then - use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium" - use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" - use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" - use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" - use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" - use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" - use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" - use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" - fi - - if ! use llvm; then - use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" - fi -} - -python_check_deps() { - has_version --host-root ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" -} - -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; then - llvm_pkg_setup - fi - python-any-r1_pkg_setup -} - -multilib_src_configure() { - local emesonargs=() - - if use classic; then - # Intel code - dri_driver_enable video_cards_i915 i915 - dri_driver_enable video_cards_i965 i965 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - dri_driver_enable video_cards_intel i915 i965 - fi - - # Nouveau code - dri_driver_enable video_cards_nouveau nouveau - - # ATI code - dri_driver_enable video_cards_r100 r100 - dri_driver_enable video_cards_r200 r200 - if ! use video_cards_r100 && \ - ! use video_cards_r200; then - dri_driver_enable video_cards_radeon r100 r200 - fi - fi - - emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") ) - - if use gallium; then - emesonargs+=( - $(meson_use llvm) - $(meson_use lm_sensors lmsensors) - $(meson_use unwind libunwind) - ) - - if use video_cards_iris || - use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_use d3d9 gallium-nine)) - else - emesonargs+=(-Dgallium-nine=false) - fi - - if use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_use vaapi gallium-va)) - use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) - else - emesonargs+=(-Dgallium-va=false) - fi - - if use video_cards_r300 || - use video_cards_r600 || - use video_cards_radeonsi || - use video_cards_nouveau; then - emesonargs+=($(meson_use vdpau gallium-vdpau)) - else - emesonargs+=(-Dgallium-vdpau=false) - fi - - if use video_cards_freedreno || - use video_cards_nouveau || - use video_cards_vmware; then - emesonargs+=($(meson_use xa gallium-xa)) - else - emesonargs+=(-Dgallium-xa=false) - fi - - if use video_cards_r600 || - use video_cards_nouveau; then - emesonargs+=($(meson_use xvmc gallium-xvmc)) - else - emesonargs+=(-Dgallium-xvmc=false) - fi - - if use video_cards_freedreno || - use video_cards_vc4 || - use video_cards_vivante; then - gallium_enable -- kmsro - fi - - gallium_enable video_cards_vc4 vc4 - gallium_enable video_cards_vivante etnaviv - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - - # Only one i915 driver (classic vs gallium). Default to classic. - if ! use classic; then - gallium_enable video_cards_i915 i915 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - gallium_enable video_cards_intel i915 - fi - fi - - gallium_enable video_cards_iris iris - - 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 - gallium_enable video_cards_virgl virgl - - # opencl stuff - emesonargs+=( - -Dgallium-opencl="$(usex opencl icd disabled)" - ) - fi - - if use vulkan; then - vulkan_enable video_cards_i965 intel - vulkan_enable video_cards_iris intel - vulkan_enable video_cards_radeonsi amd - fi - - # x86 hardened pax_kernel needs glx-rts, bug 240956 - if [[ ${ABI} == x86 ]]; then - emesonargs+=( $(meson_use pax_kernel glx-read-only-text) ) - fi - - # Disable glx tls support on musl - if use elibc_musl; then - emesonargs+=( -Dglx-tls=false ) - fi - - # on abi_x86_32 hardened we need to have asm disable - if [[ ${ABI} == x86* ]] && use pic; then - emesonargs+=( -Dasm=false ) - fi - - if use gallium; then - gallium_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) - else - dri_driver_enable -- swrast - emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) - fi - - driver_list() { - local drivers="$(sort -u <<< "${1// /$'\n'}")" - echo "${drivers//$'\n'/,}" - } - - emesonargs+=( - $(meson_use test build-tests) - -Dglx=dri - -Dshared-glapi=true - $(meson_use dri3) - $(meson_use egl) - $(meson_use gbm) - $(meson_use gles1) - $(meson_use gles2) - $(meson_use libglvnd glvnd) - $(meson_use selinux) - -Dvalgrind=$(usex valgrind auto false) - -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") - -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") - -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - $(meson_use vulkan-overlay vulkan-overlay-layer) - --buildtype $(usex debug debug plain) - -Db_ndebug=$(usex debug false true) - ) - meson_src_configure -} - -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install - - use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so* -} - -multilib_src_install_all() { - einstalldocs -} - -multilib_src_test() { - meson test -v -C "${BUILD_DIR}" -t 100 -} - -pkg_postinst() { - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} -} - -# $1 - VIDEO_CARDS flag (check skipped for "--") -# other args - names of DRI drivers to enable -dri_driver_enable() { - if [[ $1 == -- ]] || use $1; then - shift - DRI_DRIVERS+=("$@") - fi -} - -gallium_enable() { - if [[ $1 == -- ]] || use $1; then - shift - GALLIUM_DRIVERS+=("$@") - fi -} - -vulkan_enable() { - if [[ $1 == -- ]] || use $1; then - shift - VULKAN_DRIVERS+=("$@") - fi -} diff --git a/media-libs/mesa/mesa-19.1.1-r1.ebuild b/media-libs/mesa/mesa-19.1.2.ebuild similarity index 98% rename from media-libs/mesa/mesa-19.1.1-r1.ebuild rename to media-libs/mesa/mesa-19.1.2.ebuild index a7bff8c..5333c84 100644 --- a/media-libs/mesa/mesa-19.1.1-r1.ebuild +++ b/media-libs/mesa/mesa-19.1.2.ebuild @@ -240,11 +240,9 @@ x86? ( )" PATCHES=( - "${FILESDIR}"/${PN}-19.1.0-execinfo.patch "${FILESDIR}"/${PN}-18-musl-invocation_name.patch "${FILESDIR}"/${PN}-18-musl-pthread.patch "${FILESDIR}"/${PN}-18.2.4-add-disable-tls-support.patch - "${FILESDIR}"/${PN}-19.1.0-cache_stack_overflow.patch ) llvm_check_deps() { @@ -255,9 +253,9 @@ llvm_check_deps() { fi if use opencl; then - has_version "sys-devel/clang[${flags}]" || return 1 + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 fi - has_version "sys-devel/llvm[${flags}]" + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" } pkg_pretend() {