commit:     e7f7793a7a9cc721ee350ae3a75861fbf2c7e639
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 13 16:16:00 2018 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 13 16:16:15 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7f7793a

media-libs/mesa: Version bump to 18.2.7

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-libs/mesa/Manifest           |   1 +
 media-libs/mesa/mesa-18.2.7.ebuild | 515 +++++++++++++++++++++++++++++++++++++
 2 files changed, 516 insertions(+)

diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 73002af7ddb..990ece0f3ca 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,4 +1,5 @@
 DIST mesa-18.2.5.tar.xz 11365620 BLAKE2B 
401fbbcb0e56a97122c11b7d47e506fe86795e942ca412abfa0c29010434447d96bc17fa0e7fc43090c94d7907fc0acaed5f7dada164e8906dca43da0b64a932
 SHA512 
dd454c720241dffa61f3380be62479979a43004b2a52293b817bd3ea95f75960edee680e7380a13fae09b67a90dc0393e4a022d543db91b2f142f2468a9661f0
 DIST mesa-18.2.6.tar.xz 11384440 BLAKE2B 
33c2f5425a98d71ec813b52cc24e9934b0617438279f77c5f5d4bf9dba85931d387bf5c852ddf1f036c4baf7ca23761c8422eb2c61b84eeebea71e510c91335c
 SHA512 
a7dd02f67384bb800dff70a0672a968ced96bb438605cdb39bde3e468d4dcf6162414a44e5da1abe7a1831fceb6f23e6c850eb5f80cfc5ee3861c14924c10ed4
+DIST mesa-18.2.7.tar.xz 11356060 BLAKE2B 
efad9f46ab1a5d007accce557da717ae69fe49e56f7a4bc90193b91a7d7be22ac899fc37d66fd6e9844091450c999a0288515f3ea39612d3fbe63b426a9690ac
 SHA512 
81f7b7108352cb3d8cf4b600ce2b0db6eb8420df550bf9f7087d83c2ab0f8dc32abe188f8ce5f52066e432fb64d9d17fc0edfbc9d0cb0650d0041f14064d9d77
 DIST mesa-18.3.0.tar.xz 11865356 BLAKE2B 
e9529a6257b3dd914e9bfe5c88bfbc30d652a045dfd9ed1387b12db9e6a89968b3affc5bc91d4d773035c505f32c3749216ae3666787bf97f1b23dcd8e0f7d3a
 SHA512 
6643d8a100c50efee7178fe950e7cccad24c3a98538d3a13c7c6570add30a56776b4e5f279e2b0a20c4038e682e9461ca5a4fd4ac23a7f60d2f4a0c972525c42
 DIST mesa-18.3.1.tar.xz 11865960 BLAKE2B 
6863a6d3891d1d2916139f71a5beefd7d83c81a0753d2c6885126636647cb5f7332dc308a9927f149951b122770ed07bc96ff5361dd23fbe1e07fb31d9c05147
 SHA512 
a68d39158cf1e868d70730d0641a0cfe4c6e5b3cd1bc0c47f54022402aca03503933084f6ddc722bf88c9b6d1281ba5c847ec4fed8092a9b33f90527d08e12db

diff --git a/media-libs/mesa/mesa-18.2.7.ebuild 
b/media-libs/mesa/mesa-18.2.7.ebuild
new file mode 100644
index 00000000000..ee7b0483c94
--- /dev/null
+++ b/media-libs/mesa/mesa-18.2.7.ebuild
@@ -0,0 +1,515 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_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 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 +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.93"
+RDEPEND="
+       !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.13:=[${MULTILIB_USEDEP}]
+       x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+       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. < 7.
+# 3. Specify LLVM_MAX_SLOT, e.g. 6.
+LLVM_MAX_SLOT="7"
+LLVM_DEPSTR="
+       || (
+               sys-devel/llvm:7[${MULTILIB_USEDEP}]
+               sys-devel/llvm:6[${MULTILIB_USEDEP}]
+               sys-devel/llvm:5[${MULTILIB_USEDEP}]
+               sys-devel/llvm:4[${MULTILIB_USEDEP}]
+               >=sys-devel/llvm-3.9.0:0[${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
+       )
+)"
+
+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
+}
+
+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=/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
+
+       # 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 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
+}
+
+multilib_src_install_all() {
+       einstalldocs
+}
+
+multilib_src_test() {
+       meson_src_test
+}
+
+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
+}

Reply via email to