| 1 |
commit: df551ba490c1e658d5c0ca724964654a12b6aa76 |
| 2 |
Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jul 9 08:37:49 2016 +0000 |
| 4 |
Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jul 9 08:37:49 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df551ba4 |
| 7 |
|
| 8 |
media-libs/mesa: block older libva-vdpau-driver due to file collisions |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=588392 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
|
| 14 |
media-libs/mesa/mesa-12.0.1.ebuild | 5 ++++- |
| 15 |
media-libs/mesa/mesa-9999.ebuild | 5 ++++- |
| 16 |
2 files changed, 8 insertions(+), 2 deletions(-) |
| 17 |
|
| 18 |
diff --git a/media-libs/mesa/mesa-12.0.1.ebuild b/media-libs/mesa/mesa-12.0.1.ebuild |
| 19 |
index 22068d2..3d273ed 100644 |
| 20 |
--- a/media-libs/mesa/mesa-12.0.1.ebuild |
| 21 |
+++ b/media-libs/mesa/mesa-12.0.1.ebuild |
| 22 |
@@ -107,7 +107,10 @@ RDEPEND=" |
| 23 |
!kernel_FreeBSD? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) |
| 24 |
) |
| 25 |
openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] ) |
| 26 |
- vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] ) |
| 27 |
+ vaapi? ( |
| 28 |
+ >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] |
| 29 |
+ video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) |
| 30 |
+ ) |
| 31 |
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) |
| 32 |
wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] ) |
| 33 |
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) |
| 34 |
|
| 35 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
| 36 |
index 22068d2..3d273ed 100644 |
| 37 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 38 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
| 39 |
@@ -107,7 +107,10 @@ RDEPEND=" |
| 40 |
!kernel_FreeBSD? ( virtual/libelf:0=[${MULTILIB_USEDEP}] ) |
| 41 |
) |
| 42 |
openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] ) |
| 43 |
- vaapi? ( >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] ) |
| 44 |
+ vaapi? ( |
| 45 |
+ >=x11-libs/libva-1.6.0:=[${MULTILIB_USEDEP}] |
| 46 |
+ video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) |
| 47 |
+ ) |
| 48 |
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) |
| 49 |
wayland? ( >=dev-libs/wayland-1.2.0:=[${MULTILIB_USEDEP}] ) |
| 50 |
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) |
Archives