From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <gentoo-commits+bounces-1484553-garchives=archives.gentoo.org@lists.gentoo.org> Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 2CA8E15800F for <garchives@archives.gentoo.org>; Tue, 7 Feb 2023 04:26:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id F2416E0845; Tue, 7 Feb 2023 04:26:49 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D80D5E0845 for <gentoo-commits@lists.gentoo.org>; Tue, 7 Feb 2023 04:26:49 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 883EC335DAF for <gentoo-commits@lists.gentoo.org>; Tue, 7 Feb 2023 04:26:48 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AF0AB7FB for <gentoo-commits@lists.gentoo.org>; Tue, 7 Feb 2023 04:26:46 +0000 (UTC) From: "Ionen Wolkens" <ionen@gentoo.org> To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ionen Wolkens" <ionen@gentoo.org> Message-ID: <1675743872.66abe318f165c27ecd761c0639f11de3b768ae86.ionen@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/mpv/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/mpv/mpv-0.35.0-r1.ebuild media-video/mpv/mpv-0.35.1.ebuild media-video/mpv/mpv-9999.ebuild X-VCS-Directories: media-video/mpv/ X-VCS-Committer: ionen X-VCS-Committer-Name: Ionen Wolkens X-VCS-Revision: 66abe318f165c27ecd761c0639f11de3b768ae86 X-VCS-Branch: master Date: Tue, 7 Feb 2023 04:26:46 +0000 (UTC) Precedence: bulk List-Post: <mailto:gentoo-commits@lists.gentoo.org> List-Help: <mailto:gentoo-commits+help@lists.gentoo.org> List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org> List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org> List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org> X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 115645d4-f2ca-49f4-90bf-9817f958b906 X-Archives-Hash: 7027282b5c13a4efe35e3a4fef4e2db8 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 )