diff options
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | 0001-Makefile-allow-to-modify-how-to-link-to-libusbmuxd.patch | 38 | ||||
| -rw-r--r-- | PKGBUILD | 18 |
3 files changed, 58 insertions, 9 deletions
@@ -1,7 +1,7 @@ pkgbase = droidcam pkgdesc = A tool for using your android device as a wireless/usb webcam - pkgver = 1.3 - pkgrel = 2 + pkgver = 1.4 + pkgrel = 1 epoch = 1 url = https://github.com/aramg/droidcam arch = x86_64 @@ -12,17 +12,20 @@ pkgbase = droidcam source = droidcam.desktop source = dkms.conf source = droidcam.conf - source = droidcam-1.3.zip::https://github.com/aramg/droidcam/archive/v1.3.zip + 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 sha512sums = 72d21aa2d7eecc9bb070aaf7059a671246feb22f9c39b934a5463a4839f9347050de00754e5031dbc44f78eb2731f58f0cd2fcf781bc241f6fbd1abb4308b7ee sha512sums = 27848dc6825c965c0aaac8e86220c3916ba20df6d941f5f05caecbf9c329ee744ee883bd2638ba58fe0dc3f40a8ae804dafbfbbe2efc23237e2b5450606cb78d sha512sums = ea457b46a2fc9f1a3ea8e99f2cd0771a587cff89f42335fdaf55988dda0376a1fea73b660174c9f1906a304bace68bffec30b70b20dafc05ebae8854d9aadb13 - sha512sums = c783b62c530c521aa7f047073efe74b57f28fbadbd097dca595fb582820566aedd03c6e92d2f24d9ff84dceed8ab51955ad77e80481ebfb6e30423425f8f2953 + sha512sums = 3168d76d5d6f8b5a0f66858a40ac2ab6fb3b9e0db3ffdcab405367541569da6f4475b7893bb90b8dbd0478876678bc138afe9d472765c422e3300426215a5456 + sha512sums = ee56372bd0f63c4b89ba860c7d6df3d8f7a4de19e72258425b008e405d32e3efc3695c6eca6a8f1b8b4822e0ac8515e8ec504f55f6257a0453b0cb08ba33a582 pkgname = droidcam depends = alsa-lib depends = libjpeg-turbo depends = ffmpeg depends = v4l2loopback-dc-dkms + depends = libusbmuxd optdepends = gtk3: use GUI version in addition to CLI interface pkgname = v4l2loopback-dc-dkms 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 new file mode 100644 index 000000000000..c814eff9652c --- /dev/null +++ b/0001-Makefile-allow-to-modify-how-to-link-to-libusbmuxd.patch @@ -0,0 +1,38 @@ +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 + @@ -5,8 +5,8 @@ pkgbase=droidcam pkgname=('droidcam' 'v4l2loopback-dc-dkms') -pkgver=1.3 -pkgrel=2 +pkgver=1.4 +pkgrel=1 epoch=1 pkgdesc='A tool for using your android device as a wireless/usb webcam' arch=('x86_64') @@ -19,16 +19,22 @@ 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' - 'c783b62c530c521aa7f047073efe74b57f28fbadbd097dca595fb582820566aedd03c6e92d2f24d9ff84dceed8ab51955ad77e80481ebfb6e30423425f8f2953') + '3168d76d5d6f8b5a0f66858a40ac2ab6fb3b9e0db3ffdcab405367541569da6f4475b7893bb90b8dbd0478876678bc138afe9d472765c422e3300426215a5456' + 'ee56372bd0f63c4b89ba860c7d6df3d8f7a4de19e72258425b008e405d32e3efc3695c6eca6a8f1b8b4822e0ac8515e8ec504f55f6257a0453b0cb08ba33a582') 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" } build() { @@ -36,11 +42,13 @@ build() { # All JPEG* parameters are needed to use shared version of libturbojpeg instead of # static one. - make JPEG_DIR="" JPEG_INCLUDE="" JPEG_LIB="" JPEG=$(pkg-config --libs --cflags libturbojpeg) + # + # Also libusbmuxd requires an override while linking. + make JPEG_DIR="" JPEG_INCLUDE="" JPEG_LIB="" JPEG=$(pkg-config --libs --cflags libturbojpeg) USBMUXD=-lusbmuxd-2.0 } package_droidcam() { - depends=('alsa-lib' 'libjpeg-turbo' 'ffmpeg' 'v4l2loopback-dc-dkms') + depends=('alsa-lib' 'libjpeg-turbo' 'ffmpeg' 'v4l2loopback-dc-dkms' 'libusbmuxd') optdepends=('gtk3: use GUI version in addition to CLI interface' ) pushd ${pkgbase}-${pkgver}/linux |