diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2019-11-03 16:06:58 +0000 |
commit | bd4aeefe33e63f613512604e47bfca7b2187697d (patch) | |
tree | adb35b5a9a00ee7ea591ab0c987f70167c23b597 /media-libs/mesa | |
parent | 48ece6662cbd443015f5a57ae6d8cbdbd69ef37c (diff) |
gentoo resync : 03.11.2019
Diffstat (limited to 'media-libs/mesa')
-rw-r--r-- | media-libs/mesa/Manifest | 10 | ||||
-rw-r--r-- | media-libs/mesa/mesa-19.1.8.ebuild (renamed from media-libs/mesa/mesa-19.2.1.ebuild) | 78 | ||||
-rw-r--r-- | media-libs/mesa/mesa-19.2.2.ebuild (renamed from media-libs/mesa/mesa-19.2.0.ebuild) | 2 | ||||
-rw-r--r-- | media-libs/mesa/mesa-9999.ebuild | 67 |
4 files changed, 75 insertions, 82 deletions
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 819165747574..57c22919a7b7 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,8 +1,8 @@ DIST mesa-19.1.7.tar.xz 10941152 BLAKE2B 6be14ddac404668bdd8b7b8756388019c3610ac41b65a7723a419b97b7eccbca666ad6d904f4cde186c4b171e056636a8a6a5727e30963c8fa177d7861bd6cfb SHA512 0865b5f91e5daa00e1da2b3d8b65fe5d2ff6332372bf8fec7d671d05d8d64ec5a7abea1858cdfc506c76b7226d2bea0af3426565f156b796d8e0f949ea33dc15 -DIST mesa-19.2.0.tar.xz 11464180 BLAKE2B f2f260e9efb928532501ff4f1c0137621f954991ef6d30fbdc61c28fb95e3ddb9e81276d345bc7bff6871e603dcbb29073b788427d0dea565dfa9b7f8b88966d SHA512 7278bbfba9c29fe91d1959ff1a48422e917db85287460523d12ae8c6d7f49f76e9636bf4c0d8d7d89e5569b3c67135f1b23b8f6c9d52d39413d8ec22e3bb40f0 -DIST mesa-19.2.1.tar.xz 11468492 BLAKE2B 9f6a1a5426343213a19dccb07917326b887ddc6ec02426b0604bea35a529f33c18ca46e2db09eb44c5b4a3b6e70da5f8fc7e049b1a0febd35d0de8f2ec4d2641 SHA512 decd74976fe866bf67fac4ae55a62d8e33ad24278dd58effe533e7d258b249f0ead848360e7e71444265184c6d9d9b04361caf0c6df99504e33599e7a0cd6c5d +DIST mesa-19.1.8.tar.xz 10945480 BLAKE2B df2ce0561cd0a61f0f35a406a5a9b2384c0c5869efadabfa40b07cf96a592214aa5c6d03423598c531f117075c3b59aa5af6f9b1c5dfa5914aabe41f60b592a0 SHA512 3bcc90c17cf966ce3399434ca2d4f363c5778e52c56b8184d6cdf22ef2e4a4fdb9c3fbff5c98efc856e3535f81259608a6daa74af1f3bdce30ea251d86435c74 +DIST mesa-19.2.2.tar.xz 11456352 BLAKE2B b0900a486d5883759dc395a25195c46fbc90d0388840099d515713a3c1e27560ea6cf9f6bfc5987c9704593b174e26f49a4cd08ff1260b1c1b2197b56c6919b6 SHA512 a3269052c2dfb5404180d1aebd68f5b9b0cc136d634ba89fed3f60fcc9b279072e09ee2db9b485375d39e886209053841df920c9d0b975e0de2825e3da4164a5 EBUILD mesa-19.1.7.ebuild 14241 BLAKE2B dbdd629eb1f7ec6ad67de25e693e5a05217e425f107ced5cae65e8410112b686cbd1f71098eda8943ba728f0e038860e347c147fa75b1e6e67e7420d2421576f SHA512 b5b86b2f9866bcc8494493bd38bc9cdba20596f129fafcb37804758a387d4d2d61ca17d2f06876029b59619ce2699f0334d6ec7198b2758924f5d4c1c26c8d45 -EBUILD mesa-19.2.0.ebuild 14526 BLAKE2B 8ca920ff157fed73f06017bf652f6198b1bc3e15eb61b14bd5913db2229102c71e059c49548916c6f74c8f2b970b6e2e150ea1457ba505afc742f21b878916f7 SHA512 b55adfd15be011702608b1d02c04633bb31de958db3dd971fb9594d5411a8a3dfaed38de96325c7754c598202b436f9c0cb994345b055d0857c5804181041ced -EBUILD mesa-19.2.1.ebuild 14526 BLAKE2B 8ca920ff157fed73f06017bf652f6198b1bc3e15eb61b14bd5913db2229102c71e059c49548916c6f74c8f2b970b6e2e150ea1457ba505afc742f21b878916f7 SHA512 b55adfd15be011702608b1d02c04633bb31de958db3dd971fb9594d5411a8a3dfaed38de96325c7754c598202b436f9c0cb994345b055d0857c5804181041ced -EBUILD mesa-9999.ebuild 14526 BLAKE2B 8ca920ff157fed73f06017bf652f6198b1bc3e15eb61b14bd5913db2229102c71e059c49548916c6f74c8f2b970b6e2e150ea1457ba505afc742f21b878916f7 SHA512 b55adfd15be011702608b1d02c04633bb31de958db3dd971fb9594d5411a8a3dfaed38de96325c7754c598202b436f9c0cb994345b055d0857c5804181041ced +EBUILD mesa-19.1.8.ebuild 14252 BLAKE2B 54705ada2d5498b384b907345c3c3a0f5585c0e35c0e1939491f500effbbcfaa6ffe7d65476e08bb2122724bc637f91dfed56a70cc86c38db2c2a75c43f7326a SHA512 65db524a107262eb682363172d23178e341a26adb8f4d5b33f69900ecdf9083427c19126180a54b356061494eb6d3d7af45e776a8ddf60f116a055317b7b5f34 +EBUILD mesa-19.2.2.ebuild 14529 BLAKE2B 32f66c7981c79569b03e561fad1dff4a6bc2cef2ab895732f354d60c25e61df34ee045e782f5f0151f13f1dd348824367b0ed6b6d6b81e21a8d959dda3df9e7a SHA512 ba0d797949a1b1be41cf1436dac3ff41d5708148a3c3647c8ce91ef1a22a78a44e418306aec62bac72fd23b534764de78bdf53e9de8173f7fd3fd53dbe05fdb9 +EBUILD mesa-9999.ebuild 14594 BLAKE2B ca59d90c807441c8f556dde89a06f8fe2e2c8dec78bc85caa78ae1e046448940c5ae5efbf654b57bb95e23415970e379ca31530ec9496c66525aa2e5cd35de7c SHA512 9e49ac1228c6002d1ad5855c4eef6097cedcd35589207c95282ef42a7c7d1201323b88417d8d5809ea8cacff5c1983037532df9c429273392dab5ca478da40a5 MISC metadata.xml 2000 BLAKE2B c38c6f85a08bdb71f3921847d03c8a2849a43def253c200cb3f21d68142f3a5065cb2e1a2170093d91f3aba34c99fdd9bab840f2bc62ce05f11484b2edb3cb40 SHA512 d55b9c0ff6a97d995a150ee10643c869359370222ab29712da25f69c5671a4e6988e2d508c956082cc7165db96f42289d25daecf230d36efe2240e4f377d1c72 diff --git a/media-libs/mesa/mesa-19.2.1.ebuild b/media-libs/mesa/mesa-19.1.8.ebuild index cad8a11cea0e..da2c1a3b3255 100644 --- a/media-libs/mesa/mesa-19.2.1.ebuild +++ b/media-libs/mesa/mesa-19.1.8.ebuild @@ -16,6 +16,7 @@ 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" @@ -29,15 +30,15 @@ RESTRICT=" " RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware" +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 selinux test unwind vaapi valgrind - vdpau vulkan vulkan-overlay wayland +X xa xvmc" + +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 ) ) @@ -53,9 +54,7 @@ REQUIRED_USE=" video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_iris? ( gallium ) - video_cards_lima? ( gallium ) video_cards_nouveau? ( || ( classic gallium ) ) - video_cards_panfrost? ( gallium ) video_cards_radeon? ( || ( classic gallium ) gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) video_cards_r100? ( classic ) @@ -67,17 +66,22 @@ REQUIRED_USE=" video_cards_virgl? ( gallium ) video_cards_vivante? ( gallium gbm ) video_cards_vmware? ( gallium ) - xa? ( X ) - xvmc? ( X ) " -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99" +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-1.2.0[${MULTILIB_USEDEP}] + media-libs/libglvnd[${MULTILIB_USEDEP}] !app-eselect/eselect-opengl ) !libglvnd? ( @@ -120,15 +124,6 @@ RDEPEND=" ) video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) - X? ( - >=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}] - ) " for card in ${RADEON_CARDS}; do RDEPEND="${RDEPEND} @@ -147,10 +142,9 @@ RDEPEND="${RDEPEND} # 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="10" +LLVM_MAX_SLOT="9" LLVM_DEPSTR=" || ( - sys-devel/llvm:10[${MULTILIB_USEDEP}] sys-devel/llvm:9[${MULTILIB_USEDEP}] sys-devel/llvm:8[${MULTILIB_USEDEP}] sys-devel/llvm:7[${MULTILIB_USEDEP}] @@ -216,10 +210,8 @@ unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} DEPEND="${RDEPEND} valgrind? ( dev-util/valgrind ) - X? ( - x11-libs/libXrandr[${MULTILIB_USEDEP}] - x11-base/xorg-proto - ) + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-base/xorg-proto " BDEPEND=" ${PYTHON_DEPS} @@ -238,12 +230,13 @@ EGIT_CHECKOUT_DIR=${S} QA_WX_LOAD=" x86? ( - 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 - libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 ) + !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() { @@ -356,7 +349,7 @@ multilib_src_configure() { fi fi - emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") ) + emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") ) if use gallium; then emesonargs+=( @@ -410,15 +403,11 @@ multilib_src_configure() { fi if use video_cards_freedreno || - use video_cards_lima || - use video_cards_panfrost || use video_cards_vc4 || use video_cards_vivante; then gallium_enable -- kmsro fi - gallium_enable video_cards_lima lima - gallium_enable video_cards_panfrost panfrost gallium_enable video_cards_vc4 vc4 gallium_enable video_cards_vivante etnaviv gallium_enable video_cards_vmware svga @@ -463,6 +452,11 @@ multilib_src_configure() { 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) ) @@ -478,7 +472,7 @@ multilib_src_configure() { emesonargs+=( $(meson_use test build-tests) - -Dglx=$(usex X dri disabled) + -Dglx=dri -Dshared-glapi=true $(meson_use dri3) $(meson_use egl) @@ -505,7 +499,7 @@ multilib_src_compile() { multilib_src_install() { meson_src_install - use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc + use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so* } multilib_src_install_all() { @@ -517,11 +511,9 @@ multilib_src_test() { } pkg_postinst() { - if ! use libglvnd; then - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} - fi + # Switch to the xorg implementation. + echo + eselect opengl set --use-old ${OPENGL_DIR} } # $1 - VIDEO_CARDS flag (check skipped for "--") diff --git a/media-libs/mesa/mesa-19.2.0.ebuild b/media-libs/mesa/mesa-19.2.2.ebuild index cad8a11cea0e..9fb49167ff44 100644 --- a/media-libs/mesa/mesa-19.2.0.ebuild +++ b/media-libs/mesa/mesa-19.2.2.ebuild @@ -77,7 +77,7 @@ RDEPEND=" >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] libglvnd? ( - >=media-libs/libglvnd-1.2.0[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.2.0-r1[${MULTILIB_USEDEP}] !app-eselect/eselect-opengl ) !libglvnd? ( diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index cad8a11cea0e..8f593918a1ac 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -71,13 +71,13 @@ REQUIRED_USE=" xvmc? ( X ) " -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99" +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" RDEPEND=" !app-eselect/eselect-mesa >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] libglvnd? ( - >=media-libs/libglvnd-1.2.0[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.2.0-r1[${MULTILIB_USEDEP}] !app-eselect/eselect-opengl ) !libglvnd? ( @@ -114,7 +114,6 @@ RDEPEND=" >=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] ) ) @@ -161,51 +160,53 @@ 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? ( + gallium? ( + llvm? ( + opencl? ( + video_cards_r600? ( ${CLANG_DEPSTR_AMDGPU} ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( + !video_cards_r600? ( + video_cards_radeonsi? ( ${CLANG_DEPSTR_AMDGPU} ) ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( + !video_cards_r600? ( !video_cards_radeonsi? ( - ${CLANG_DEPSTR} + 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? ( + !opencl? ( + video_cards_r600? ( ${LLVM_DEPSTR_AMDGPU} ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( + !video_cards_r600? ( + video_cards_radeonsi? ( ${LLVM_DEPSTR_AMDGPU} ) ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( + !video_cards_r600? ( !video_cards_radeonsi? ( - ${LLVM_DEPSTR} + video_cards_radeon? ( + ${LLVM_DEPSTR_AMDGPU} + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + ${LLVM_DEPSTR} + ) ) ) ) |