summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorMateusz Gozdek2020-09-27 21:42:56 +0200
committerMateusz Gozdek2020-09-27 21:57:26 +0200
commit4817ae631da699ae99c2ab961928f36fb31d04d8 (patch)
treed296a5a8dec8eef6c15b700047d8b4f370585124
parent7d335c85637aa032a441b2f631dac282af30692b (diff)
downloadaur-4817ae631da699ae99c2ab961928f36fb31d04d8.tar.gz
Update to v1.5
Also Drop Makefile patch which allows building with system version of libraries, as it is now part of the upstream release. Also add 'libappindicator-gtk3' as build dependency, as Droidcam will now register application indicator while running. The indicator also requires an PNG icon to be loaded from /opt/droidcam-icon.png, so we place a copy there. Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>
-rw-r--r--.SRCINFO11
-rw-r--r--0001-Makefile-allow-to-modify-how-to-link-to-libusbmuxd.patch38
-rw-r--r--PKGBUILD17
3 files changed, 11 insertions, 55 deletions
diff --git a/.SRCINFO b/.SRCINFO
index c79149b2130..2f2784aa9aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,25 +1,24 @@
pkgbase = droidcam
pkgdesc = A tool for using your android device as a wireless/usb webcam
- pkgver = 1.4
- pkgrel = 3
+ pkgver = 1.5
+ pkgrel = 1
epoch = 1
url = https://github.com/aramg/droidcam
arch = x86_64
license = GPL
makedepends = gtk3
+ makedepends = libappindicator-gtk3
makedepends = ffmpeg
makedepends = libusbmuxd
backup = etc/modprobe.d/droidcam.conf
source = droidcam.desktop
source = dkms.conf
source = droidcam.conf
- source = droidcam-1.4.zip::https://github.com/aramg/droidcam/archive/v1.4.zip
- source = 0001-Makefile-allow-to-modify-how-to-link-to-libusbmuxd.patch
+ source = droidcam-1.5.zip::https://github.com/aramg/droidcam/archive/v1.5.zip
sha512sums = 72d21aa2d7eecc9bb070aaf7059a671246feb22f9c39b934a5463a4839f9347050de00754e5031dbc44f78eb2731f58f0cd2fcf781bc241f6fbd1abb4308b7ee
sha512sums = 27848dc6825c965c0aaac8e86220c3916ba20df6d941f5f05caecbf9c329ee744ee883bd2638ba58fe0dc3f40a8ae804dafbfbbe2efc23237e2b5450606cb78d
sha512sums = ea457b46a2fc9f1a3ea8e99f2cd0771a587cff89f42335fdaf55988dda0376a1fea73b660174c9f1906a304bace68bffec30b70b20dafc05ebae8854d9aadb13
- sha512sums = 3168d76d5d6f8b5a0f66858a40ac2ab6fb3b9e0db3ffdcab405367541569da6f4475b7893bb90b8dbd0478876678bc138afe9d472765c422e3300426215a5456
- sha512sums = ee56372bd0f63c4b89ba860c7d6df3d8f7a4de19e72258425b008e405d32e3efc3695c6eca6a8f1b8b4822e0ac8515e8ec504f55f6257a0453b0cb08ba33a582
+ sha512sums = 88329c9c002b2ed99bad9e88d0dfa63197774fe57e1561058536f038775516416e0aec810d4f43de165a72354f5a02ac1bab4f9ad28a4b263327a254ba8c59b3
pkgname = droidcam
depends = alsa-lib
diff --git a/0001-Makefile-allow-to-modify-how-to-link-to-libusbmuxd.patch b/0001-Makefile-allow-to-modify-how-to-link-to-libusbmuxd.patch
deleted file mode 100644
index c814eff9652..00000000000
--- a/0001-Makefile-allow-to-modify-how-to-link-to-libusbmuxd.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 78706f3f524df5910d4960e94f2000f7c37b0462 Mon Sep 17 00:00:00 2001
-From: Mateusz Gozdek <mgozdekof@gmail.com>
-Date: Mon, 6 Jul 2020 11:30:50 +0200
-Subject: [PATCH] Makefile: allow to modify how to link to libusbmuxd
-
-On distros like Arch Linux, libusbmuxd is installed as libusbmuxd-2.0,
-so building is currently broken. With this commit, building works again,
-if one specifies USBMUXD=-lusbmuxd-2.0 parameter.
-
-Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com>
----
- linux/Makefile | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git linux/Makefile linux/Makefile
-index 97a6e1f..5ff94e7 100644
---- linux/Makefile
-+++ linux/Makefile
-@@ -17,6 +17,7 @@ LIBAV = `pkg-config --libs --cflags libswscale libavutil`
- LIBS = -lspeex -lasound -lpthread -lm
- JPEG = -I$(JPEG_INCLUDE) $(JPEG_LIB)/libturbojpeg.a
- SRC = src/connection.c src/settings.c src/decoder*.c src/av.c src/usb.c
-+USBMUXD = -lusbmuxd
-
- all: droidcam-cli droidcam
-
-@@ -27,7 +28,7 @@ package: clean all
- zip -x *.png src/ src/* Makefile -r droidcam_`date +%s`.zip ./*
-
- else
--LIBS += -lusbmuxd
-+LIBS += $(USBMUXD)
- endif
-
- gresource: .gresource.xml icon2.png
---
-2.27.0
-
diff --git a/PKGBUILD b/PKGBUILD
index 27a203fc885..19c31d6329b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,40 +5,34 @@
pkgbase=droidcam
pkgname=('droidcam' 'v4l2loopback-dc-dkms')
-pkgver=1.4
-pkgrel=3
+pkgver=1.5
+pkgrel=1
epoch=1
pkgdesc='A tool for using your android device as a wireless/usb webcam'
arch=('x86_64')
url="https://github.com/aramg/${pkgbase}"
license=('GPL')
backup=("etc/modprobe.d/${pkgbase}.conf")
-makedepends=('gtk3' 'ffmpeg' 'libusbmuxd')
+makedepends=('gtk3' 'libappindicator-gtk3' 'ffmpeg' 'libusbmuxd')
source=("${pkgbase}.desktop"
"dkms.conf"
"${pkgbase}.conf"
"${pkgbase}-${pkgver}.zip::${url}/archive/v${pkgver}.zip"
- "0001-Makefile-allow-to-modify-how-to-link-to-libusbmuxd.patch"
)
sha512sums=('72d21aa2d7eecc9bb070aaf7059a671246feb22f9c39b934a5463a4839f9347050de00754e5031dbc44f78eb2731f58f0cd2fcf781bc241f6fbd1abb4308b7ee'
'27848dc6825c965c0aaac8e86220c3916ba20df6d941f5f05caecbf9c329ee744ee883bd2638ba58fe0dc3f40a8ae804dafbfbbe2efc23237e2b5450606cb78d'
'ea457b46a2fc9f1a3ea8e99f2cd0771a587cff89f42335fdaf55988dda0376a1fea73b660174c9f1906a304bace68bffec30b70b20dafc05ebae8854d9aadb13'
- '3168d76d5d6f8b5a0f66858a40ac2ab6fb3b9e0db3ffdcab405367541569da6f4475b7893bb90b8dbd0478876678bc138afe9d472765c422e3300426215a5456'
- 'ee56372bd0f63c4b89ba860c7d6df3d8f7a4de19e72258425b008e405d32e3efc3695c6eca6a8f1b8b4822e0ac8515e8ec504f55f6257a0453b0cb08ba33a582')
+ '88329c9c002b2ed99bad9e88d0dfa63197774fe57e1561058536f038775516416e0aec810d4f43de165a72354f5a02ac1bab4f9ad28a4b263327a254ba8c59b3')
prepare() {
# Generate the module loading configuration files
echo "options v4l2loopback_dc width=640 height=480" >| "${pkgbase}.modprobe.conf"
- # Apply patches.
- cd "${pkgname}-${pkgver}"
- patch -p0 --input="${srcdir}/0001-Makefile-allow-to-modify-how-to-link-to-libusbmuxd.patch"
-
# Ensure that 'install' script from repository does not collide with install binary used for
# building the package.
- chmod -x ./linux/install
+ chmod -x ${pkgname}-${pkgver}/linux/install
}
build() {
@@ -61,6 +55,7 @@ package_droidcam() {
install -Dm755 "${pkgbase}" "$pkgdir/usr/bin/${pkgbase}"
install -Dm755 "${pkgbase}-cli" "$pkgdir/usr/bin/${pkgbase}-cli"
install -Dm644 icon2.png "$pkgdir/usr/share/pixmaps/${pkgbase}.png"
+ install -Dm644 icon2.png "${pkgdir}/opt/droidcam-icon.png"
install -Dm644 "../../${pkgbase}.desktop" "$pkgdir/usr/share/applications/${pkgbase}.desktop"
install -Dm644 "../../${pkgbase}.conf" "${pkgdir}/etc/modules-load.d/${pkgbase}.conf"
install -Dm644 README.md "$pkgdir/usr/share/licenses/${pkgbase}/LICENSE"