commit: 66abe318f165c27ecd761c0639f11de3b768ae86 Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org> AuthorDate: Tue Feb 7 04:09:16 2023 +0000 Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org> CommitDate: Tue Feb 7 04:24:32 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66abe318
media-video/mpv: allow using raspberry-userland-bin Currently fails to build with non-bin wrt bug #893422, so let's at least allow this one. Runtime untested (have no raspberry-pi). (no revbump needed given it currently doesn't build with non-bin) Bug: https://bugs.gentoo.org/893422 Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org> media-video/mpv/mpv-0.35.0-r1.ebuild | 8 +++++++- media-video/mpv/mpv-0.35.1.ebuild | 8 +++++++- media-video/mpv/mpv-9999.ebuild | 8 +++++++- 3 files changed, 21 insertions(+), 3 deletions(-) diff --git a/media-video/mpv/mpv-0.35.0-r1.ebuild b/media-video/mpv/mpv-0.35.0-r1.ebuild index a67b869c76cc..355a3f826dcd 100644 --- a/media-video/mpv/mpv-0.35.0-r1.ebuild +++ b/media-video/mpv/mpv-0.35.0-r1.ebuild @@ -46,6 +46,7 @@ REQUIRED_USE=" xv? ( X )" RESTRICT="!test? ( test )" +# raspberry-pi: default to -bin given non-bin is known broken (bug #893422) COMMON_DEPEND=" media-libs/libass:=[fontconfig] media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?] @@ -93,7 +94,12 @@ COMMON_DEPEND=" opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) - raspberry-pi? ( media-libs/raspberrypi-userland ) + raspberry-pi? ( + || ( + media-libs/raspberrypi-userland-bin + media-libs/raspberrypi-userland + ) + ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) diff --git a/media-video/mpv/mpv-0.35.1.ebuild b/media-video/mpv/mpv-0.35.1.ebuild index b3fb03958f57..9a41edeb58eb 100644 --- a/media-video/mpv/mpv-0.35.1.ebuild +++ b/media-video/mpv/mpv-0.35.1.ebuild @@ -46,6 +46,7 @@ REQUIRED_USE=" xv? ( X )" RESTRICT="!test? ( test )" +# raspberry-pi: default to -bin given non-bin is known broken (bug #893422) COMMON_DEPEND=" media-libs/libass:=[fontconfig] media-video/ffmpeg:=[encode,threads,vaapi?,vdpau?] @@ -93,7 +94,12 @@ COMMON_DEPEND=" opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) - raspberry-pi? ( media-libs/raspberrypi-userland ) + raspberry-pi? ( + || ( + media-libs/raspberrypi-userland-bin + media-libs/raspberrypi-userland + ) + ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel ) diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 2c923f2ec44e..11323310aeb0 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -46,6 +46,7 @@ REQUIRED_USE=" xv? ( X )" RESTRICT="!test? ( test )" +# raspberry-pi: default to -bin given non-bin is known broken (bug #893422) COMMON_DEPEND=" media-libs/libass:=[fontconfig] >=media-video/ffmpeg-4.4:=[encode,threads,vaapi?,vdpau?] @@ -93,7 +94,12 @@ COMMON_DEPEND=" opengl? ( media-libs/libglvnd[X?] ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) - raspberry-pi? ( media-libs/raspberrypi-userland ) + raspberry-pi? ( + || ( + media-libs/raspberrypi-userland-bin + media-libs/raspberrypi-userland + ) + ) rubberband? ( media-libs/rubberband ) sdl? ( media-libs/libsdl2[sound,threads,video] ) sixel? ( media-libs/libsixel )
