diff options
| author |   Alfred Wingate <parona@protonmail.com> | 2024-06-04 11:30:34 +0300 |
|---|---|---|
| committer |   Matt Turner <mattst88@gentoo.org> | 2024-06-05 16:01:30 -0400 |
| commit | 1c2216dd6b82337fbc9bdc5f9bc0005fe6f8e57b (patch) | |
| tree | 605274368214768c4f15d24ee17c94e56a7e0e9d /media-libs | |
| parent | media-libs/mesa: Raise meson requirement to 1.4.1 (diff) | |
| download | gentoo-1c2216dd6b82337fbc9bdc5f9bc0005fe6f8e57b.tar.gz gentoo-1c2216dd6b82337fbc9bdc5f9bc0005fe6f8e57b.tar.bz2 gentoo-1c2216dd6b82337fbc9bdc5f9bc0005fe6f8e57b.zip | |
media-libs/mesa: Depend on dev-python/packaging
* Mesa's meson check for mako uses dev-python/packaging or distutils
(dev-python/setuptools in python3.12). For simplicity add a dependency
on dev-python/packaging.
Closes: https://bugs.gentoo.org/933515
Closes: https://github.com/gentoo/gentoo/pull/37019
Signed-off-by: Alfred Wingate <parona@protonmail.com>
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/mesa/mesa-24.0.7.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-24.0.8-r1.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-24.0.8.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-24.1.0-r1.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-24.1.0.ebuild | 8 | ||||
| -rw-r--r-- | media-libs/mesa/mesa-9999.ebuild | 8 |
6 files changed, 36 insertions, 12 deletions
diff --git a/media-libs/mesa/mesa-24.0.7.ebuild b/media-libs/mesa/mesa-24.0.7.ebuild index 6728b6089ac8..079bc478b34e 100644 --- a/media-libs/mesa/mesa-24.0.7.ebuild +++ b/media-libs/mesa/mesa-24.0.7.ebuild @@ -137,7 +137,10 @@ BDEPEND=" app-alternatives/yacc app-alternatives/lex virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + ") vulkan? ( dev-util/glslang llvm? ( @@ -212,7 +215,8 @@ pkg_pretend() { } python_check_deps() { - python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1 + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1 if use llvm && use vulkan && use video_cards_intel && use amd64; then python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 fi diff --git a/media-libs/mesa/mesa-24.0.8-r1.ebuild b/media-libs/mesa/mesa-24.0.8-r1.ebuild index b676b84c8534..41c743d15fe6 100644 --- a/media-libs/mesa/mesa-24.0.8-r1.ebuild +++ b/media-libs/mesa/mesa-24.0.8-r1.ebuild @@ -137,7 +137,10 @@ BDEPEND=" app-alternatives/yacc app-alternatives/lex virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + ") vulkan? ( dev-util/glslang llvm? ( @@ -212,7 +215,8 @@ pkg_pretend() { } python_check_deps() { - python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1 + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1 if use llvm && use vulkan && use video_cards_intel && use amd64; then python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 fi diff --git a/media-libs/mesa/mesa-24.0.8.ebuild b/media-libs/mesa/mesa-24.0.8.ebuild index 53d40957a9fc..53ea99b9ba47 100644 --- a/media-libs/mesa/mesa-24.0.8.ebuild +++ b/media-libs/mesa/mesa-24.0.8.ebuild @@ -137,7 +137,10 @@ BDEPEND=" app-alternatives/yacc app-alternatives/lex virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + ") vulkan? ( dev-util/glslang llvm? ( @@ -212,7 +215,8 @@ pkg_pretend() { } python_check_deps() { - python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1 + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1 if use llvm && use vulkan && use video_cards_intel && use amd64; then python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 fi diff --git a/media-libs/mesa/mesa-24.1.0-r1.ebuild b/media-libs/mesa/mesa-24.1.0-r1.ebuild index 9979d5a20b5d..888fd8ec22dd 100644 --- a/media-libs/mesa/mesa-24.1.0-r1.ebuild +++ b/media-libs/mesa/mesa-24.1.0-r1.ebuild @@ -157,7 +157,10 @@ BDEPEND=" app-alternatives/yacc app-alternatives/lex virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + ") video_cards_intel? ( ~dev-util/intel_clc-${PV} dev-libs/libclc[spirv(-)] @@ -236,7 +239,8 @@ pkg_pretend() { } python_check_deps() { - python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1 + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1 if use llvm && use vulkan && use video_cards_intel && use amd64; then python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 fi diff --git a/media-libs/mesa/mesa-24.1.0.ebuild b/media-libs/mesa/mesa-24.1.0.ebuild index f9c4e1acfcbb..74f5ca28a2f6 100644 --- a/media-libs/mesa/mesa-24.1.0.ebuild +++ b/media-libs/mesa/mesa-24.1.0.ebuild @@ -157,7 +157,10 @@ BDEPEND=" app-alternatives/yacc app-alternatives/lex virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + ") video_cards_intel? ( ~dev-util/intel_clc-${PV} dev-libs/libclc[spirv(-)] @@ -236,7 +239,8 @@ pkg_pretend() { } python_check_deps() { - python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1 + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1 if use llvm && use vulkan && use video_cards_intel && use amd64; then python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 fi diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 50d2c5e467c7..ca78acc8f2a7 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -155,7 +155,10 @@ BDEPEND=" app-alternatives/yacc app-alternatives/lex virtual/pkgconfig - $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + $(python_gen_any_dep " + >=dev-python/mako-0.8.0[\${PYTHON_USEDEP}] + dev-python/packaging[\${PYTHON_USEDEP}] + ") video_cards_intel? ( ~dev-util/intel_clc-${PV} dev-libs/libclc[spirv(-)] @@ -233,7 +236,8 @@ pkg_pretend() { } python_check_deps() { - python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" || return 1 + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" && + python_has_version -b "dev-python/packaging[${PYTHON_USEDEP}]" || return 1 if use llvm && use vulkan && use video_cards_intel && use amd64; then python_has_version -b "dev-python/ply[${PYTHON_USEDEP}]" || return 1 fi |