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

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

[Andrew Ammerlaan]

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

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

[Andrew Ammerlaan]

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

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

[Andrew Ammerlaan]

commit:     c5e77d623333c44dd5ef82715a11a22ade63ad51
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Wed Jul 29 11:21:50 2020 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Wed Jul 29 11:21:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c5e77d62

media-tv/droidcam: many fixes to the ebuild

- added missing deps
- bumped to a offical release version
	(jeej there are now releases)
- improved makefile patch
- added gtk use flag, it is now possible to
	only install the cli part of the program
- expanded config check, package now has audio support

Many thanks to @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>

 media-tv/droidcam/Manifest                         |   2 +-
 media-tv/droidcam/droidcam-1.4.ebuild              | 126 +++++++++++++++++++++
 .../droidcam/droidcam-6.7.7_pre20200506.ebuild     |  74 ------------
 media-tv/droidcam/files/README.gentoo              |   6 +
 .../droidcam/files/droidcam-libjpeg-location.patch |  13 ---
 .../droidcam/files/droidcam-makefile-fixes.patch   |  44 +++++++
 6 files changed, 177 insertions(+), 88 deletions(-)

diff --git a/media-tv/droidcam/Manifest b/media-tv/droidcam/Manifest
index affc279..13a8d36 100644
--- a/media-tv/droidcam/Manifest
+++ b/media-tv/droidcam/Manifest
@@ -1 +1 @@
-DIST droidcam-6.7.7_pre20200506.tar.gz 54514 BLAKE2B 1a68736bf70b11f216eea9893bc858ea6b859c2d0b6a89d9e5e5c9d7a9dc1a7ed97d6e1cea96ae3c8683d08effa861c59b9576dcf804bbae7a25c368b3fee50b SHA512 e9864cdd311e91fd417ce5d33ec15ce76dd9b4f3fa50eef7dadddee8db2f788ad992dd869b1d27e41df02df1e9a08fec3544e539378808d3fa862ffdecea11a7
+DIST droidcam-1.4.tar.gz 84350 BLAKE2B 3d627f94aa9d04b3ce9785005b5a3d06895c74254001033c7d881bdc2359e3d34db5668e0df59a9f293014f7cd78e6f4aa07f25cd8a8ed3f54c1658a9406e7d8 SHA512 60ca2d15514a03a71e04e0f5e1382a5af4e7244329d4113e8af1dd0adb8a448febc60adf94bbcad8db8de0e0ffd906de1f2427488dc9e27ebe7739c7331ac99d

diff --git a/media-tv/droidcam/droidcam-1.4.ebuild b/media-tv/droidcam/droidcam-1.4.ebuild
new file mode 100644
index 0000000..9048b4b
--- /dev/null
+++ b/media-tv/droidcam/droidcam-1.4.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2019-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop eutils linux-mod readme.gentoo-r1 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/v${PV}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="gtk"
+
+# Requires connection to android phone
+RESTRICT="test"
+
+DEPEND="
+	gtk? (
+		dev-cpp/gtkmm:3.0
+		media-video/ffmpeg
+	)
+	=app-pda/libusbmuxd-1*
+	media-libs/alsa-lib
+"
+
+BDEPEND="
+	media-libs/libjpeg-turbo
+	>=media-libs/speex-1.2.0-r1
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${P}/linux"
+
+PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch"
+
+DOCS=( README.md README-DKMS.md )
+DISABLE_AUTOFORMATTING="true"
+DOC_CONTENTS="
+		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"
+MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
+
+src_prepare() {
+	default
+	if ! use gtk ; then
+		sed -i -e '/cflags gtk+/d' Makefile
+	fi
+	linux-mod_pkg_setup
+}
+
+src_configure() {
+	set_arch_to_kernel
+	default
+}
+
+src_compile() {
+	if use gtk ; then
+		emake droidcam
+	fi
+	emake droidcam-cli
+	KERNELRELEASE="${KV_FULL}" linux-mod_src_compile
+}
+
+src_test() {
+	pushd "v4l2loopback"
+	default
+	./test || die
+	popd
+}
+
+src_install() {
+	if use gtk ; then
+		dobin droidcam
+		newicon -s 32 icon.png droidcam.png
+		newicon -s 48 icon2.png droidcam.png
+		make_desktop_entry "${PN}" "DroidCam Client" "${PN}" AudioVideo
+	fi
+	dobin "${PN}-cli"
+
+	readme.gentoo_create_doc
+
+	# 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"
+
+	einstalldocs
+	linux-mod_src_install
+}
+
+pkg_postinst() {
+	linux-mod_pkg_postinst
+
+	if use gtk ; then
+		xdg_pkg_postinst
+	fi
+
+	elog ""
+	elog "To use this package, 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"
+
+	elog ""
+	optfeature "to connection with USB via ADB instead of over wifi" dev-util/android-tools
+}
+
+pkg_postrm() {
+	if use gtk ; then
+		xdg_pkg_postrm
+	fi
+
+	linux-mod_pkg_postrm
+}

diff --git a/media-tv/droidcam/droidcam-6.7.7_pre20200506.ebuild b/media-tv/droidcam/droidcam-6.7.7_pre20200506.ebuild
deleted file mode 100644
index 580c12f..0000000
--- a/media-tv/droidcam/droidcam-6.7.7_pre20200506.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2019-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-COMMIT="98cbf07def9604f92fd74ea2964d483347388909"
-
-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"
-
-RDEPEND="x11-libs/gtk+:2"
-
-S="${WORKDIR}/${PN}-${COMMIT}/linux"
-
-PATCHES="${FILESDIR}/${PN}-libjpeg-location.patch"
-
-CONFIG_CHECK="VIDEO_DEV"
-MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)"
-MODULESD_V4L2LOOPBACK_DC_ENABLED="yes"
-BUILD_TARGETS="all"
-
-src_configure() {
-	set_arch_to_kernel
-	default
-}
-
-src_compile() {
-	default
-	KERNELRELEASE="${KV_FULL}" 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'
-
-	# 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() {
-	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/README.gentoo b/media-tv/droidcam/files/README.gentoo
new file mode 100644
index 0000000..6a5bdb4
--- /dev/null
+++ b/media-tv/droidcam/files/README.gentoo
@@ -0,0 +1,6 @@
+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-libjpeg-location.patch b/media-tv/droidcam/files/droidcam-libjpeg-location.patch
deleted file mode 100644
index 1b1a1e0..0000000
--- a/media-tv/droidcam/files/droidcam-libjpeg-location.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 3a37443..2a68b2e 100644
---- a/Makefile
-+++ b/Makefile
-@@ -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$(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
- 

diff --git a/media-tv/droidcam/files/droidcam-makefile-fixes.patch b/media-tv/droidcam/files/droidcam-makefile-fixes.patch
new file mode 100644
index 0000000..238898c
--- /dev/null
+++ b/media-tv/droidcam/files/droidcam-makefile-fixes.patch
@@ -0,0 +1,44 @@
+diff --git a/Makefile b/Makefile
+index 97a6e1f..6779293 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`
+ 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
+
+ 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
+ 	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

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

[Andrew Ammerlaan]

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

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

[Andrew Ammerlaan]

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)

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

[Andrew Ammerlaan]

commit:     cf22746fd32aec0d4c386d59f69f55d22d7c1ae5
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Fri Mar  5 21:12:21 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Fri Mar  5 21:12:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=cf22746f

media-tv/droidcam: version bump 1.7.2

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

 media-tv/droidcam/Manifest                         |  2 +-
 .../{droidcam-1.7.ebuild => droidcam-1.7.2.ebuild} |  0
 .../droidcam/files/droidcam-makefile-fixes.patch   | 28 ++++++++++++----------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/media-tv/droidcam/Manifest b/media-tv/droidcam/Manifest
index 74545b19..cd933296 100644
--- a/media-tv/droidcam/Manifest
+++ b/media-tv/droidcam/Manifest
@@ -1 +1 @@
-DIST droidcam-1.7.tar.gz 81605 BLAKE2B 81d2ffa1b3cb0f9791c4459c75aeaacb701d03cbde11c76cd18ff569854f304b5bb359552a9c0a3a8bbb32f2d9c0fa8bdc7a2eec9b60a047138098c3dea4aaf4 SHA512 d41df620734c51fca49d411b96cd2889269df9548044af2c0b165025f08205a5a99a9e4c5896742174833a2b00ed89d8dd955b593d4acc39cbac658282841439
+DIST droidcam-1.7.2.tar.gz 82690 BLAKE2B 3b7312f081dff747ccc9f8fab9a81bee079f697fa6bf8eb6982efa443a300751b9e8ebaa196950fc2c543e9abda3d9d7d26edc986cc916c36dcbccf9f6db0102 SHA512 0515760b3705abcb46acae5bbc05bba1d82416853c6438f776f6170e7469372d4d4236aae3500d409e572ae4e5289d3bd7416ed2729ea929e21146994c2de51c

diff --git a/media-tv/droidcam/droidcam-1.7.ebuild b/media-tv/droidcam/droidcam-1.7.2.ebuild
similarity index 100%
rename from media-tv/droidcam/droidcam-1.7.ebuild
rename to media-tv/droidcam/droidcam-1.7.2.ebuild

diff --git a/media-tv/droidcam/files/droidcam-makefile-fixes.patch b/media-tv/droidcam/files/droidcam-makefile-fixes.patch
index 33270582..fb3c37b6 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 d1c514e..5abd541 100644
+index 54738f5..bcb5800 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -6,7 +6,7 @@
+@@ -6,25 +6,25 @@
  # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  # Use at your own risk. See README file for more details.
  
@@ -11,13 +11,16 @@ index d1c514e..5abd541 100644
  JPEG_INCLUDE ?= $(JPEG_DIR)/include
  JPEG_LIB ?= $(JPEG_DIR)/lib`getconf LONG_BIT`
  
-@@ -16,15 +16,15 @@ GTK   = `pkg-config --libs --cflags gtk+-3.0` `pkg-config --libs x11`
- GTK  += `pkg-config --cflags --libs appindicator3-0.1`
+ 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`
  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
+ SRC   = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c
 -USBMUXD = -lusbmuxd
 +USBMUXD = -lusbmuxd-2.0
  
@@ -31,16 +34,17 @@ index d1c514e..5abd541 100644
  package: clean all
  	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
+@@ -40,11 +40,11 @@ gresource: .gresource.xml icon2.png
  
+ droidcam-cli: LDLIBS += $(JPEG) $(LIBAV) $(LIBS)
  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
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
  
+ droidcam: LDLIBS += $(GTK) $(JPEG) $(LIBAV) $(LIBS)
  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
+-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
++	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS)
  
  clean:
- 	rm droidcam || true
+ 	rm -f droidcam