commit: 3d1263e7486432859276f19e2341c4fcfd5b98f5 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Feb 15 06:22:36 2023 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Feb 15 06:22:36 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d1263e7
media-video/vlc: depend on <ffmpeg-5 for USE='ffmpeg vaapi' for 3.x Bug: https://bugs.gentoo.org/864721 Signed-off-by: Sam James <sam <AT> gentoo.org> media-video/vlc/vlc-3.0.18.ebuild | 8 ++++++-- media-video/vlc/vlc-3.0.9999.ebuild | 10 +++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/media-video/vlc/vlc-3.0.18.ebuild b/media-video/vlc/vlc-3.0.18.ebuild index e67e949893de..b0c2b68f0ae4 100644 --- a/media-video/vlc/vlc-3.0.18.ebuild +++ b/media-video/vlc/vlc-3.0.18.ebuild @@ -1,4 +1,4 @@ -# Copyright 2000-2022 Gentoo Authors +# Copyright 2000-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -60,6 +60,7 @@ BDEPEND=" amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) " +# <ffmpeg-5 dep for USE="ffmpeg vaapi" for bug #864721 RDEPEND=" media-libs/libvorbis net-dns/libidn:= @@ -201,7 +202,10 @@ RDEPEND=" udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6(+)] ) v4l? ( media-libs/libv4l:= ) - vaapi? ( media-libs/libva:=[drm(+),wayland?,X?] ) + vaapi? ( + <media-video/ffmpeg-5 + media-libs/libva:=[drm(+),wayland?,X?] + ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= ) diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index ceca1a3dae1d..1172500d37ef 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 2000-2022 Gentoo Authors +# Copyright 2000-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -20,7 +20,7 @@ else else SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz"; fi - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 -sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86" fi inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg @@ -60,6 +60,7 @@ BDEPEND=" amd64? ( dev-lang/yasm ) x86? ( dev-lang/yasm ) " +# <ffmpeg-5 dep for USE="ffmpeg vaapi" for bug #864721 RDEPEND=" media-libs/libvorbis net-dns/libidn:= @@ -201,7 +202,10 @@ RDEPEND=" udev? ( virtual/udev ) upnp? ( net-libs/libupnp:=[ipv6(+)] ) v4l? ( media-libs/libv4l:= ) - vaapi? ( media-libs/libva:=[drm(+),wayland?,X?] ) + vaapi? ( + <media-video/ffmpeg-5 + media-libs/libva:=[drm(+),wayland?,X?] + ) vdpau? ( x11-libs/libvdpau ) vnc? ( net-libs/libvncserver ) vpx? ( media-libs/libvpx:= )
