[gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/files/, media-tv/droidcam/

[gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/files/, media-tv/droidcam/

[Andrew Ammerlaan]

commit:     0af367a2ee1ccbcb4efa2c2299c3245501eb4e5a
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Apr 22 08:38:14 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Apr 22 08:38:14 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=0af367a2

media-tv/droidcam: Use your android phone as webcam

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

 media-tv/droidcam/Manifest                         |  1 +
 media-tv/droidcam/droidcam-0_pre20200416.ebuild    | 68 ++++++++++++++++++++++
 .../files/droidcam-0-libjpeg-location.patch        | 13 +++++
 media-tv/droidcam/metadata.xml                     |  8 +++
 4 files changed, 90 insertions(+)

diff --git a/media-tv/droidcam/Manifest b/media-tv/droidcam/Manifest
new file mode 100644
index 0000000..c507a46
--- /dev/null
+++ b/media-tv/droidcam/Manifest
@@ -0,0 +1 @@
+DIST droidcam-0_pre20200416.tar.gz 47695 BLAKE2B 98970a8b0d530a414017757fe09457ded56993511af067ea10d6588191807117db94aaa704bad301339d05a59b61ab23f92d48a551df7d398c39a8c4cd1e2bfb SHA512 22357880edbcee4ef1d247dffc0fcc95c7c121befd43d53594cdabe9770fa167bffb887c719a2fb924b81e6beceecb66a25c6ed31eac930af6000802efb83c00

diff --git a/media-tv/droidcam/droidcam-0_pre20200416.ebuild b/media-tv/droidcam/droidcam-0_pre20200416.ebuild
new file mode 100644
index 0000000..1afe5a6
--- /dev/null
+++ b/media-tv/droidcam/droidcam-0_pre20200416.ebuild
@@ -0,0 +1,68 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+COMMIT="fee087c7f699cb38fba7934c77c588d246355372"
+
+inherit desktop linux-mod xdg
+
+DESCRIPTION="Use android phone as webcam, using a v4l device driver and app"
+HOMEPAGE="https://www.dev47apps.com/droidcam/linuxx/
+	https://github.com/aramg/droidcam"
+SRC_URI="https://github.com/aramg/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="droidcam"
+SLOT="0"
+
+# Requires connection to android phone
+RESTRICT="test"
+
+BDEPEND="media-libs/libjpeg-turbo[static-libs]"
+
+RDEPEND="x11-libs/gtk+:2"
+
+S="${WORKDIR}/${PN}-${COMMIT}/linux"
+
+PATCHES="${FILESDIR}/${PN}-0-libjpeg-location.patch"
+
+CONFIG_CHECK="VIDEO_DEV"
+MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
+BUILD_TARGETS="all"
+
+src_configure() {
+	set_arch_to_kernel
+	default
+}
+
+src_compile() {
+	default
+	linux-mod_src_compile
+}
+
+src_test() {
+	pushd "v4l2loopback"
+	default
+	./test || die
+	popd
+}
+
+src_install() {
+	linux-mod_src_install
+	dobin "${PN}"
+	dobin "${PN}-cli"
+
+	newicon -s 32x32 icon.png ${PN}.png
+	newicon -s 64x64 icon2.png ${PN}.png
+	make_desktop_entry ${PN} "Droidcam" ${PN} 'AudioVideo;Video'
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+	xdg_pkg_postinst
+
+	elog "To use this, you'll need to download the android app as well:"
+	elog "Free version: https://play.google.com/store/apps/details?id=com.dev47apps.droidcam"
+	elog "Paid version: https://play.google.com/store/apps/details?id=com.dev47apps.droidcamx"
+}

diff --git a/media-tv/droidcam/files/droidcam-0-libjpeg-location.patch b/media-tv/droidcam/files/droidcam-0-libjpeg-location.patch
new file mode 100644
index 0000000..2b1f9cd
--- /dev/null
+++ b/media-tv/droidcam/files/droidcam-0-libjpeg-location.patch
@@ -0,0 +1,13 @@
+diff --git a/Makefile b/Makefile
+index 134f723..44e2c2f 100644
+--- a/Makefile
++++ b/Makefile
+@@ -9,7 +9,7 @@
+ CC    = -no-pie
+ GTK   = `pkg-config --libs --cflags gtk+-2.0`
+ LIBS  = `pkg-config --libs libswscale libavutil`
+-JPEG  = -I/opt/libjpeg-turbo/include /opt/libjpeg-turbo/lib`getconf LONG_BIT`/libturbojpeg.a
++JPEG  = -I/usr/include /usr/lib`getconf LONG_BIT`/libturbojpeg.a
+ SRC      = src/connection.c src/decoder.c
+ NO_WARN  = -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
+ 

diff --git a/media-tv/droidcam/metadata.xml b/media-tv/droidcam/metadata.xml
new file mode 100644
index 0000000..1210e7e
--- /dev/null
+++ b/media-tv/droidcam/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>andrewammerlaan@riseup.net</email>
+		<name>Andrew Ammerlaan</name>
+	</maintainer>
+</pkgmetadata>

[gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/files/, media-tv/droidcam/

[Andrew Ammerlaan]

commit:     1fbc76282cd45edccc735aece3721e1cd20bfe2c
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sat May  2 10:00:10 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sat May  2 10:00:10 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=1fbc7628

media-tv/droidcam: version bump

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

 media-tv/droidcam/Manifest                                          | 2 +-
 ...idcam-0_pre20200416.ebuild => droidcam-6.7.7_pre20200502.ebuild} | 4 ++--
 ...cam-0-libjpeg-location.patch => droidcam-libjpeg-location.patch} | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-tv/droidcam/Manifest b/media-tv/droidcam/Manifest
index c507a46..f808078 100644
--- a/media-tv/droidcam/Manifest
+++ b/media-tv/droidcam/Manifest
@@ -1 +1 @@
-DIST droidcam-0_pre20200416.tar.gz 47695 BLAKE2B 98970a8b0d530a414017757fe09457ded56993511af067ea10d6588191807117db94aaa704bad301339d05a59b61ab23f92d48a551df7d398c39a8c4cd1e2bfb SHA512 22357880edbcee4ef1d247dffc0fcc95c7c121befd43d53594cdabe9770fa167bffb887c719a2fb924b81e6beceecb66a25c6ed31eac930af6000802efb83c00
+DIST droidcam-6.7.7_pre20200502.tar.gz 50633 BLAKE2B 5bbbbaf8ef8b84652a5100381ce9a6d4cd6fa57773676a8c0a22f3d28329e2891e3145a436e0330bc9b242987c48b451a9445c896aa7f84a349464e10e5238d9 SHA512 6259e07abd0c139ae0c7951222921817f508e44b4504b074f2656dda78ac6be71279d9ae15e85f82bee5b556543ca0adcb14ed3c80dca910e9af2af51b918e77

diff --git a/media-tv/droidcam/droidcam-0_pre20200416.ebuild b/media-tv/droidcam/droidcam-6.7.7_pre20200502.ebuild
similarity index 94%
rename from media-tv/droidcam/droidcam-0_pre20200416.ebuild
rename to media-tv/droidcam/droidcam-6.7.7_pre20200502.ebuild
index 706ccf9..ec25e57 100644
--- a/media-tv/droidcam/droidcam-0_pre20200416.ebuild
+++ b/media-tv/droidcam/droidcam-6.7.7_pre20200502.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-COMMIT="fee087c7f699cb38fba7934c77c588d246355372"
+COMMIT="6cc7cb6266f4ac089cf3bbef2d2ae8fe590f1750"
 
 inherit desktop linux-mod xdg
 
@@ -25,7 +25,7 @@ RDEPEND="x11-libs/gtk+:2"
 
 S="${WORKDIR}/${PN}-${COMMIT}/linux"
 
-PATCHES="${FILESDIR}/${PN}-0-libjpeg-location.patch"
+PATCHES="${FILESDIR}/${PN}-libjpeg-location.patch"
 
 CONFIG_CHECK="VIDEO_DEV"
 MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"

diff --git a/media-tv/droidcam/files/droidcam-0-libjpeg-location.patch b/media-tv/droidcam/files/droidcam-libjpeg-location.patch
similarity index 69%
rename from media-tv/droidcam/files/droidcam-0-libjpeg-location.patch
rename to media-tv/droidcam/files/droidcam-libjpeg-location.patch
index 2b1f9cd..b0b35d8 100644
--- a/media-tv/droidcam/files/droidcam-0-libjpeg-location.patch
+++ b/media-tv/droidcam/files/droidcam-libjpeg-location.patch
@@ -1,11 +1,11 @@
 diff --git a/Makefile b/Makefile
-index 134f723..44e2c2f 100644
+index 6995c18..41f56b6 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -9,7 +9,7 @@
  CC    = -no-pie
- GTK   = `pkg-config --libs --cflags gtk+-2.0`
- LIBS  = `pkg-config --libs libswscale libavutil`
+ GTK   = `pkg-config --libs --cflags gtk+-2.0` `pkg-config --libs x11`
+ LIBS  = `pkg-config --libs --cflags libswscale libavutil`
 -JPEG  = -I/opt/libjpeg-turbo/include /opt/libjpeg-turbo/lib`getconf LONG_BIT`/libturbojpeg.a
 +JPEG  = -I/usr/include /usr/lib`getconf LONG_BIT`/libturbojpeg.a
  SRC      = src/connection.c src/decoder.c

[gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/files/, media-tv/droidcam/

[Andrew Ammerlaan]

commit:     2d3699f4f476d7ebc65d637f6d4a04a6ce73b3e3
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon May 11 09:32:17 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon May 11 09:32:17 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=2d3699f4

media-tv/droidcam: bump, no longer require static libs

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

 media-tv/droidcam/Manifest                                        | 2 +-
 ...6.7.7_pre20200502.ebuild => droidcam-6.7.7_pre20200506.ebuild} | 4 ++--
 media-tv/droidcam/files/droidcam-libjpeg-location.patch           | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/media-tv/droidcam/Manifest b/media-tv/droidcam/Manifest
index f808078..affc279 100644
--- a/media-tv/droidcam/Manifest
+++ b/media-tv/droidcam/Manifest
@@ -1 +1 @@
-DIST droidcam-6.7.7_pre20200502.tar.gz 50633 BLAKE2B 5bbbbaf8ef8b84652a5100381ce9a6d4cd6fa57773676a8c0a22f3d28329e2891e3145a436e0330bc9b242987c48b451a9445c896aa7f84a349464e10e5238d9 SHA512 6259e07abd0c139ae0c7951222921817f508e44b4504b074f2656dda78ac6be71279d9ae15e85f82bee5b556543ca0adcb14ed3c80dca910e9af2af51b918e77
+DIST droidcam-6.7.7_pre20200506.tar.gz 54514 BLAKE2B 1a68736bf70b11f216eea9893bc858ea6b859c2d0b6a89d9e5e5c9d7a9dc1a7ed97d6e1cea96ae3c8683d08effa861c59b9576dcf804bbae7a25c368b3fee50b SHA512 e9864cdd311e91fd417ce5d33ec15ce76dd9b4f3fa50eef7dadddee8db2f788ad992dd869b1d27e41df02df1e9a08fec3544e539378808d3fa862ffdecea11a7

diff --git a/media-tv/droidcam/droidcam-6.7.7_pre20200502.ebuild b/media-tv/droidcam/droidcam-6.7.7_pre20200506.ebuild
similarity index 94%
rename from media-tv/droidcam/droidcam-6.7.7_pre20200502.ebuild
rename to media-tv/droidcam/droidcam-6.7.7_pre20200506.ebuild
index ec25e57..c0441bc 100644
--- a/media-tv/droidcam/droidcam-6.7.7_pre20200502.ebuild
+++ b/media-tv/droidcam/droidcam-6.7.7_pre20200506.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-COMMIT="6cc7cb6266f4ac089cf3bbef2d2ae8fe590f1750"
+COMMIT="98cbf07def9604f92fd74ea2964d483347388909"
 
 inherit desktop linux-mod xdg
 
@@ -19,7 +19,7 @@ SLOT="0"
 # Requires connection to android phone
 RESTRICT="test"
 
-BDEPEND="media-libs/libjpeg-turbo[static-libs]"
+BDEPEND="media-libs/libjpeg-turbo"
 
 RDEPEND="x11-libs/gtk+:2"
 

diff --git a/media-tv/droidcam/files/droidcam-libjpeg-location.patch b/media-tv/droidcam/files/droidcam-libjpeg-location.patch
index b0b35d8..1b1a1e0 100644
--- a/media-tv/droidcam/files/droidcam-libjpeg-location.patch
+++ b/media-tv/droidcam/files/droidcam-libjpeg-location.patch
@@ -1,13 +1,13 @@
 diff --git a/Makefile b/Makefile
-index 6995c18..41f56b6 100644
+index 3a37443..2a68b2e 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -9,7 +9,7 @@
+@@ -13,7 +13,7 @@ JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
  CC    = -no-pie
  GTK   = `pkg-config --libs --cflags gtk+-2.0` `pkg-config --libs x11`
  LIBS  = `pkg-config --libs --cflags libswscale libavutil`
--JPEG  = -I/opt/libjpeg-turbo/include /opt/libjpeg-turbo/lib`getconf LONG_BIT`/libturbojpeg.a
-+JPEG  = -I/usr/include /usr/lib`getconf LONG_BIT`/libturbojpeg.a
+-JPEG  = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
++JPEG  = -I/usr/include /usr/lib`getconf LONG_BIT`/libturbojpeg.so
  SRC      = src/connection.c src/decoder.c
  NO_WARN  = -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast
  

[gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/files/, media-tv/droidcam/

[Andrew Ammerlaan]

commit:     4b4682b4a9acc2b8b82d7cbcc4323026d1f9ba7d
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Thu Jul 30 16:16:21 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Thu Jul 30 16:16:21 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4b4682b4

media-tv/droidcam: revision bump

Changes based on the PR by @henrikp

See also: https://github.com/gentoo/gentoo/pull/16736

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

 ...{droidcam-1.4.ebuild => droidcam-1.4-r1.ebuild} | 71 ++++++++++++----------
 media-tv/droidcam/files/README.gentoo              |  6 --
 media-tv/droidcam/files/droidcam-audio.conf        |  1 +
 media-tv/droidcam/files/droidcam-modprobe.conf     |  2 +
 .../{v4l2loopback-dc.conf => droidcam-video.conf}  |  0
 media-tv/droidcam/metadata.xml                     |  8 +++
 6 files changed, 51 insertions(+), 37 deletions(-)

diff --git a/media-tv/droidcam/droidcam-1.4.ebuild b/media-tv/droidcam/droidcam-1.4-r1.ebuild
similarity index 70%
rename from media-tv/droidcam/droidcam-1.4.ebuild
rename to media-tv/droidcam/droidcam-1.4-r1.ebuild
index 1573c2c..7d447b5 100644
--- a/media-tv/droidcam/droidcam-1.4.ebuild
+++ b/media-tv/droidcam/droidcam-1.4-r1.ebuild
@@ -14,55 +14,64 @@ KEYWORDS="~amd64"
 LICENSE="GPL-2"
 SLOT="0"
 
-IUSE="gtk"
+IUSE="audio gtk usb"
 
 # Requires connection to android phone
 RESTRICT="test"
 
 DEPEND="
-	gtk? (
-		dev-cpp/gtkmm:3.0
-		media-video/ffmpeg
-	)
 	=app-pda/libusbmuxd-1*
+	dev-libs/glib
+	gtk? ( dev-cpp/gtkmm:3.0 )
 	media-libs/alsa-lib
-"
-
-BDEPEND="
 	media-libs/libjpeg-turbo
 	>=media-libs/speex-1.2.0-r1
-	virtual/pkgconfig
+	media-video/ffmpeg
+	usb? ( dev-util/android-tools )
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/pango
 "
 
-S="${WORKDIR}/${P}/linux"
+BDEPEND="virtual/pkgconfig"
 
-PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
+S="${WORKDIR}/${P}/linux"
 
 DOCS=( README.md README-DKMS.md )
 DISABLE_AUTOFORMATTING="true"
 DOC_CONTENTS="
-		The default resolution for v4l2loopback-dc[1] is 640x480. You can override these
-		values in /etc/modprobe.d/v4l2loopback-dc.conf
+		The default resolution for v4l2loopback-dc[1] is 640x480. You can override the
+		value by copying droidcam.conf.default to /etc/modprobe.d/droidcam.conf
 		and modifying 'width' and 'height'.
 		[1] https://github.com/aramg/droidcam/issues/56
 "
 
 BUILD_TARGETS="all"
 MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
-CONFIG_CHECK="VIDEO_DEV ~SND_ALOOP MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
-ERROR_SND_ALOOP="CONFIG_SND_ALOOP: missing, required for audio support"
+CONFIG_CHECK="VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT"
 MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
 
+PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
+
 src_prepare() {
-	default
 	if ! use gtk ; then
 		sed -i -e '/cflags gtk+/d' Makefile
+	else
+		xdg_src_prepare
 	fi
 	linux-mod_pkg_setup
 }
 
 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
 }
 
@@ -81,6 +90,10 @@ src_test() {
 	popd
 }
 
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
 src_install() {
 	if use gtk ; then
 		dobin droidcam
@@ -94,36 +107,32 @@ src_install() {
 
 	# The cli and gui do not auto load the module if unloaded (why not tho?)
 	# so we just put it in modules-load.d to make sure it always works
-	insinto /usr/lib/modules-load.d/
-	doins "${FILESDIR}/v4l2loopback-dc.conf"
+	insinto /etc/modules-load.d
+	doins "${FILESDIR}"/${PN}-video.conf
+	if use audio && linux_chkconfig_module SND_ALOOP ; then
+		doins "${FILESDIR}"/${PN}-audio.conf
+	fi
 
+	newdoc "${FILESDIR}"/${PN}-modprobe.conf ${PN}.conf.default
 	einstalldocs
 	linux-mod_src_install
 }
 
 pkg_postinst() {
-	linux-mod_pkg_postinst
-
 	if use gtk ; then
 		xdg_pkg_postinst
 	else
-		elog ""
+		elog
 		elog "Only droidcam-cli has been installed since no 'gtk' flag was present"
 		elog "in the USE list."
+		elog
 	fi
 
-	elog ""
+	linux-mod_pkg_postinst
 	readme.gentoo_print_elog
 
-	elog ""
-	elog "To use this package, you will need to download the Android or iOS app as well:"
-	elog "Android:"
-	elog "Free version: https://play.google.com/store/apps/details?id=com.dev47apps.droidcam"
-	elog "Paid version: https://play.google.com/store/apps/details?id=com.dev47apps.droidcamx"
-	elog "iOS: https://apps.apple.com/us/app/droidcam-wireless-webcam/id1510258102"
-
-	elog ""
-	optfeature "to connection with USB via ADB instead of over wifi" dev-util/android-tools
+	elog "Links to the Android/iPhone/iPad apps can be reached at"
+	elog "https://www.dev47apps.com/"
 }
 
 pkg_postrm() {

diff --git a/media-tv/droidcam/files/README.gentoo b/media-tv/droidcam/files/README.gentoo
deleted file mode 100644
index 6a5bdb4..0000000
--- a/media-tv/droidcam/files/README.gentoo
+++ /dev/null
@@ -1,6 +0,0 @@
-The default resolution for v4l2loopback-dc is 640x480. You can override these
-values in /etc/modprobe.d/v4l2loopback-dc.conf 
-and modifying 'width' and 'height'.
-
-See https://github.com/aramg/droidcam/issues/56 on why a fork of v4l2loopback
-is currently being used here.

diff --git a/media-tv/droidcam/files/droidcam-audio.conf b/media-tv/droidcam/files/droidcam-audio.conf
new file mode 100644
index 0000000..6619319
--- /dev/null
+++ b/media-tv/droidcam/files/droidcam-audio.conf
@@ -0,0 +1 @@
+snd_aloop

diff --git a/media-tv/droidcam/files/droidcam-modprobe.conf b/media-tv/droidcam/files/droidcam-modprobe.conf
new file mode 100644
index 0000000..d4d5801
--- /dev/null
+++ b/media-tv/droidcam/files/droidcam-modprobe.conf
@@ -0,0 +1,2 @@
+# Suggested values: 640×480, 960×720, 1280×720 (720p), 1920×1080 (1080p).
+options v4l2loopback-dc width=640 height=480

diff --git a/media-tv/droidcam/files/v4l2loopback-dc.conf b/media-tv/droidcam/files/droidcam-video.conf
similarity index 100%
rename from media-tv/droidcam/files/v4l2loopback-dc.conf
rename to media-tv/droidcam/files/droidcam-video.conf

diff --git a/media-tv/droidcam/metadata.xml b/media-tv/droidcam/metadata.xml
index 59c300f..7796f4b 100644
--- a/media-tv/droidcam/metadata.xml
+++ b/media-tv/droidcam/metadata.xml
@@ -7,5 +7,13 @@
 	</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
+		and ADB) or wireless (TCP/IP). Works with the free version of the phone app.	
+	</longdescription>
+	<upstream>
+		<remote-id type="github">aramg/droidcam</remote-id>
+	</upstream>
 </pkgmetadata>

[gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/files/, media-tv/droidcam/

[Andrew Ammerlaan]

commit:     5bdaa5668a57ff6e39632575ce56915b23f8be9d
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Dec 21 11:01:56 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Dec 21 11:02:13 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=5bdaa566

media-tv/droidcam: allow use of libusbmuxd-2.0

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

 media-tv/droidcam/droidcam-1.6.ebuild                 | 2 +-
 media-tv/droidcam/files/droidcam-makefile-fixes.patch | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/media-tv/droidcam/droidcam-1.6.ebuild b/media-tv/droidcam/droidcam-1.6.ebuild
index 64118f6d..42caab29 100644
--- a/media-tv/droidcam/droidcam-1.6.ebuild
+++ b/media-tv/droidcam/droidcam-1.6.ebuild
@@ -20,7 +20,7 @@ IUSE="gtk"
 RESTRICT="test"
 
 DEPEND="
-	=app-pda/libusbmuxd-1*
+	app-pda/libusbmuxd
 	dev-libs/glib
 	dev-libs/libappindicator:3
 	dev-util/android-tools

diff --git a/media-tv/droidcam/files/droidcam-makefile-fixes.patch b/media-tv/droidcam/files/droidcam-makefile-fixes.patch
index 8ba20c4b..4fe51776 100644
--- a/media-tv/droidcam/files/droidcam-makefile-fixes.patch
+++ b/media-tv/droidcam/files/droidcam-makefile-fixes.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index 91ca3af..408de37 100644
+index 91ca3af..16afe8b 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -6,7 +6,7 @@
@@ -18,7 +18,8 @@ index 91ca3af..408de37 100644
 -JPEG  = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
 +JPEG  = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.so
  SRC      = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c
- USBMUXD = -lusbmuxd
+-USBMUXD = -lusbmuxd
++USBMUXD = -lusbmuxd-2.0
  
  all: droidcam-cli droidcam
  
@@ -26,7 +27,7 @@ index 91ca3af..408de37 100644
 -LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.a /usr/lib/x86_64-linux-gnu/libavutil.a
 -SRC  += /usr/lib/x86_64-linux-gnu/libusbmuxd.a /usr/lib/x86_64-linux-gnu/libxml2.a src/libplist-2.0.a
 +LIBAV = /usr/lib/x86_64-linux-gnu/libswscale.so /usr/lib/x86_64-linux-gnu/libavutil.so
-+SRC  += /usr/lib/x86_64-linux-gnu/libusbmuxd.so /usr/lib/x86_64-linux-gnu/libxml2.so src/libplist-2.0.so
++SRC  += /usr/lib/x86_64-linux-gnu/libusbmuxd-2.0.so /usr/lib/x86_64-linux-gnu/libxml2.so src/libplist-2.0.so
  package: clean all
  	zip -x icon.png src/ src/* Makefile -r droidcam_`date +%s`.zip ./*
  

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

[Andrew Ammerlaan]

commit:     863b6671ca136cea9c8a2b728ce4939b59e28106
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue May  4 08:33:22 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue May  4 08:33:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=863b6671

media-tv/droidcam: version bump 1.7.3

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

 media-tv/droidcam/Manifest                                    |  2 +-
 .../droidcam/{droidcam-1.7.2.ebuild => droidcam-1.7.3.ebuild} |  2 +-
 media-tv/droidcam/files/droidcam-makefile-fixes.patch         | 11 ++++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/media-tv/droidcam/Manifest b/media-tv/droidcam/Manifest
index cd933296e..9d21ae1f8 100644
--- a/media-tv/droidcam/Manifest
+++ b/media-tv/droidcam/Manifest
@@ -1 +1 @@
-DIST droidcam-1.7.2.tar.gz 82690 BLAKE2B 3b7312f081dff747ccc9f8fab9a81bee079f697fa6bf8eb6982efa443a300751b9e8ebaa196950fc2c543e9abda3d9d7d26edc986cc916c36dcbccf9f6db0102 SHA512 0515760b3705abcb46acae5bbc05bba1d82416853c6438f776f6170e7469372d4d4236aae3500d409e572ae4e5289d3bd7416ed2729ea929e21146994c2de51c
+DIST droidcam-1.7.3.tar.gz 83146 BLAKE2B b79d210a7d6a3cee7322b373cd92b2c1a326dd9887dff1df752e9818f9e7ed88dfdfd4a33a22ccb39c601df81c4e9538b1efa8029a9ad56f39d400fc50bc746b SHA512 39d6947b66f1be7896c56aa01d471cbd025deaeb2d2359f9434e5ea91e4302f4c16ee31486bb04fab1dfc7f6d8b2de3f6800ead665b7b3d366b01b25297beaba

diff --git a/media-tv/droidcam/droidcam-1.7.2.ebuild b/media-tv/droidcam/droidcam-1.7.3.ebuild
similarity index 97%
rename from media-tv/droidcam/droidcam-1.7.2.ebuild
rename to media-tv/droidcam/droidcam-1.7.3.ebuild
index 69067567d..6d94b398a 100644
--- a/media-tv/droidcam/droidcam-1.7.2.ebuild
+++ b/media-tv/droidcam/droidcam-1.7.3.ebuild
@@ -134,7 +134,7 @@ pkg_postinst() {
 	linux-mod_pkg_postinst
 	readme.gentoo_print_elog
 
-	elog "Links to the Android/iPhone/iPad apps can be reached at"
+	elog "Links to the Android/iPhone/iPad apps can be found at"
 	elog "https://www.dev47apps.com/"
 }
 

diff --git a/media-tv/droidcam/files/droidcam-makefile-fixes.patch b/media-tv/droidcam/files/droidcam-makefile-fixes.patch
index fb3c37b6d..c413d7edd 100644
--- a/media-tv/droidcam/files/droidcam-makefile-fixes.patch
+++ b/media-tv/droidcam/files/droidcam-makefile-fixes.patch
@@ -1,8 +1,8 @@
 diff --git a/Makefile b/Makefile
-index 54738f5..bcb5800 100644
+index b5f696c..bcb5800 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -6,25 +6,25 @@
+@@ -6,7 +6,7 @@
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  # Use at your own risk. See README file for more details.
  
@@ -11,11 +11,8 @@ index 54738f5..bcb5800 100644
  JPEG_INCLUDE ?= $(JPEG_DIR)/include
  JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
  
- CXX   = g++
- CXXFLAGS = -std=c++11 -Wall -fPIC -no-pie
- GTK   = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
--#GTK  += `pkg-config --cflags --libs appindicator3-0.1`
-+GTK  += `pkg-config --cflags --libs appindicator3-0.1`
+@@ -16,15 +16,15 @@ GTK   = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+ GTK  += `pkg-config --cflags --libs appindicator3-0.1`
  LIBAV = `pkg-config --libs --cflags libswscale libavutil`
  LIBS  =  -lspeex -lasound -lpthread -lm
 -JPEG  = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a

[gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/files/, media-tv/droidcam/

[Andrew Ammerlaan]

commit:     863b6671ca136cea9c8a2b728ce4939b59e28106
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue May  4 08:33:22 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue May  4 08:33:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=863b6671

media-tv/droidcam: version bump 1.7.3

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

 media-tv/droidcam/Manifest                                    |  2 +-
 .../droidcam/{droidcam-1.7.2.ebuild => droidcam-1.7.3.ebuild} |  2 +-
 media-tv/droidcam/files/droidcam-makefile-fixes.patch         | 11 ++++-------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/media-tv/droidcam/Manifest b/media-tv/droidcam/Manifest
index cd933296e..9d21ae1f8 100644
--- a/media-tv/droidcam/Manifest
+++ b/media-tv/droidcam/Manifest
@@ -1 +1 @@
-DIST droidcam-1.7.2.tar.gz 82690 BLAKE2B 3b7312f081dff747ccc9f8fab9a81bee079f697fa6bf8eb6982efa443a300751b9e8ebaa196950fc2c543e9abda3d9d7d26edc986cc916c36dcbccf9f6db0102 SHA512 0515760b3705abcb46acae5bbc05bba1d82416853c6438f776f6170e7469372d4d4236aae3500d409e572ae4e5289d3bd7416ed2729ea929e21146994c2de51c
+DIST droidcam-1.7.3.tar.gz 83146 BLAKE2B b79d210a7d6a3cee7322b373cd92b2c1a326dd9887dff1df752e9818f9e7ed88dfdfd4a33a22ccb39c601df81c4e9538b1efa8029a9ad56f39d400fc50bc746b SHA512 39d6947b66f1be7896c56aa01d471cbd025deaeb2d2359f9434e5ea91e4302f4c16ee31486bb04fab1dfc7f6d8b2de3f6800ead665b7b3d366b01b25297beaba

diff --git a/media-tv/droidcam/droidcam-1.7.2.ebuild b/media-tv/droidcam/droidcam-1.7.3.ebuild
similarity index 97%
rename from media-tv/droidcam/droidcam-1.7.2.ebuild
rename to media-tv/droidcam/droidcam-1.7.3.ebuild
index 69067567d..6d94b398a 100644
--- a/media-tv/droidcam/droidcam-1.7.2.ebuild
+++ b/media-tv/droidcam/droidcam-1.7.3.ebuild
@@ -134,7 +134,7 @@ pkg_postinst() {
 	linux-mod_pkg_postinst
 	readme.gentoo_print_elog
 
-	elog "Links to the Android/iPhone/iPad apps can be reached at"
+	elog "Links to the Android/iPhone/iPad apps can be found at"
 	elog "https://www.dev47apps.com/"
 }
 

diff --git a/media-tv/droidcam/files/droidcam-makefile-fixes.patch b/media-tv/droidcam/files/droidcam-makefile-fixes.patch
index fb3c37b6d..c413d7edd 100644
--- a/media-tv/droidcam/files/droidcam-makefile-fixes.patch
+++ b/media-tv/droidcam/files/droidcam-makefile-fixes.patch
@@ -1,8 +1,8 @@
 diff --git a/Makefile b/Makefile
-index 54738f5..bcb5800 100644
+index b5f696c..bcb5800 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -6,25 +6,25 @@
+@@ -6,7 +6,7 @@
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  # Use at your own risk. See README file for more details.
  
@@ -11,11 +11,8 @@ index 54738f5..bcb5800 100644
  JPEG_INCLUDE ?= $(JPEG_DIR)/include
  JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
  
- CXX   = g++
- CXXFLAGS = -std=c++11 -Wall -fPIC -no-pie
- GTK   = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
--#GTK  += `pkg-config --cflags --libs appindicator3-0.1`
-+GTK  += `pkg-config --cflags --libs appindicator3-0.1`
+@@ -16,15 +16,15 @@ GTK   = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+ GTK  += `pkg-config --cflags --libs appindicator3-0.1`
  LIBAV = `pkg-config --libs --cflags libswscale libavutil`
  LIBS  =  -lspeex -lasound -lpthread -lm
 -JPEG  = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a