From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1352918-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))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id 89A7E158086
	for <garchives@archives.gentoo.org>; Sun, 26 Dec 2021 22:32:09 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 389752BC00E;
	Sun, 26 Dec 2021 22:32:07 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
	(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 752F22BC00E
	for <gentoo-commits@lists.gentoo.org>; Sun, 26 Dec 2021 22:32:06 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
	(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 40504342CFC
	for <gentoo-commits@lists.gentoo.org>; Sun, 26 Dec 2021 22:32:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id B2962233
	for <gentoo-commits@lists.gentoo.org>; Sun, 26 Dec 2021 22:32:02 +0000 (UTC)
From: "Mart Raudsepp" <leio@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, "Mart Raudsepp" <leio@gentoo.org>
Message-ID: <1640557854.40e38423f0a01fe541251f8d543dcc9506f494a3.leio@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/cheese/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-video/cheese/cheese-41.1.ebuild
X-VCS-Directories: media-video/cheese/
X-VCS-Committer: leio
X-VCS-Committer-Name: Mart Raudsepp
X-VCS-Revision: 40e38423f0a01fe541251f8d543dcc9506f494a3
X-VCS-Branch: master
Date: Sun, 26 Dec 2021 22:32:02 +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: 1c84b11c-5f33-441f-a8b7-7e99519e14bd
X-Archives-Hash: 086660c5d2ecc529207c2abab9e1ac0e

commit:     40e38423f0a01fe541251f8d543dcc9506f494a3
Author:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 26 22:30:54 2021 +0000
Commit:     Mart Raudsepp <leio <AT> gentoo <DOT> org>
CommitDate: Sun Dec 26 22:30:54 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40e38423

media-video/cheese: allow pipewiresrc as camerabin provider

If pipewiresrc is present, camerabin seems to pick it. Allow uninstalling
gst-plugins-v4l2 in such cases by listing both options.
gst-plugins-v4l2 is kept as the first choice to avoid a USE flag for now
and just allow pipewire at runtime as an option, if already present. This
could/should change and be revisited later.

Bug: https://bugs.gentoo.org/830018
Package-Manager: Portage-3.0.20, Repoman-3.0.2
Signed-off-by: Mart Raudsepp <leio <AT> gentoo.org>

 media-video/cheese/cheese-41.1.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/media-video/cheese/cheese-41.1.ebuild b/media-video/cheese/cheese-41.1.ebuild
index 67324c0a5595..8d6ed3e1b4b3 100644
--- a/media-video/cheese/cheese-41.1.ebuild
+++ b/media-video/cheese/cheese-41.1.ebuild
@@ -38,7 +38,10 @@ RDEPEND="${DEPEND}
 	>=media-libs/gst-plugins-good-1.4:1.0
 
 	>=media-plugins/gst-plugins-jpeg-1.4:1.0
-	>=media-plugins/gst-plugins-v4l2-1.4:1.0
+	|| (
+		>=media-plugins/gst-plugins-v4l2-1.4:1.0
+		media-video/pipewire[gstreamer,v4l]
+	)
 	>=media-plugins/gst-plugins-vpx-1.4:1.0
 "