* [gentoo-commits] repo/proj/guru:dev commit in: media-tv/droidcam/, media-tv/droidcam/files/
2020-04-22 17:45 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
@ 2020-04-22 17:45 ` Andrew Ammerlaan
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2020-04-22 17:45 UTC (permalink / raw
To: gentoo-commits
commit: ea18bc40836fb8bc19243de01b6cd3116c4fac84
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Apr 22 17:44:52 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Apr 22 17:44:52 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=ea18bc40
media-tv/droidcam: auto load module
the module is apperently not loaded by gui/cli if not loaded
so we autoload it to make sure the gui/cli does not give strange
errors
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
media-tv/droidcam/droidcam-0_pre20200416.ebuild | 5 +++++
media-tv/droidcam/files/v4l2loopback-dc.conf | 1 +
2 files changed, 6 insertions(+)
diff --git a/media-tv/droidcam/droidcam-0_pre20200416.ebuild b/media-tv/droidcam/droidcam-0_pre20200416.ebuild
index 24a7733..6fb0579 100644
--- a/media-tv/droidcam/droidcam-0_pre20200416.ebuild
+++ b/media-tv/droidcam/droidcam-0_pre20200416.ebuild
@@ -57,6 +57,11 @@ src_install() {
newicon -s 32x32 icon.png ${PN}.png
newicon -s 64x64 icon2.png ${PN}.png
make_desktop_entry ${PN} "Droidcam" ${PN} 'AudioVideo;Video'
+
+ # 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"
}
pkg_postinst() {
diff --git a/media-tv/droidcam/files/v4l2loopback-dc.conf b/media-tv/droidcam/files/v4l2loopback-dc.conf
new file mode 100644
index 0000000..7398776
--- /dev/null
+++ b/media-tv/droidcam/files/v4l2loopback-dc.conf
@@ -0,0 +1 @@
+v4l2loopback-dc
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-tv/droidcam/, media-tv/droidcam/files/
@ 2020-05-02 10:00 Andrew Ammerlaan
2020-05-02 10:00 ` [gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/files/, media-tv/droidcam/ Andrew Ammerlaan
0 siblings, 1 reply; 7+ messages in thread
From: Andrew Ammerlaan @ 2020-05-02 10:00 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/files/, media-tv/droidcam/
2020-05-02 10:00 [gentoo-commits] repo/proj/guru:dev commit in: media-tv/droidcam/, media-tv/droidcam/files/ Andrew Ammerlaan
@ 2020-05-02 10:00 ` Andrew Ammerlaan
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2020-05-02 10:00 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-tv/droidcam/, media-tv/droidcam/files/
@ 2020-05-11 9:32 Andrew Ammerlaan
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2020-05-11 9:32 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-tv/droidcam/, media-tv/droidcam/files/
2020-07-30 16:16 [gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/files/, media-tv/droidcam/ Andrew Ammerlaan
@ 2020-07-30 16:16 ` Andrew Ammerlaan
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2020-07-30 16:16 UTC (permalink / raw
To: gentoo-commits
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>
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-tv/droidcam/, media-tv/droidcam/files/
2020-10-02 14:08 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
@ 2020-10-02 14:08 ` Andrew Ammerlaan
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2020-10-02 14:08 UTC (permalink / raw
To: gentoo-commits
commit: 36dcfcaed8c14a8bffd2c6ae37ff41e4fadfd238
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Oct 2 14:04:03 2020 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Oct 2 14:04:03 2020 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=36dcfcae
media-tv/droidcam: version bump 1.5
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
media-tv/droidcam/Manifest | 2 +-
...{droidcam-1.4-r1.ebuild => droidcam-1.5.ebuild} | 3 ++-
.../droidcam/files/droidcam-makefile-fixes.patch | 27 +++++++++++-----------
3 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/media-tv/droidcam/Manifest b/media-tv/droidcam/Manifest
index 13a8d36b..3a01d0a2 100644
--- a/media-tv/droidcam/Manifest
+++ b/media-tv/droidcam/Manifest
@@ -1 +1 @@
-DIST droidcam-1.4.tar.gz 84350 BLAKE2B 3d627f94aa9d04b3ce9785005b5a3d06895c74254001033c7d881bdc2359e3d34db5668e0df59a9f293014f7cd78e6f4aa07f25cd8a8ed3f54c1658a9406e7d8 SHA512 60ca2d15514a03a71e04e0f5e1382a5af4e7244329d4113e8af1dd0adb8a448febc60adf94bbcad8db8de0e0ffd906de1f2427488dc9e27ebe7739c7331ac99d
+DIST droidcam-1.5.tar.gz 79700 BLAKE2B 05ec5eccec3f4fcec0457fad3b092ae3312c6de3c7cf9d574d002eaa06c92f1f93631c5dc36ed3465f4941a51b37f22b404815d88150604f5f02cf7593006340 SHA512 b441d1c69b77522d427b729439d4efa041a93b224e9fd7f7502260aac8a334a110152592670903cc4df8a194707f78a52a0c14cfcdd52a1e8ea7c391e6fd586c
diff --git a/media-tv/droidcam/droidcam-1.4-r1.ebuild b/media-tv/droidcam/droidcam-1.5.ebuild
similarity index 99%
rename from media-tv/droidcam/droidcam-1.4-r1.ebuild
rename to media-tv/droidcam/droidcam-1.5.ebuild
index 6642f54a..64118f6d 100644
--- a/media-tv/droidcam/droidcam-1.4-r1.ebuild
+++ b/media-tv/droidcam/droidcam-1.5.ebuild
@@ -22,11 +22,12 @@ RESTRICT="test"
DEPEND="
=app-pda/libusbmuxd-1*
dev-libs/glib
+ dev-libs/libappindicator:3
+ dev-util/android-tools
media-libs/alsa-lib
media-libs/libjpeg-turbo
>=media-libs/speex-1.2.0-r1
media-video/ffmpeg
- dev-util/android-tools
gtk? (
dev-cpp/gtkmm:3.0
x11-libs/gdk-pixbuf
diff --git a/media-tv/droidcam/files/droidcam-makefile-fixes.patch b/media-tv/droidcam/files/droidcam-makefile-fixes.patch
index 238898c9..8ba20c4b 100644
--- a/media-tv/droidcam/files/droidcam-makefile-fixes.patch
+++ b/media-tv/droidcam/files/droidcam-makefile-fixes.patch
@@ -1,44 +1,45 @@
diff --git a/Makefile b/Makefile
-index 97a6e1f..6779293 100644
+index 91ca3af..408de37 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
# Use at your own risk. See README file for more details.
-
+
-JPEG_DIR ?= /opt/libjpeg-turbo
+JPEG_DIR ?= /usr
JPEG_INCLUDE ?= $(JPEG_DIR)/include
JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
-
-@@ -15,14 +15,14 @@ CC = -std=c++11 -x c++ -Wall -fPIC -no-pie
- GTK = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
+
+@@ -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
+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
+
all: droidcam-cli droidcam
-
+
ifeq "$(RELEASE)" "1"
-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
package: clean all
- zip -x *.png src/ src/* Makefile -r droidcam_`date +%s`.zip ./*
-
-@@ -34,10 +34,10 @@ gresource: .gresource.xml icon2.png
+ zip -x icon.png src/ src/* Makefile -r droidcam_`date +%s`.zip ./*
+
+@@ -36,10 +36,10 @@ gresource: .gresource.xml icon2.png
glib-compile-resources .gresource.xml --generate-source --target=src/resources.c
-
+
droidcam-cli: src/droidcam-cli.c $(SRC)
- $(GXX) $(CC) $^ $(JPEG) $(LIBAV) $(LIBS) -o droidcam-cli
+ $(GXX) $(CC) $(LDFLAGS) $(CFLAGS) $^ $(JPEG) $(LIBAV) $(LIBS) -o droidcam-cli
-
+
droidcam: src/droidcam.c src/resources.c $(SRC)
- $(GXX) $(CC) $^ $(GTK) $(JPEG) $(LIBAV) $(LIBS) -o droidcam
+ $(GXX) $(CC) $(LDFLAGS) $(CFLAGS) $^ $(GTK) $(JPEG) $(LIBAV) $(LIBS) -o droidcam
-
+
clean:
rm droidcam || true
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [gentoo-commits] repo/proj/guru:dev commit in: media-tv/droidcam/, media-tv/droidcam/files/
@ 2021-01-13 16:46 Andrew Ammerlaan
0 siblings, 0 replies; 7+ messages in thread
From: Andrew Ammerlaan @ 2021-01-13 16:46 UTC (permalink / raw
To: gentoo-commits
commit: 9748372d467163b9aec41571ba9aabc16a0f73fa
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Jan 13 16:45:52 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Jan 13 16:45:52 2021 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=9748372d
media-tv/droidcam: version bump 1.7
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
media-tv/droidcam/Manifest | 2 +-
.../droidcam/{droidcam-1.6.ebuild => droidcam-1.7.ebuild} | 12 +++++++-----
media-tv/droidcam/files/droidcam-makefile-fixes.patch | 14 +++++++-------
3 files changed, 15 insertions(+), 13 deletions(-)
diff --git a/media-tv/droidcam/Manifest b/media-tv/droidcam/Manifest
index 4cd9ee57..74545b19 100644
--- a/media-tv/droidcam/Manifest
+++ b/media-tv/droidcam/Manifest
@@ -1 +1 @@
-DIST droidcam-1.6.tar.gz 80673 BLAKE2B 11e121b1e46a873404bdcd3794248dcb8006f9a3e78eaa1571c7b6e0299f9f7bf50bca28b294a7661e7d4d336ea680b29b4ece134d661ba0a17ab8793ef1a232 SHA512 09b41093ee09c65199809871a1d8cdc959323325bc734546396a8b31442f4665d1df4b846e37deb398c741756d2e94a219e73256598cc63e625a73fb93387d7b
+DIST droidcam-1.7.tar.gz 81605 BLAKE2B 81d2ffa1b3cb0f9791c4459c75aeaacb701d03cbde11c76cd18ff569854f304b5bb359552a9c0a3a8bbb32f2d9c0fa8bdc7a2eec9b60a047138098c3dea4aaf4 SHA512 d41df620734c51fca49d411b96cd2889269df9548044af2c0b165025f08205a5a99a9e4c5896742174833a2b00ed89d8dd955b593d4acc39cbac658282841439
diff --git a/media-tv/droidcam/droidcam-1.6.ebuild b/media-tv/droidcam/droidcam-1.7.ebuild
similarity index 90%
rename from media-tv/droidcam/droidcam-1.6.ebuild
rename to media-tv/droidcam/droidcam-1.7.ebuild
index 42caab29..aee0b786 100644
--- a/media-tv/droidcam/droidcam-1.6.ebuild
+++ b/media-tv/droidcam/droidcam-1.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2019-2020 Gentoo Authors
+# Copyright 2019-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -16,7 +16,7 @@ SLOT="0"
IUSE="gtk"
-# Requires connection to android phone
+# Requires connection to phone
RESTRICT="test"
DEPEND="
@@ -39,7 +39,7 @@ DEPEND="
BDEPEND="virtual/pkgconfig"
-S="${WORKDIR}/${P}/linux"
+RDEPEND="${DEPEND}"
DOCS=( README.md README-DKMS.md )
DISABLE_AUTOFORMATTING="true"
@@ -61,8 +61,10 @@ PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
src_prepare() {
if ! use gtk ; then
- sed -i -e '/cflags gtk+/d' Makefile
+ sed -i -e '/cflags gtk+/d' Makefile || die
else
+ # remove path and extension from icon entry
+ sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' droidcam.desktop || die
xdg_src_prepare
fi
linux-mod_pkg_setup
@@ -97,7 +99,7 @@ src_install() {
dobin droidcam
newicon -s 32 icon.png droidcam.png
newicon -s 48 icon2.png droidcam.png
- make_desktop_entry "${PN}" "DroidCam Client" "${PN}" AudioVideo
+ domenu droidcam.desktop
fi
dobin "${PN}-cli"
diff --git a/media-tv/droidcam/files/droidcam-makefile-fixes.patch b/media-tv/droidcam/files/droidcam-makefile-fixes.patch
index 4fe51776..33270582 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..16afe8b 100644
+index d1c514e..5abd541 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
@@ -23,15 +23,15 @@ index 91ca3af..16afe8b 100644
all: droidcam-cli droidcam
- ifeq "$(RELEASE)" "1"
+ ifneq "$(RELEASE)" ""
-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
+-SRC += src/libusbmuxd.a src/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-2.0.so /usr/lib/x86_64-linux-gnu/libxml2.so src/libplist-2.0.so
++SRC += src/libusbmuxd-2.0.so src/libxml2.so src/libplist-2.0.so
package: clean all
- zip -x icon.png src/ src/* Makefile -r droidcam_`date +%s`.zip ./*
-
-@@ -36,10 +36,10 @@ gresource: .gresource.xml icon2.png
+ zip "droidcam_$(RELEASE).zip" \
+ LICENSE README* icon2.png \
+@@ -39,10 +39,10 @@ gresource: .gresource.xml icon2.png
glib-compile-resources .gresource.xml --generate-source --target=src/resources.c
droidcam-cli: src/droidcam-cli.c $(SRC)
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2021-01-13 16:46 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-02 10:00 [gentoo-commits] repo/proj/guru:dev commit in: media-tv/droidcam/, media-tv/droidcam/files/ Andrew Ammerlaan
2020-05-02 10:00 ` [gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/files/, media-tv/droidcam/ Andrew Ammerlaan
-- strict thread matches above, loose matches on Subject: below --
2021-01-13 16:46 [gentoo-commits] repo/proj/guru:dev commit in: media-tv/droidcam/, media-tv/droidcam/files/ Andrew Ammerlaan
2020-10-02 14:08 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-10-02 14:08 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
2020-07-30 16:16 [gentoo-commits] repo/proj/guru:master commit in: media-tv/droidcam/files/, media-tv/droidcam/ Andrew Ammerlaan
2020-07-30 16:16 ` [gentoo-commits] repo/proj/guru:dev commit in: media-tv/droidcam/, media-tv/droidcam/files/ Andrew Ammerlaan
2020-05-11 9:32 Andrew Ammerlaan
2020-04-22 17:45 [gentoo-commits] repo/proj/guru:master " Andrew Ammerlaan
2020-04-22 17:45 ` [gentoo-commits] repo/proj/guru:dev " Andrew Ammerlaan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox