diff options
| -rw-r--r-- | media-libs/mesa/Manifest | 2 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-21.1.4-r1.ebuild | 2 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-21.1.6.ebuild (renamed from media-libs/mesa/mesa-21.0.3.ebuild) | 30 |
3 files changed, 13 insertions, 21 deletions
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index fd1089e5..125d3711 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,2 +1,2 @@ -DIST mesa-21.0.3.tar.xz 14710004 BLAKE2B f2165da4487824931d8ff90e4f13624546a297b0d3577d69b7cfd6078a965282b4a732cb720cbb08ea83a3a987603cfe67876fb18022fa444b011fcc9b7df352 SHA512 4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f DIST mesa-21.1.4.tar.xz 15254812 BLAKE2B 7ec6177ad4fb6f053553b634c9ff03c5d618d0212fd77c2fda8803197bef529c74ccf3c3ae75a810ba1d57862f08405c6df702e41f6cb0fd202833ce7b9efef0 SHA512 1f4e2d8ba2c3c02bad5468687752d7e87d6e79c4a0e6ec4b2741a57fb270d18ae4712aaa07a9e09a2d3348540f5a26cdbe05464cd52adb8df1e2e28a581b2b53 +DIST mesa-21.1.6.tar.xz 15371108 BLAKE2B fb44778cc552d96bcc4e73c82c28a2a763be99d67e2d8cdea36e7b8e589b36afc2315ec0f984003c52bd27956baf2d6ddf787f34beae41c4944d95fc6cbcb05c SHA512 5daf389aad4fe7ab3574f6af3aabc62ba8b3034004a0a0853dcc18ef6c8003d2f2195cc377dc57b30863ae4cf158149e3156247445ca2b11e401700011cb878c diff --git a/media-libs/mesa/mesa-21.1.4-r1.ebuild b/media-libs/mesa/mesa-21.1.4-r1.ebuild index 0ae0768f..74aa23a9 100644 --- a/media-libs/mesa/mesa-21.1.4-r1.ebuild +++ b/media-libs/mesa/mesa-21.1.4-r1.ebuild @@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz" - KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86" + KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" fi LICENSE="MIT" diff --git a/media-libs/mesa/mesa-21.0.3.ebuild b/media-libs/mesa/mesa-21.1.6.ebuild index fdca7041..ceeef251 100644 --- a/media-libs/mesa/mesa-21.0.3.ebuild +++ b/media-libs/mesa/mesa-21.1.6.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{7,8,9} ) -inherit llvm meson multilib-minimal python-any-r1 linux-info +inherit llvm meson-multilib python-any-r1 linux-info OPENGL_DIR="xorg-x11" @@ -19,7 +19,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz" - KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86" + KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86" fi LICENSE="MIT" @@ -73,7 +73,7 @@ REQUIRED_USE=" zink? ( gallium vulkan ) " -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.100" +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105" RDEPEND=" >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] @@ -142,9 +142,10 @@ 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="11" +LLVM_MAX_SLOT="12" LLVM_DEPSTR=" || ( + sys-devel/llvm:12[${MULTILIB_USEDEP}] sys-devel/llvm:11[${MULTILIB_USEDEP}] sys-devel/llvm:10[${MULTILIB_USEDEP}] ) @@ -242,7 +243,7 @@ x86? ( )" PATCHES=( - "${FILESDIR}"/${PN}-21.0.3-add-disable-tls-support.patch + "${FILESDIR}"/${PN}-21.1.4-add-disable-tls-support.patch ) llvm_check_deps() { @@ -509,6 +510,11 @@ multilib_src_configure() { echo "${drivers//$'\n'/,}" } + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + emesonargs+=( $(meson_use test build-tests) -Dglx=$(usex X dri disabled) @@ -525,26 +531,12 @@ multilib_src_configure() { -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") - $(meson_use vulkan vulkan-device-select-layer) - $(meson_use vulkan-overlay vulkan-overlay-layer) --buildtype $(usex debug debug plain) -Db_ndebug=$(usex debug false true) ) meson_src_configure } -multilib_src_compile() { - meson_src_compile -} - -multilib_src_install() { - meson_src_install -} - -multilib_src_install_all() { - einstalldocs -} - multilib_src_test() { meson_src_test -t 100 } |