| 1 |
commit: d3fbf3f3d1fb15564448f0f79a0496f3d6b246bc |
| 2 |
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 3 |
AuthorDate: Mon Aug 17 17:30:47 2020 +0000 |
| 4 |
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net> |
| 5 |
CommitDate: Mon Aug 17 17:33:16 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d3fbf3f3 |
| 7 |
|
| 8 |
media-tv/droidcam: simplify ebuild |
| 9 |
|
| 10 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
| 11 |
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net> |
| 12 |
|
| 13 |
media-tv/droidcam/droidcam-1.4-r1.ebuild | 24 ++++++++++-------------- |
| 14 |
media-tv/droidcam/metadata.xml | 1 - |
| 15 |
2 files changed, 10 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-tv/droidcam/droidcam-1.4-r1.ebuild b/media-tv/droidcam/droidcam-1.4-r1.ebuild |
| 18 |
index 7d447b5..123dc40 100644 |
| 19 |
--- a/media-tv/droidcam/droidcam-1.4-r1.ebuild |
| 20 |
+++ b/media-tv/droidcam/droidcam-1.4-r1.ebuild |
| 21 |
@@ -14,7 +14,7 @@ KEYWORDS="~amd64" |
| 22 |
LICENSE="GPL-2" |
| 23 |
SLOT="0" |
| 24 |
|
| 25 |
-IUSE="audio gtk usb" |
| 26 |
+IUSE="gtk" |
| 27 |
|
| 28 |
# Requires connection to android phone |
| 29 |
RESTRICT="test" |
| 30 |
@@ -27,7 +27,7 @@ DEPEND=" |
| 31 |
media-libs/libjpeg-turbo |
| 32 |
>=media-libs/speex-1.2.0-r1 |
| 33 |
media-video/ffmpeg |
| 34 |
- usb? ( dev-util/android-tools ) |
| 35 |
+ dev-util/android-tools |
| 36 |
x11-libs/gdk-pixbuf |
| 37 |
x11-libs/gtk+:3 |
| 38 |
x11-libs/libX11 |
| 39 |
@@ -49,9 +49,11 @@ DOC_CONTENTS=" |
| 40 |
|
| 41 |
BUILD_TARGETS="all" |
| 42 |
MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)" |
| 43 |
-CONFIG_CHECK="VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT" |
| 44 |
MODULESD_V4L2LOOPBACK_DC_ENABLED="yes" |
| 45 |
|
| 46 |
+CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT" |
| 47 |
+ERROR_SND_ALOOP="CONFIG_SND_ALOOP is required for audio support" |
| 48 |
+ |
| 49 |
PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch" |
| 50 |
|
| 51 |
src_prepare() { |
| 52 |
@@ -65,13 +67,6 @@ src_prepare() { |
| 53 |
|
| 54 |
src_configure() { |
| 55 |
set_arch_to_kernel |
| 56 |
- if use audio ; then |
| 57 |
- if linux_config_exists ; then |
| 58 |
- if ! linux_chkconfig_present SND_ALOOP ; then |
| 59 |
- die "Audio requested but CONFIG_SND_ALOOP not selected in config!" |
| 60 |
- fi |
| 61 |
- fi |
| 62 |
- fi |
| 63 |
default |
| 64 |
} |
| 65 |
|
| 66 |
@@ -109,8 +104,10 @@ src_install() { |
| 67 |
# so we just put it in modules-load.d to make sure it always works |
| 68 |
insinto /etc/modules-load.d |
| 69 |
doins "${FILESDIR}"/${PN}-video.conf |
| 70 |
- if use audio && linux_chkconfig_module SND_ALOOP ; then |
| 71 |
- doins "${FILESDIR}"/${PN}-audio.conf |
| 72 |
+ if linux_config_exists ; then |
| 73 |
+ if linux_chkconfig_module SND_ALOOP ; then |
| 74 |
+ doins "${FILESDIR}"/${PN}-audio.conf |
| 75 |
+ fi |
| 76 |
fi |
| 77 |
|
| 78 |
newdoc "${FILESDIR}"/${PN}-modprobe.conf ${PN}.conf.default |
| 79 |
@@ -123,8 +120,7 @@ pkg_postinst() { |
| 80 |
xdg_pkg_postinst |
| 81 |
else |
| 82 |
elog |
| 83 |
- elog "Only droidcam-cli has been installed since no 'gtk' flag was present" |
| 84 |
- elog "in the USE list." |
| 85 |
+ elog "Only droidcam-cli has been installed since 'gtk' flag was not set" |
| 86 |
elog |
| 87 |
fi |
| 88 |
|
| 89 |
|
| 90 |
diff --git a/media-tv/droidcam/metadata.xml b/media-tv/droidcam/metadata.xml |
| 91 |
index 7796f4b..85aeafd 100644 |
| 92 |
--- a/media-tv/droidcam/metadata.xml |
| 93 |
+++ b/media-tv/droidcam/metadata.xml |
| 94 |
@@ -7,7 +7,6 @@ |
| 95 |
</maintainer> |
| 96 |
<use> |
| 97 |
<flag name="gtk">Build the <pkg>dev-cpp/gtkmm</pkg>:3.0 client.</flag> |
| 98 |
- <flag name="audio">Use snd_aloop kernel module for audio</flag> |
| 99 |
</use> |
| 100 |
<longdescription> |
| 101 |
DroidCam allows you to use your Android or iOS device as webcam, wired (USB |
Archives