diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2019-10-13 21:54:24 +0100 |
| commit | da491770b9ba5f179e18db461c49cb6f1ccf0e1f (patch) | |
| tree | d3e34a8bd906741ab18cf69d8d4f732853e26ade /x11-libs/libXvMC/libXvMC-1.0.12.ebuild | |
| parent | ad6182343997a405079870a2fe91c4e0c6b94595 (diff) | |
| parent | 5a165c60b9b8c4847067cb83b4be7da785d01f93 (diff) | |
gentoo resync : 28.09.2019
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" |