commit: df551ba490c1e658d5c0ca724964654a12b6aa76 Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> AuthorDate: Sat Jul 9 08:37:49 2016 +0000 Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> CommitDate: Sat Jul 9 08:37:49 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df551ba4
media-libs/mesa: block older libva-vdpau-driver due to file collisions Bug: https://bugs.gentoo.org/show_bug.cgi?id=588392 Package-Manager: portage-2.2.28 media-libs/mesa/mesa-12.0.1.ebuild | 5 ++++- media-libs/mesa/mesa-9999.ebuild | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/media-libs/mesa/mesa-12.0.1.ebuild b/media-libs/mesa/mesa-12.0.1.ebuild index 22068d2..3d273ed 100644 --- a/media-libs/mesa/mesa-12.0.1.ebuild +++ b/media-libs/mesa/mesa-12.0.1.ebuild @@ -107,7 +107,10 @@ RDEPEND=" !kernel_FreeBSD? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] ) - vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] ) + vaapi? ( + >=x11-libs/libva-1.6.0:=[${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.2.0:=[${MULTILIB_USEDEP}] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 22068d2..3d273ed 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -107,7 +107,10 @@ RDEPEND=" !kernel_FreeBSD? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) ) openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] ) - vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] ) + vaapi? ( + >=x11-libs/libva-1.6.0:=[${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.2.0:=[${MULTILIB_USEDEP}] ) xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
