diff options
author | 2018-07-07 22:06:38 +0200 | |
---|---|---|
committer | 2018-07-07 22:06:38 +0200 | |
commit | 1540904f67c2fac8f40e39b2a7459079fe5cbbb1 (patch) | |
tree | 4eada7bba23306ed92f4039d8491c0b0d0b7b052 | |
parent | app-crypt/sbsigntool(s): add back support for LibreSSL in addition to OpenSSL... (diff) | |
download | ennui-1540904f67c2fac8f40e39b2a7459079fe5cbbb1.tar.gz ennui-1540904f67c2fac8f40e39b2a7459079fe5cbbb1.tar.bz2 ennui-1540904f67c2fac8f40e39b2a7459079fe5cbbb1.zip |
media-libs/mesa: trim v9999, add v18.1.3
-rw-r--r-- | media-libs/mesa/Manifest | 6 | ||||
-rw-r--r-- | media-libs/mesa/mesa-18.1.2.ebuild | 543 | ||||
-rw-r--r-- | media-libs/mesa/mesa-18.1.3.ebuild (renamed from media-libs/mesa/mesa-9999.ebuild) | 83 |
3 files changed, 567 insertions, 65 deletions
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index f1c1b6a..4c2bfd4 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -6,5 +6,9 @@ AUX mesa-18-intel-missing-time_t.patch 475 BLAKE2B e8378aafc5ace88e03b425309dda7 AUX mesa-18-musl-increase-pthread-stack-size.patch 929 BLAKE2B b4bb448cdaaddcb8d91cfbcacf6c27792aa6c5beba732933d7324f9a060b3f8b2a6800bc5c0ae1c7422ddbfe6389f89174aca81c4a5dd1f219ebdedcde25800c SHA512 c1dcdb7be316114aa2114b8923ad88f17050fbaee906d7e5976e3b8cd5c2b333a48dfc851e4342e9587b14cb62d9c6088dbab1e094b4ba77cc72dd3ad71a90e7 AUX mesa-18-musl-pthread.patch 2404 BLAKE2B 8c1207116d407b0739145271c353be513b279a4ea4ccdb70c85e1a45e156cc1d3a1b0fecae92d05333bdf5fb845927e3bcef718a73a92d0119445c5f8f59f744 SHA512 7c80b0cf70ea0dbcec85371de6db634e02321042fc80983ad61a75896c4fea1f88fe891993f181932d00b2f8474acc389530aeccf7e2ee48319c555bfb3c2331 DIST mesa-18.1.1.tar.xz 11110892 BLAKE2B 05d48379109c1c3800d3d07b9f52e96b2cd4bc087517711ee752f89619afce0a0e09b7a9ede8b5d1807ceae3e2b506518657a0760c947f466121e2252f7eada3 SHA512 7783adc1ec7a1c3d092acfcca6b4ba19450c15a7f0d7f41fbf25e482236615d79ce24afe60959066ea7aa851df4f74fa3c569fa6d847ea79e6bfe046b8c65e90 +DIST mesa-18.1.2.tar.xz 11124408 BLAKE2B 8327f16f41d59e6ec8d4145a8399503cf04799d437e336714760e4bdc563c483583363e32d41affc2365e977b96494156300910b1834bc9957504b6c0cf168fa SHA512 1b896ecc42c2f81813d551a2b14d271d274a948fa10bf5b7a567417690316c2ab7e7fdd52fe004732cd1a47661ba91acf7d5b21e3b3f28e21b50aadbfa96a5d5 +DIST mesa-18.1.3.tar.xz 11126236 BLAKE2B 2315cdc95130ef604a86e3886abf9b15e6c7944fab3b3cc020358dd08a76f2b876904516e5c081d549b16240ae4dedd647402dd7bd8de4c91015bb601c0c2923 SHA512 f6e5b81a80a309a36a04759d18364d3c71c48d1cb88f87b2f5432ef003092a22046e88ce2082031d5d52b60ba36f585d8df52e06ecc7a5158079936236f36887 EBUILD mesa-18.1.1.ebuild 13405 BLAKE2B 74a56e9a6bb5083a6160f23fa6d0743cd66e51869c33cf34a21b5c4359df4ad146b3228afd9ff3c08d92090b1f644ac7582a34cc490a2a637d11e99c71fcbe5d SHA512 a9f43a04c3b516b65a834e5e88af3031794dff41a9f7ed227187567888dff82dc01386cef2e89d799a4cb147f027f822344f5b3a6dca43e831a2310d0401add0 -EBUILD mesa-9999.ebuild 15272 BLAKE2B 28c04dfab46118d90bcbd711478efe61e18466a89fe2d9e9f0a9eeaae24813184ae557f22611696ac90e95d42c4967b31845860b61e7b4a290cf6ee2f7544510 SHA512 373ae8c1926e2e92ec47006ab8eb8e0949b00f0763025cfcc9213f103969d69e036c63b6f724a9de8f4b0b91b63e670196fe0887183e8c1802ea365cb240dba3 +EBUILD mesa-18.1.2.ebuild 13546 BLAKE2B e00511ab26544f20ab49cff0d32b0cde08df80e9995b511e3413c5c7bc7dc34f344c22f67cd0540a12acb1d517f727ed4785c1eb1413c7d4d062da5c4ae61e7e SHA512 d3857afc00c8fd7f8fb29a9832dd5f97241b3f3a97a4c7733ef7d67ef44ab7076276ddc5fe0547a216aeffde295ce617226a6e2ac1d2dd3e87962569fda9c8d8 +EBUILD mesa-18.1.3.ebuild 13659 BLAKE2B 0a1350611c58eebd1e7d5e86afb00e401025cf0cb0c6fdf0a25e4385e2412f26cccda4d95b5cae2199ee4d656f2176bd78ae323709f3a0e09e3f368be104595c SHA512 3b8220262606f05b468a042cff1264270cdea936c4d5b303409e11cb8d6b9c60d62fbd5c97fc1789278d2c8c7ddc55a0fa41d7adaad3e2f6fd062865d6c17804 +EBUILD mesa-9999.ebuild 13224 BLAKE2B 25a9cbfc4732d34365e5ba234540540b371e3bfb8c6d1734592058d870ae213f70329ef2cc9aa8a66851961835dfc3abc7203f03f3786eb92638105a93296710 SHA512 c83c5d2b4587c97c8ad6febd6798b345818b5a07135e7c8990c245d8f8717c216b9dbf86c240746920777c8f18d7627bf21f7d356234f89bc21cd09a4d2a5415 diff --git a/media-libs/mesa/mesa-18.1.2.ebuild b/media-libs/mesa/mesa-18.1.2.ebuild new file mode 100644 index 0000000..2dc67de --- /dev/null +++ b/media-libs/mesa/mesa-18.1.2.ebuild @@ -0,0 +1,543 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +EGIT_REPO_URI="https://gitlab.freedesktop.org/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/ https://mesa.freedesktop.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 virgl 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 || ( video_cards_r600 video_cards_radeonsi ) ) + 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_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.91" +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}] + 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}] + ) + ) + opencl? ( + app-eselect/eselect-opencl + dev-libs/libclc + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + openmax? ( + >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] + x11-misc/xdg-utils + ) + 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.15.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] ) +" + +# 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_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/gettext + virtual/pkgconfig + valgrind? ( dev-util/valgrind ) + x11-base/xorg-proto + vulkan? ( + $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_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 + ) +)" + +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_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 +} + +src_prepare() { + eapply "${FILESDIR}"/${PN}-18-execinfo.patch + eapply "${FILESDIR}"/${PN}-17-musl-invocation_name.patch + eapply "${FILESDIR}"/${PN}-18-musl-pthread.patch + + eapply_user + eautoreconf +} + +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-bellagio) + $(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 + + gallium_enable video_cards_virgl virgl + 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 \ + --disable-opencl-icd \ + --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 wayland; then + # These files are now provided by >=dev-libs/wayland-1.15.0 + rm "${ED}/usr/$(get_libdir)/libwayland-egl.so" || die + rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1" || die + rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1.0.0" || die + rm "${ED}/usr/$(get_libdir)/pkgconfig/wayland-egl.pc" || die + 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 +} + +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} + + # 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 /usr/share/doc/${P}/patents.txt.bz2 for an" + elog "explanation." + 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 +} diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-18.1.3.ebuild index a7a7751..b8ec7df 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-18.1.3.ebuild @@ -3,7 +3,7 @@ EAPI=6 -EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git" +EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" if [[ ${PV} = 9999 ]]; then GIT_ECLASS="git-r3" @@ -46,7 +46,7 @@ IUSE="${IUSE_VIDEO_CARDS} REQUIRED_USE=" d3d9? ( dri3 gallium ) llvm? ( gallium ) - opencl? ( gallium llvm ) + opencl? ( gallium llvm || ( video_cards_r600 video_cards_radeonsi ) ) openmax? ( gallium ) gles1? ( egl ) gles2? ( egl ) @@ -76,14 +76,8 @@ REQUIRED_USE=" " LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.91" -# 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-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}] @@ -121,7 +115,7 @@ RDEPEND=" ) vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) wayland? ( - >=dev-libs/wayland-9999:=[${MULTILIB_USEDEP}] + >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] >=dev-libs/wayland-protocols-1.8 ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) @@ -149,6 +143,7 @@ RDEPEND="${RDEPEND} # 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="6" LLVM_DEPSTR=" || ( sys-devel/llvm:7[${MULTILIB_USEDEP}] @@ -224,15 +219,7 @@ DEPEND="${RDEPEND} 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}] + x11-base/xorg-proto vulkan? ( $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]") ) @@ -284,15 +271,15 @@ pkg_setup() { } src_prepare() { - [[ ${PV} == 9999 ]] && eautoreconf eapply "${FILESDIR}"/${PN}-18-execinfo.patch eapply "${FILESDIR}"/${PN}-17-musl-invocation_name.patch eapply "${FILESDIR}"/${PN}-18-musl-pthread.patch - eapply "${FILESDIR}"/${PN}-18-musl-increase-pthread-stack-size.patch - - eautoreconf + eapply "${FILESDIR}"/${PN}-18-intel-missing-time_t.patch eapply_user + [[ ${PV} == 9999 ]] && eautoreconf + + eautoreconf } multilib_src_configure() { @@ -323,8 +310,7 @@ multilib_src_configure() { fi if use egl; then - # trim Wayland platform -- the wayland-egl.so frontend library is provided by Wayland itself now - myconf+=" --with-platforms=x11,surfaceless$(use gbm && echo ",drm")" + myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")" fi if use gallium; then @@ -401,6 +387,7 @@ multilib_src_configure() { --enable-glx \ --enable-shared-glapi \ $(use_enable !bindist texture-float) \ + $(use_enable d3d9 nine) \ $(use_enable debug) \ $(use_enable dri3) \ $(use_enable egl) \ @@ -422,37 +409,14 @@ multilib_src_configure() { 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 $? + if use wayland; then + # These files are now provided by >=dev-libs/wayland-1.15.0 + rm "${ED}/usr/$(get_libdir)/libwayland-egl.so" || die + rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1" || die + rm "${ED}/usr/$(get_libdir)/libwayland-egl.so.1.0.0" || die + rm "${ED}/usr/$(get_libdir)/pkgconfig/wayland-egl.pc" || die fi + if use opencl; then ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" @@ -482,10 +446,6 @@ multilib_src_install_all() { 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() { @@ -504,11 +464,6 @@ pkg_postinst() { 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} |