commit: 646cb2d69be268e47c9e3b36f34311476d416937
Author: Paul Zander <negril.nx+gentoo <AT> gmail <DOT> com>
AuthorDate: Mon May 13 14:20:45 2024 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 5 20:01:31 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=646cb2d6
media-libs/mesa: rename zink -> video_cards_zink
zink is listed among the gallium drivers so mirror that.
Signed-off-by: Paul Zander <negril.nx+gentoo <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/mesa/mesa-24.1.0-r1.ebuild | 10 +++++-----
media-libs/mesa/mesa-9999.ebuild | 10 +++++-----
profiles/arch/alpha/package.use.mask | 2 +-
profiles/arch/hppa/package.use.mask | 2 +-
profiles/arch/ia64/package.use.mask | 2 +-
profiles/arch/powerpc/package.use.stable.mask | 2 +-
profiles/arch/s390/package.use.mask | 2 +-
profiles/arch/sparc/package.use.mask | 2 +-
profiles/desc/video_cards.desc | 1 +
9 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/media-libs/mesa/mesa-24.1.0-r1.ebuild
b/media-libs/mesa/mesa-24.1.0-r1.ebuild
index 888fd8ec22dd..98068e596279 100644
--- a/media-libs/mesa/mesa-24.1.0-r1.ebuild
+++ b/media-libs/mesa/mesa-24.1.0-r1.ebuild
@@ -46,7 +46,7 @@ LICENSE="MIT SGI-B-2.0"
SLOT="0"
RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk
panfrost v3d vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk
panfrost v3d vc4 virgl vivante vmware zink"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
@@ -55,7 +55,7 @@ IUSE="${IUSE_VIDEO_CARDS}
cpu_flags_x86_sse2 d3d9 debug +llvm
lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
test unwind vaapi valgrind vdpau vulkan
- vulkan-overlay wayland +X xa zink +zstd"
+ vulkan-overlay wayland +X xa +zstd"
RESTRICT="!test? ( test )"
REQUIRED_USE="
d3d9? (
@@ -73,10 +73,10 @@ REQUIRED_USE="
video_cards_lavapipe? ( llvm vulkan )
video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_zink? ( vulkan opengl )
video_cards_nvk? ( vulkan video_cards_nouveau )
vdpau? ( X )
xa? ( X )
- zink? ( opengl vulkan )
"
LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.119"
@@ -112,6 +112,7 @@ RDEPEND="
)
vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
+ video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
@@ -124,7 +125,6 @@ RDEPEND="
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
)
- zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
"
for card in ${RADEON_CARDS}; do
@@ -366,7 +366,7 @@ multilib_src_configure() {
gallium_enable video_cards_virgl virgl
gallium_enable video_cards_vivante etnaviv
gallium_enable video_cards_vmware svga
- gallium_enable zink zink
+ gallium_enable video_cards_zink zink
gallium_enable video_cards_r300 r300
gallium_enable video_cards_r600 r600
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index ca78acc8f2a7..bced699ca70a 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -46,7 +46,7 @@ LICENSE="MIT SGI-B-2.0"
SLOT="0"
RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk
panfrost v3d vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lavapipe lima nouveau nvk
panfrost v3d vc4 virgl vivante vmware zink"
for card in ${VIDEO_CARDS}; do
IUSE_VIDEO_CARDS+=" video_cards_${card}"
done
@@ -55,7 +55,7 @@ IUSE="${IUSE_VIDEO_CARDS}
cpu_flags_x86_sse2 d3d9 debug +llvm
lm-sensors opencl +opengl osmesa +proprietary-codecs selinux
test unwind vaapi valgrind vdpau vulkan
- vulkan-overlay wayland +X xa zink +zstd"
+ vulkan-overlay wayland +X xa +zstd"
RESTRICT="!test? ( test )"
REQUIRED_USE="
d3d9? (
@@ -73,10 +73,10 @@ REQUIRED_USE="
video_cards_lavapipe? ( llvm vulkan )
video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) )
video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_zink? ( vulkan opengl )
video_cards_nvk? ( vulkan video_cards_nouveau )
vdpau? ( X )
xa? ( X )
- zink? ( opengl vulkan )
"
LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.119"
@@ -112,6 +112,7 @@ RDEPEND="
)
vdpau? ( >=x11-libs/libvdpau-1.5:=[${MULTILIB_USEDEP}] )
video_cards_radeonsi? ( virtual/libelf:0=[${MULTILIB_USEDEP}] )
+ video_cards_zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] )
${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
@@ -124,7 +125,6 @@ RDEPEND="
x11-libs/libXfixes[${MULTILIB_USEDEP}]
x11-libs/xcb-util-keysyms[${MULTILIB_USEDEP}]
)
- zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
"
for card in ${RADEON_CARDS}; do
@@ -363,7 +363,7 @@ multilib_src_configure() {
gallium_enable video_cards_virgl virgl
gallium_enable video_cards_vivante etnaviv
gallium_enable video_cards_vmware svga
- gallium_enable zink zink
+ gallium_enable video_cards_zink zink
gallium_enable video_cards_r300 r300
gallium_enable video_cards_r600 r600
diff --git a/profiles/arch/alpha/package.use.mask
b/profiles/arch/alpha/package.use.mask
index 8789d3aaa07c..0776dff352be 100644
--- a/profiles/arch/alpha/package.use.mask
+++ b/profiles/arch/alpha/package.use.mask
@@ -250,7 +250,7 @@ mail-filter/pyzor mysql
# Matt Turner <matts...@gentoo.org> (2020-08-11)
# No drivers on this architecture support Vulkan
-media-libs/mesa vulkan vulkan-overlay zink
+media-libs/mesa video_cards_zink vulkan vulkan-overlay zink
# Sergei Trofimovich <sly...@gentoo.org> (2020-07-18)
# net-libs/webkit-gtk has no alpha keywords
diff --git a/profiles/arch/hppa/package.use.mask
b/profiles/arch/hppa/package.use.mask
index 1350b08d459d..f48150514c33 100644
--- a/profiles/arch/hppa/package.use.mask
+++ b/profiles/arch/hppa/package.use.mask
@@ -250,7 +250,7 @@ dev-libs/efl avif lua_single_target_luajit physics
# Matt Turner <matts...@gentoo.org> (2020-08-11)
# No drivers on this architecture support Vulkan
-media-libs/mesa vulkan vulkan-overlay zink
+media-libs/mesa video_cards_zink vulkan vulkan-overlay zink
# Robin H. Johnson <robb...@gentoo.org> (2020-07-02)
# Mask io-uring & zbc pending keywording
diff --git a/profiles/arch/ia64/package.use.mask
b/profiles/arch/ia64/package.use.mask
index c51e084cdf1c..931d0d3d8933 100644
--- a/profiles/arch/ia64/package.use.mask
+++ b/profiles/arch/ia64/package.use.mask
@@ -231,7 +231,7 @@ net-analyzer/wireshark gui ilbc
# Matt Turner <matts...@gentoo.org> (2020-08-11)
# No drivers on this architecture support Vulkan
-media-libs/mesa vulkan vulkan-overlay zink
+media-libs/mesa video_cards_zink vulkan vulkan-overlay zink
# Michał Górny <mgo...@gentoo.org> (2020-06-14)
# Requires dev-python/networkx.
diff --git a/profiles/arch/powerpc/package.use.stable.mask
b/profiles/arch/powerpc/package.use.stable.mask
index d534d544a17e..5d6791cd8cd2 100644
--- a/profiles/arch/powerpc/package.use.stable.mask
+++ b/profiles/arch/powerpc/package.use.stable.mask
@@ -45,7 +45,7 @@ media-sound/jack2 ieee1394
# Sam James <s...@gentoo.org> (2020-07-30)
# vulkan-loader and glslang are not yet stable on ppc
-media-libs/mesa vulkan vulkan-overlay zink
+media-libs/mesa video_cards_zink vulkan vulkan-overlay zink
# Sergei Trofimovich <sly...@gentoo.org> (2019-12-12)
# Needs stable net-libs/webkit-gtk, bug #684702
diff --git a/profiles/arch/s390/package.use.mask
b/profiles/arch/s390/package.use.mask
index 3f1e43fa394d..b0cfa527331f 100644
--- a/profiles/arch/s390/package.use.mask
+++ b/profiles/arch/s390/package.use.mask
@@ -206,7 +206,7 @@ dev-python/diskcache test
# Matt Turner <matts...@gentoo.org> (2020-08-11)
# No drivers on this architecture support Vulkan
-media-libs/mesa vulkan vulkan-overlay zink
+media-libs/mesa video_cards_zink vulkan vulkan-overlay zink
# Hans de Graaff <gra...@gentoo.org> (2019-04-08)
# Obsolete ruby version, no newer versions keyworded or stable.
diff --git a/profiles/arch/sparc/package.use.mask
b/profiles/arch/sparc/package.use.mask
index a27c74642a24..4d1773b16ee7 100644
--- a/profiles/arch/sparc/package.use.mask
+++ b/profiles/arch/sparc/package.use.mask
@@ -307,7 +307,7 @@ media-libs/libsdl2 fcitx4
# Matt Turner <matts...@gentoo.org> (2020-08-11)
# No drivers on this architecture support Vulkan
-media-libs/mesa vulkan vulkan-overlay zink
+media-libs/mesa video_cards_zink vulkan vulkan-overlay zink
# Robin H. Johnson <robb...@gentoo.org> (2020-07-02)
# Mask io-uring & zbc pending keywording
diff --git a/profiles/desc/video_cards.desc b/profiles/desc/video_cards.desc
index f03d0d11b5ea..e54f4b53d7bd 100644
--- a/profiles/desc/video_cards.desc
+++ b/profiles/desc/video_cards.desc
@@ -43,3 +43,4 @@ virgl - VIDEO_CARDS setting to build driver for virgil
(virtual 3D GPU)
virtualbox - VIDEO_CARDS setting to build driver for virtualbox emulation
vivante - VIDEO_CARDS setting to build etnaviv driver for vivante video cards
vmware - VIDEO_CARDS setting to build driver for vmware video cards
+zink - VIDEO_CARDS setting to build Zink OpenGL-over-Vulkan Gallium driver
