diff options
Diffstat (limited to 'media-libs/mesa')
-rw-r--r-- | media-libs/mesa/Manifest | 14 | ||||
-rw-r--r-- | media-libs/mesa/mesa-17.3.9.ebuild | 2 | ||||
-rw-r--r-- | media-libs/mesa/mesa-18.0.5.ebuild (renamed from media-libs/mesa/mesa-18.0.4.ebuild) | 2 | ||||
-rw-r--r-- | media-libs/mesa/mesa-18.1.0.ebuild | 572 | ||||
-rw-r--r-- | media-libs/mesa/mesa-18.1.1-r1.ebuild (renamed from media-libs/mesa/mesa-18.1.0-r1.ebuild) | 12 | ||||
-rw-r--r-- | media-libs/mesa/mesa-18.1.1.ebuild | 2 | ||||
-rw-r--r-- | media-libs/mesa/mesa-9999.ebuild | 283 |
7 files changed, 136 insertions, 751 deletions
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index e8ef68761ee6..15d2a2452d14 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,12 +1,10 @@ AUX eselect-mesa.conf.9.2 1630 BLAKE2B 6c67ef9b5dc94f2f26378c004a459680b05084900a9199107a23f9c55514b59438265bce9ca207b05e2d20c3aa43e475d3f228c283dc965402c962a4cd0b6ebf SHA512 0fa9a23b4fba10599268266a82c7fa8dc5bfa1a0d565732875064c381dc4ff40c23faddb02b5849b1522eb9b7fd2ec2a0fac14406442a4aa0afa44bf760b42b5 DIST mesa-17.3.9.tar.xz 10660456 BLAKE2B 54f4a75f9040e50e9eea8f5c52a276578379d25d2a01ac4767ab12bee85fe5dae1492d5bb1df06b6e8c6b0fe960bbd5ea38691c75d08a6b4302c64377ce58e54 SHA512 83deffbc6b9823b8e93cccf57d7952106f3d55fea881e3924f9f9586f0e9347a6e3a1a36cc19c24af819f2fde3af9496652a6ff56132511a5618d5774404f63f -DIST mesa-18.0.4.tar.xz 10939356 BLAKE2B 6bbf19f4e547be3be7385f6e8b094444fe78c0e1ac04d42f1e762ec92d83a53c06bae987b63a542553df4a8a1e17c0b3738e2db6faf356897f49b8d7efd5845c SHA512 f9a14be46c209661ceb318add1611481445d13b47e95c7a5d2a5e5ecfdd5d2c3fa9c2b16b30035bbb8d61ccc7cb65bfa6698ac8b040273e5ab045a951a67752c -DIST mesa-18.1.0.tar.xz 11118776 BLAKE2B 0da5486e96596b3f919f15d2db9cd12de825811a0f2222bb76859bb7d275914dda0cc19a518b269fa0745d52982b92d5d645b6da639a870709193db721262658 SHA512 8b26af2df8b94373cbc339521974cd568c1d4ff4204986ee7b439e4cf3ebe14d822ea081a7769b68eca9263b7bc6dbca01836b8bb0d6495d2e2614c4e3d601ad +DIST mesa-18.0.5.tar.xz 10952996 BLAKE2B 708cdb2ef95a618430cd4e7eb45bcab0f6575774065b61f53787aa378385fe0dfa0b04f9c80c5426f9581851edc545a75c137777dc304ac8ba57465d365fcd50 SHA512 63b47cdca7f8282aab7aaa66233411f02918e5c4804b7a0010de2b1867fe90171e492ff031dfc4aa20968dfc99bd7dceb5d35fd44c709e54a2ece61175a60f3d DIST mesa-18.1.1.tar.xz 11110892 BLAKE2B 05d48379109c1c3800d3d07b9f52e96b2cd4bc087517711ee752f89619afce0a0e09b7a9ede8b5d1807ceae3e2b506518657a0760c947f466121e2252f7eada3 SHA512 7783adc1ec7a1c3d092acfcca6b4ba19450c15a7f0d7f41fbf25e482236615d79ce24afe60959066ea7aa851df4f74fa3c569fa6d847ea79e6bfe046b8c65e90 -EBUILD mesa-17.3.9.ebuild 14426 BLAKE2B 1b6e0152cae7d03daff8c214d5ba17e2e320d8f989c8ade3b1c146bfe6d3da14540cf43a78b244d855acc709f9a464d0362ce145fc51ae0b6b3bd24f75c7964e SHA512 dd5f69042a0432a4b820ecd5263c8269956b6e2063e95f645d1b845d744d322d348c67d6aa017666c0694f38e03cda1609e1dc507107328255363700a2796ce3 -EBUILD mesa-18.0.4.ebuild 14381 BLAKE2B d96d38ef80c12c0e9b11ce47a85fa4b3a0c4b384909b925100415d294b5b7a71b3c88669c819f212fcf768c14f1b5efbe51bc7963e9e80cbaebc6378c1158567 SHA512 8b921bed35cd1005bceb0b05855a0043e556b2353fb66bb2bef42e826a0da44719aace06d57f494dce1435fbe947a25e65c39e285bfc63d90a832b7aa76fcbeb -EBUILD mesa-18.1.0-r1.ebuild 13046 BLAKE2B 03d99409c58c30b06b5b1856ce473efec46d1267bd433c0bc0220319e3fc451b4d2aa0feb3575524f7d2b678d4c7fbce0ed9ea88207397811039afa502c920f5 SHA512 116c1da138fa14855e4f1d2f73603c9730eef4cae9e1aa331976d73408ab815922856ce4e832e0240fbffe25103ad0355db0dffc0b3cbdd211f9765d515a7be1 -EBUILD mesa-18.1.0.ebuild 14419 BLAKE2B 2ce7eb2718a4107f121f9a084283702cd3b9c1f6d869f05829e1e472ce9ed729172dd4681322aa60d7c513aa5f7e59409cf450e5db0f47e4c69b57859fdde0b6 SHA512 b763c0326360736c259cf55b15a730b3fa1c450d424f39d9822d2b4bb21b7e906a1ec33d25fa2222a858b88fcfdbabff555b553ad7238087eba0540308528847 -EBUILD mesa-18.1.1.ebuild 13046 BLAKE2B 03d99409c58c30b06b5b1856ce473efec46d1267bd433c0bc0220319e3fc451b4d2aa0feb3575524f7d2b678d4c7fbce0ed9ea88207397811039afa502c920f5 SHA512 116c1da138fa14855e4f1d2f73603c9730eef4cae9e1aa331976d73408ab815922856ce4e832e0240fbffe25103ad0355db0dffc0b3cbdd211f9765d515a7be1 -EBUILD mesa-9999.ebuild 13046 BLAKE2B 03d99409c58c30b06b5b1856ce473efec46d1267bd433c0bc0220319e3fc451b4d2aa0feb3575524f7d2b678d4c7fbce0ed9ea88207397811039afa502c920f5 SHA512 116c1da138fa14855e4f1d2f73603c9730eef4cae9e1aa331976d73408ab815922856ce4e832e0240fbffe25103ad0355db0dffc0b3cbdd211f9765d515a7be1 +EBUILD mesa-17.3.9.ebuild 14421 BLAKE2B f60b36e7ef9f6a3631a9db2ae15375aefd3ab29d82cadf14908577aad0f1d1a208a8734207e84fc79b313014f3ccc5fed03cf82e51922fceaf8e966088954b60 SHA512 d5400d63c4c44630e80d0a5c4bbda0f2449208630907fd50fc362f3e724ec81003205642da5457ae246b5392728b27afaea621d3b5287e1fb70ce7ad3b5cf5ad +EBUILD mesa-18.0.5.ebuild 14376 BLAKE2B 4631d39a37936ca8660bfbbbaeceb2c31fae34a84a8713f817b2bde87e438b43384bcd543c2a32a17ab95b88c87c843b0622bd256ff3882b638f400962a78cf6 SHA512 b2c612e863b37a3e8e056907fbd4aa0cd4fd20fc5cd9ce3fb21a1e84c40c58b3d5976c83f9c5585c9e1f1e3d20ff39ad40d07bf780b7b2f63185d500137e6157 +EBUILD mesa-18.1.1-r1.ebuild 13369 BLAKE2B fda4a58fe25d1c5fc16fa8710924095b3bd7b8b07f36aa1dcdd34fe3f2e76ba771ffddc40e7d21a61beca4932ac88b69e293c0eb25e298b3598cb9da452d5c8c SHA512 6aa45ea27f6a166f571e58a9ac3690ebae854092667636967771a4d622b457e91c7e6234d42bce7afebe1fdf0357efa828d0366bc98dc93dbe20bb849ec57a09 +EBUILD mesa-18.1.1.ebuild 13041 BLAKE2B 7b9578fae60728474e7a33776b59b78415772be46afcf2597c787c1ee489c85ce6a351fb94efd13ac267ed5e134df91ad1db120b90ed7065de4e648573170659 SHA512 b9ca1aa333646315dd419664c45ec71e9f9554b55d9ce14679e4489dcba9448bee7a5db50a4a341698f2dbda0d4ac878a590016f68775f732dad020692e323fe +EBUILD mesa-9999.ebuild 12143 BLAKE2B 4900a624fb12f537f4a7dca0a22e9592a73176b637a0afddba827a6c6d6342fd211d3afc065051b51768a8db75ace58c27c365f2c42b73c856e40a199146bb7c SHA512 47ed0e058a7c9937fc3bddc0b53cccf9c34a128788d186a2ed2d9a58331ddadad5bfab04842d8df0b33fe23a8bbd6b2933fcf893c649d1a5c534224b0354dafe MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705 diff --git a/media-libs/mesa/mesa-17.3.9.ebuild b/media-libs/mesa/mesa-17.3.9.ebuild index 378c8541a722..6a26d1b522d9 100644 --- a/media-libs/mesa/mesa-17.3.9.ebuild +++ b/media-libs/mesa/mesa-17.3.9.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" diff --git a/media-libs/mesa/mesa-18.0.4.ebuild b/media-libs/mesa/mesa-18.0.5.ebuild index 944b89c49377..0f5fe7b791a0 100644 --- a/media-libs/mesa/mesa-18.0.4.ebuild +++ b/media-libs/mesa/mesa-18.0.5.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" diff --git a/media-libs/mesa/mesa-18.1.0.ebuild b/media-libs/mesa/mesa-18.1.0.ebuild deleted file mode 100644 index cf00b47b8bc8..000000000000 --- a/media-libs/mesa/mesa-18.1.0.ebuild +++ /dev/null @@ -1,572 +0,0 @@ -# Copyright 1999-2018 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/ 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 ) - 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=" - 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.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.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] ) -" - -# 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_user - [[ ${PV} == 9999 ]] && 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 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 /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-18.1.0-r1.ebuild b/media-libs/mesa/mesa-18.1.1-r1.ebuild index 70702be097dc..616c90765a3b 100644 --- a/media-libs/mesa/mesa-18.1.0-r1.ebuild +++ b/media-libs/mesa/mesa-18.1.1-r1.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" @@ -115,7 +115,7 @@ RDEPEND=" ) vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) wayland? ( - >=dev-libs/wayland-1.11.0:=[${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}] ) @@ -401,6 +401,14 @@ multilib_src_configure() { 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" diff --git a/media-libs/mesa/mesa-18.1.1.ebuild b/media-libs/mesa/mesa-18.1.1.ebuild index 70702be097dc..5e8a02ef74dd 100644 --- a/media-libs/mesa/mesa-18.1.1.ebuild +++ b/media-libs/mesa/mesa-18.1.1.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" diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 70702be097dc..65c767803a3c 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -3,16 +3,9 @@ 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} +inherit llvm meson multilib-minimal pax-utils python-any-r1 OPENGL_DIR="xorg-x11" @@ -21,8 +14,10 @@ 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="" +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 ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" @@ -30,7 +25,10 @@ fi LICENSE="MIT" SLOT="0" -RESTRICT="!bindist? ( bindist )" +RESTRICT=" + !bindist? ( bindist ) + !test? ( test ) +" RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware" @@ -39,9 +37,9 @@ for card in ${VIDEO_CARDS}; do 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" + bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 +llvm + lm_sensors +nptl opencl osmesa pax_kernel openmax pic selinux test unwind + vaapi valgrind vdpau vulkan wayland xvmc xa" REQUIRED_USE=" d3d9? ( dri3 gallium ) @@ -88,37 +86,40 @@ RDEPEND=" >=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}] + 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}] + ) ) - video_cards_r600? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] + lm_sensors? ( sys-apps/lm_sensors:= ) + 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 ) - video_cards_radeon? ( - 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}] ) ) - 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.11.0:=[${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}] ) ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] video_cards_intel? ( @@ -215,17 +216,12 @@ DEPEND="${RDEPEND} 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 - 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}]") " @@ -236,7 +232,7 @@ QA_WX_LOAD=" x86? ( !pic? ( usr/lib*/libglapi.so.0.0.0 - usr/lib*/libGLESv1_CM.so.1.1.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 @@ -269,55 +265,46 @@ pkg_setup() { python-any-r1_pkg_setup } -src_prepare() { - eapply_user - [[ ${PV} == 9999 ]] && eautoreconf -} - multilib_src_configure() { - local myconf + local emesonargs=() if use classic; then - # Configurable DRI drivers - driver_enable swrast - # Intel code - driver_enable video_cards_i915 i915 - driver_enable video_cards_i965 i965 + dri_driver_enable video_cards_i915 i915 + dri_driver_enable video_cards_i965 i965 if ! use video_cards_i915 && \ ! use video_cards_i965; then - driver_enable video_cards_intel i915 i965 + dri_driver_enable video_cards_intel i915 i965 fi # Nouveau code - driver_enable video_cards_nouveau nouveau + dri_driver_enable video_cards_nouveau nouveau # ATI code - driver_enable video_cards_r100 radeon - driver_enable video_cards_r200 r200 + dri_driver_enable video_cards_r100 r100 + dri_driver_enable video_cards_r200 r200 if ! use video_cards_r100 && \ - ! use video_cards_r200; then - driver_enable video_cards_radeon radeon r200 + ! use video_cards_r200; then + dri_driver_enable video_cards_radeon r100 r200 fi fi if use egl; then - myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")" + emesonargs+=( -Dplatforms=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 + emesonargs+=( + $(meson_use d3d9 gallium-nine) + $(meson_use llvm) + -Dgallium-omx=$(usex openmax bellagio disabled) + $(meson_use vaapi gallium-vaapi) + $(meson_use vdpau gallium-vdpau) + $(meson_use xa gallium-xa) + $(meson_use xvmc gallium-xvmc) + ) + use vaapi && emesonargs+=( -Dva-libs-path=/usr/$(get_libdir)/va/drivers ) + gallium_enable video_cards_vc4 vc4 gallium_enable video_cards_vivante etnaviv gallium_enable video_cards_vmware svga @@ -333,17 +320,16 @@ multilib_src_configure() { gallium_enable video_cards_r600 r600 gallium_enable video_cards_radeonsi radeonsi if ! use video_cards_r300 && \ - ! use video_cards_r600; then + ! 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" - " + emesonargs+=( + -Dgallium-opencl="$(usex opencl standalone disabled)" + ) fi gallium_enable video_cards_virgl virgl @@ -351,55 +337,59 @@ multilib_src_configure() { if use vulkan; then vulkan_enable video_cards_i965 intel - vulkan_enable video_cards_radeonsi radeon + vulkan_enable video_cards_radeonsi amd fi # x86 hardened pax_kernel needs glx-rts, bug 240956 if [[ ${ABI} == x86 ]]; then - myconf+=" $(use_enable pax_kernel glx-read-only-text)" + 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 - myconf+=" --disable-asm" + emesonargs+=( -Dasm=false ) fi if use gallium; then - myconf+=" $(use_enable osmesa gallium-osmesa)" + GALLIUM_DRIVERS+="swrast " + emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) else - myconf+=" $(use_enable osmesa)" + DRI_DRIVERS+="swrast " + emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) 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} + driver_list() { + arr=($(printf "%s\n" "$@" | sort -u | tr '\n' ',')) + echo "${arr: : -1}" + } + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=dri + -Dshared-glapi=true + $(meson_use !bindist texture-float) + $(meson_use d3d9 gallium-nine) + $(meson_use dri3) + $(meson_use egl) + $(meson_use gbm) + $(meson_use gles1) + $(meson_use gles2) + $(meson_use unwind libunwind) + $(meson_use lm_sensors lmsensors) + -Dvalgrind=$(usex valgrind auto false) + -Ddri-drivers=$(driver_list ${DRI_DRIVERS}) + -Dgallium-drivers=$(driver_list ${GALLIUM_DRIVERS}) + -Dvulkan-drivers=$(driver_list ${VULKAN_DRIVERS}) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile } multilib_src_install() { - emake install DESTDIR="${D}" + meson_src_install if use opencl; then ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" @@ -424,7 +414,6 @@ multilib_src_install() { } multilib_src_install_all() { - find "${ED}" -name '*.la' -delete einstalldocs if use !bindist; then @@ -433,14 +422,7 @@ multilib_src_install_all() { } 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 + meson_src_test } pkg_postinst() { @@ -478,54 +460,23 @@ pkg_prerm() { # $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 +dri_driver_enable() { + if use $1; then + shift + DRI_DRIVERS+="$@ " + fi } 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 + if use $1; then + shift + GALLIUM_DRIVERS+="$@ " + fi } 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 + if use $1; then + shift + VULKAN_DRIVERS+="$@ " + fi } |