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

diff --git a/media-libs/mesa/mesa-12.0.1.ebuild b/media-libs/mesa/mesa-12.0.1.ebuild
index 22068d2950594938bad81e82434a82652e5b0e2e..3d273ed85a3046e0860bfce74fd8e39621d89e67 100644 (file)
--- 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 22068d2950594938bad81e82434a82652e5b0e2e..3d273ed85a3046e0860bfce74fd8e39621d89e67 100644 (file)
--- 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}] )