[gentoo-commits] repo/proj/guru:dev commit in: media-tv/droidcam/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: media-tv/droidcam/
Date: Mon, 17 Aug 2020 17:34:18 +0000 (UTC)	[thread overview]
Message-ID: <1597685596.d3fbf3f3d1fb15564448f0f79a0496f3d6b246bc.andrewammerlaan@gentoo> (raw)

commit:     d3fbf3f3d1fb15564448f0f79a0496f3d6b246bc
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Aug 17 17:30:47 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Aug 17 17:33:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d3fbf3f3

media-tv/droidcam: simplify ebuild

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 media-tv/droidcam/droidcam-1.4-r1.ebuild | 24 ++++++++++--------------
 media-tv/droidcam/metadata.xml           |  1 -
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/media-tv/droidcam/droidcam-1.4-r1.ebuild b/media-tv/droidcam/droidcam-1.4-r1.ebuild
index 7d447b5..123dc40 100644
--- a/media-tv/droidcam/droidcam-1.4-r1.ebuild
+++ b/media-tv/droidcam/droidcam-1.4-r1.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="audio gtk usb"
+IUSE="gtk"
 
 # Requires connection to android phone
 RESTRICT="test"
@@ -27,7 +27,7 @@ DEPEND="
 	media-libs/libjpeg-turbo
 	>=media-libs/speex-1.2.0-r1
 	media-video/ffmpeg
-	usb? ( dev-util/android-tools )
+	dev-util/android-tools
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3
 	x11-libs/libX11
@@ -49,9 +49,11 @@ DOC_CONTENTS="
 
 BUILD_TARGETS="all"
 MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
-CONFIG_CHECK="VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
 MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
 
+CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
+ERROR_SND_ALOOP="CONFIG_SND_ALOOP is required for audio support"
+
 PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
 
 src_prepare() {
@@ -65,13 +67,6 @@ src_prepare() {
 
 src_configure() {
 	set_arch_to_kernel
-	if use audio ; then
-		if linux_config_exists ; then
-			if ! linux_chkconfig_present SND_ALOOP ; then
-				die "Audio requested but CONFIG_SND_ALOOP not selected in config!"
-			fi
-		fi
-	fi
 	default
 }
 
@@ -109,8 +104,10 @@ src_install() {
 	# so we just put it in modules-load.d to make sure it always works
 	insinto /etc/modules-load.d
 	doins "${FILESDIR}"/${PN}-video.conf
-	if use audio && linux_chkconfig_module SND_ALOOP ; then
-		doins "${FILESDIR}"/${PN}-audio.conf
+	if linux_config_exists ; then
+		if linux_chkconfig_module SND_ALOOP ; then
+			doins "${FILESDIR}"/${PN}-audio.conf
+		fi
 	fi
 
 	newdoc "${FILESDIR}"/${PN}-modprobe.conf ${PN}.conf.default
@@ -123,8 +120,7 @@ pkg_postinst() {
 		xdg_pkg_postinst
 	else
 		elog
-		elog "Only droidcam-cli has been installed since no 'gtk' flag was present"
-		elog "in the USE list."
+		elog "Only droidcam-cli has been installed since 'gtk' flag was not set"
 		elog
 	fi
 

diff --git a/media-tv/droidcam/metadata.xml b/media-tv/droidcam/metadata.xml
index 7796f4b..85aeafd 100644
--- a/media-tv/droidcam/metadata.xml
+++ b/media-tv/droidcam/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="gtk">Build the <pkg>dev-cpp/gtkmm</pkg>:3.0 client.</flag>
-		<flag name="audio">Use snd_aloop kernel module for audio</flag>
 	</use>
 	<longdescription>
 		DroidCam allows you to use your Android or iOS device as webcam, wired (USB

WARNING: multiple messages have this Message-ID (diff)

From: "Andrew Ammerlaan" <andrewammerlaan@riseup.net>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/
Date: Mon, 17 Aug 2020 17:34:25 +0000 (UTC)	[thread overview]
Message-ID: <1597685596.d3fbf3f3d1fb15564448f0f79a0496f3d6b246bc.andrewammerlaan@gentoo> (raw)
Message-ID: <20200817173425.oQteWxpC2wQxT6gaTo2Z9pW7Q3BqwsoNUbfDhmplpIc@z> (raw)

commit:     d3fbf3f3d1fb15564448f0f79a0496f3d6b246bc
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Aug 17 17:30:47 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Aug 17 17:33:16 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d3fbf3f3

media-tv/droidcam: simplify ebuild

Package-Manager: Portage-3.0.2, Repoman-2.3.23
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 media-tv/droidcam/droidcam-1.4-r1.ebuild | 24 ++++++++++--------------
 media-tv/droidcam/metadata.xml           |  1 -
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/media-tv/droidcam/droidcam-1.4-r1.ebuild b/media-tv/droidcam/droidcam-1.4-r1.ebuild
index 7d447b5..123dc40 100644
--- a/media-tv/droidcam/droidcam-1.4-r1.ebuild
+++ b/media-tv/droidcam/droidcam-1.4-r1.ebuild
@@ -14,7 +14,7 @@ KEYWORDS="~amd64"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="audio gtk usb"
+IUSE="gtk"
 
 # Requires connection to android phone
 RESTRICT="test"
@@ -27,7 +27,7 @@ DEPEND="
 	media-libs/libjpeg-turbo
 	>=media-libs/speex-1.2.0-r1
 	media-video/ffmpeg
-	usb? ( dev-util/android-tools )
+	dev-util/android-tools
 	x11-libs/gdk-pixbuf
 	x11-libs/gtk+:3
 	x11-libs/libX11
@@ -49,9 +49,11 @@ DOC_CONTENTS="
 
 BUILD_TARGETS="all"
 MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
-CONFIG_CHECK="VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
 MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
 
+CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
+ERROR_SND_ALOOP="CONFIG_SND_ALOOP is required for audio support"
+
 PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
 
 src_prepare() {
@@ -65,13 +67,6 @@ src_prepare() {
 
 src_configure() {
 	set_arch_to_kernel
-	if use audio ; then
-		if linux_config_exists ; then
-			if ! linux_chkconfig_present SND_ALOOP ; then
-				die "Audio requested but CONFIG_SND_ALOOP not selected in config!"
-			fi
-		fi
-	fi
 	default
 }
 
@@ -109,8 +104,10 @@ src_install() {
 	# so we just put it in modules-load.d to make sure it always works
 	insinto /etc/modules-load.d
 	doins "${FILESDIR}"/${PN}-video.conf
-	if use audio && linux_chkconfig_module SND_ALOOP ; then
-		doins "${FILESDIR}"/${PN}-audio.conf
+	if linux_config_exists ; then
+		if linux_chkconfig_module SND_ALOOP ; then
+			doins "${FILESDIR}"/${PN}-audio.conf
+		fi
 	fi
 
 	newdoc "${FILESDIR}"/${PN}-modprobe.conf ${PN}.conf.default
@@ -123,8 +120,7 @@ pkg_postinst() {
 		xdg_pkg_postinst
 	else
 		elog
-		elog "Only droidcam-cli has been installed since no 'gtk' flag was present"
-		elog "in the USE list."
+		elog "Only droidcam-cli has been installed since 'gtk' flag was not set"
 		elog
 	fi
 

diff --git a/media-tv/droidcam/metadata.xml b/media-tv/droidcam/metadata.xml
index 7796f4b..85aeafd 100644
--- a/media-tv/droidcam/metadata.xml
+++ b/media-tv/droidcam/metadata.xml
@@ -7,7 +7,6 @@
 	</maintainer>
 	<use>
 		<flag name="gtk">Build the <pkg>dev-cpp/gtkmm</pkg>:3.0 client.</flag>
-		<flag name="audio">Use snd_aloop kernel module for audio</flag>
 	</use>
 	<longdescription>
 		DroidCam allows you to use your Android or iOS device as webcam, wired (USB

next             reply	other threads:[~2020-08-17 17:34 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-17 17:34 Andrew Ammerlaan [this message]
2020-08-17 17:34 ` [gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/ Andrew Ammerlaan
  -- strict thread matches above, loose matches on Subject: below --
2021-04-18  2:55 [gentoo-commits] repo/proj/guru:dev " Theo Anderson
2021-01-13 16:51 Andrew Ammerlaan
2020-11-05  9:30 Andrew Ammerlaan
2020-08-17 17:38 Andrew Ammerlaan
2020-08-17 17:34 Andrew Ammerlaan
2020-07-29 11:59 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-07-29 11:59 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-07-29 11:41 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-07-29 11:41 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-07-29 11:29 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-07-29 11:28 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-05-12  9:35 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-05-12  9:35 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-04-24 12:49 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-04-24 12:44 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-04-24 12:26 Andrew Ammerlaan
2020-04-22 17:25 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-04-22 17:22 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan

find likely ancestor, descendant, or conflicting patches for this message:
( dfblob:7d447b5 dfblob:123dc40 dfblob:7796f4b dfblob:85aeafd
dfblob:7d447b5 dfblob:123dc40 dfblob:7796f4b dfblob:85aeafd )
 OR (
bs:"[gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/" )
	(help)

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1597685596.d3fbf3f3d1fb15564448f0f79a0496f3d6b246bc.andrewammerlaan@gentoo \
    --to=andrewammerlaan@riseup.net \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

Be sure your reply has a Subject: header at the top and a blank line before the message body.

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox