diff options
Diffstat (limited to 'x11-libs/libXvMC/libXvMC-1.0.12.ebuild')
| -rw-r--r-- | x11-libs/libXvMC/libXvMC-1.0.12.ebuild | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild index bc60b8a91c31..d3db40e39822 100644 --- a/x11-libs/libXvMC/libXvMC-1.0.12.ebuild +++ b/x11-libs/libXvMC/libXvMC-1.0.12.ebuild @@ -14,7 +14,12 @@ IUSE="" RDEPEND=" >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] +<<<<<<< HEAD >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]" +======= + >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] + !<x11-base/xorg-proto-2019.2" +>>>>>>> next DEPEND="${RDEPEND} x11-base/xorg-proto" PDEPEND="app-eselect/eselect-xvmc" |