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

2021-01-13 Thread Andrew Ammerlaan 
commit: 9748372d467163b9aec41571ba9aabc16a0f73fa
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Wed Jan 13 16:45:52 2021 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Wed Jan 13 16:45:52 2021 +
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  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:dev commit in: media-tv/droidcam/, media-tv/droidcam/files/

2020-10-02 Thread Andrew Ammerlaan 
commit: 36dcfcaed8c14a8bffd2c6ae37ff41e4fadfd238
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Fri Oct  2 14:04:03 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Fri Oct  2 14:04:03 2020 +
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  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:dev commit in: media-tv/droidcam/, media-tv/droidcam/files/

2020-05-11 Thread Andrew Ammerlaan 
commit: 2d3699f4f476d7ebc65d637f6d4a04a6ce73b3e3
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Mon May 11 09:32:17 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Mon May 11 09:32:17 2020 +
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  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 
5af8ef8b84652a5100381ce9a6d4cd6fa57773676a8c0a22f3d28329e2891e3145a436e0330bc9b242987c48b451a9445c896aa7f84a349464e10e5238d9
 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:dev commit in: media-tv/droidcam/, media-tv/droidcam/files/

2020-04-22 Thread Andrew Ammerlaan 
commit: ea18bc40836fb8bc19243de01b6cd3116c4fac84
Author: Andrew Ammerlaan  riseup  net>
AuthorDate: Wed Apr 22 17:44:52 2020 +
Commit: Andrew Ammerlaan  riseup  net>
CommitDate: Wed Apr 22 17:44:52 2020 +
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  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 000..7398776
--- /dev/null
+++ b/media-tv/droidcam/files/v4l2loopback-dc.conf
@@ -0,0 +1 @@
+v4l2loopback-dc