diff options
-rw-r--r-- | .SRCINFO | 21 | ||||
-rw-r--r-- | 0001-Use-shared-version-of-libjpeg-turbo.patch | 42 | ||||
-rw-r--r-- | PKGBUILD | 66 | ||||
-rw-r--r-- | droidcam.install | 14 |
4 files changed, 77 insertions, 66 deletions
@@ -1,21 +1,18 @@ pkgbase = droidcam pkgdesc = A tool for using your android device as a wireless/usb webcam - pkgver = 6.7.5 - pkgrel = 5 + pkgver = 6.7.5.6c7b273 + pkgrel = 1 url = https://www.dev47apps.com/droidcam/linuxx - install = droidcam.install arch = x86_64 - license = custom - makedepends = linux-headers - optdepends = v4l-utils: Userspace tools and conversion library for Video 4 Linux + license = GPL + depends = v4l2loopback-dc-dkms optdepends = gtk2: use GUI version in addition to CLI interface - options = !strip source = droidcam.desktop - source = https://github.com/aramg/droidcam/raw/master/linux/icon2.png - source = droidcam.tar.bz2::https://www.dev47apps.com/files/linux/droidcam_latest.zip - md5sums = 199d8f3dbc6697f06350b00de99f2274 - md5sums = 0f0e1d04146dd5be70d5028f144bd0a2 - md5sums = 5ff0e772a76befba4e37e03101b611d7 + source = 0001-Use-shared-version-of-libjpeg-turbo.patch + source = droidcam.zip::https://github.com/aramg/droidcam/archive/6c7b273bd20b23a5b1074d5af30f0a13ce3d6065.zip + sha512sums = 72d21aa2d7eecc9bb070aaf7059a671246feb22f9c39b934a5463a4839f9347050de00754e5031dbc44f78eb2731f58f0cd2fcf781bc241f6fbd1abb4308b7ee + sha512sums = 238f41f5a3188226246e6446b3f8eceaf36472c0fb51dac995d535cf66cab27d9c43612fdfd553c57a398804db6ce817ecfaf2360ffbb53a404a05b6ac41a6bb + sha512sums = 0bc9d1223fe598f90cb537f9978bf35410248b366e0e3a9ea4815fbcb5a99e8fed8fe00833dacb678f3f125f7614e011276ae3835f91e50f78da87131bd381b8 pkgname = droidcam diff --git a/0001-Use-shared-version-of-libjpeg-turbo.patch b/0001-Use-shared-version-of-libjpeg-turbo.patch new file mode 100644 index 000000000000..9e6bd9083404 --- /dev/null +++ b/0001-Use-shared-version-of-libjpeg-turbo.patch @@ -0,0 +1,42 @@ +From 9dc735727f5ae73ffb2d9b29fe079d0b0b4a7245 Mon Sep 17 00:00:00 2001 +From: Mateusz Gozdek <mgozdekof@gmail.com> +Date: Tue, 5 May 2020 12:06:57 +0200 +Subject: [PATCH] Use shared version of libjpeg-turbo + +As Arch Linux does not provide static library file. + +Signed-off-by: Mateusz Gozdek <mgozdekof@gmail.com> +--- + linux/Makefile | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) + +diff --git a/linux/Makefile b/linux/Makefile +index 6995c18..a45957d 100644 +--- a/linux/Makefile ++++ b/linux/Makefile +@@ -8,8 +8,7 @@ + + 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 ++LIBS = `pkg-config --libs --cflags libswscale libavutil libturbojpeg` + SRC = src/connection.c src/decoder.c + NO_WARN = -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast + +@@ -23,10 +22,10 @@ endif + all: droidcam-cli droidcam + + droidcam-cli: src/droidcam-cli.c $(SRC) +- gcc -Wall $(CC) $(NO_WARN) $^ $(JPEG) $(LIBS) -lm -o droidcam-cli ++ gcc -Wall $(CC) $(NO_WARN) $^ $(LIBS) -lm -o droidcam-cli + + droidcam: src/droidcam.c $(SRC) +- gcc -Wall $(CC) $(NO_WARN) $^ $(GTK) $(JPEG) $(LIBS) -lm -o droidcam ++ gcc -Wall $(CC) $(NO_WARN) $^ $(GTK) $(LIBS) -lm -o droidcam + + clean: + rm droidcam || true +-- +2.26.2 + @@ -1,60 +1,46 @@ # Maintainer: AwesomeHaircut <jesusbalbastro at gmail com> +# Maintainer: Mateusz Gozdek <mgozdekof@gmail.com> # Contributor: Rein Fernhout <public@reinfernhout.xyz> # Past Contributor: James An <james@jamesan.ca> pkgname=droidcam -pkgver=6.7.5 -pkgrel=5 +_pkgver=6c7b273bd20b23a5b1074d5af30f0a13ce3d6065 +pkgver=6.7.5.6c7b273 +pkgrel=1 pkgdesc='A tool for using your android device as a wireless/usb webcam' arch=('x86_64') -url="https://www.dev47apps.com/$pkgname/linuxx" -license=('custom') -makedepends=( 'linux-headers' ) -options=('!strip') -optdepends=('v4l-utils: Userspace tools and conversion library for Video 4 Linux' - 'gtk2: use GUI version in addition to CLI interface' ) -install="$pkgname.install" -source=( - "$pkgname.desktop" - "https://github.com/aramg/$pkgname/raw/master/linux/icon2.png" - "$pkgname.tar.bz2::https://www.dev47apps.com/files/linux/droidcam_latest.zip" -) +url="https://www.dev47apps.com/${pkgname}/linuxx" +license=('GPL') +depends=('v4l2loopback-dc-dkms') +optdepends=('gtk2: use GUI version in addition to CLI interface' ) -#noextract=("$pkgname.tar.bz2") -md5sums=( - '199d8f3dbc6697f06350b00de99f2274' - '0f0e1d04146dd5be70d5028f144bd0a2' - '5ff0e772a76befba4e37e03101b611d7' +source=("${pkgname}.desktop" + "0001-Use-shared-version-of-libjpeg-turbo.patch" + "droidcam.zip::https://github.com/aramg/${pkgname}/archive/${_pkgver}.zip" ) +sha512sums=('72d21aa2d7eecc9bb070aaf7059a671246feb22f9c39b934a5463a4839f9347050de00754e5031dbc44f78eb2731f58f0cd2fcf781bc241f6fbd1abb4308b7ee' + '238f41f5a3188226246e6446b3f8eceaf36472c0fb51dac995d535cf66cab27d9c43612fdfd553c57a398804db6ce817ecfaf2360ffbb53a404a05b6ac41a6bb' + '0bc9d1223fe598f90cb537f9978bf35410248b366e0e3a9ea4815fbcb5a99e8fed8fe00833dacb678f3f125f7614e011276ae3835f91e50f78da87131bd381b8') + prepare() { - # Generate the module loading configuration files - cat <<EOF >| "v4l2loopback/$pkgname.modules-load.conf" -videodev -v4l2loopback_dc -EOF - echo "options v4l2loopback_dc width=320 height=240" >| "v4l2loopback/$pkgname.modprobe.conf" + cd "${pkgname}-${_pkgver}" + patch -p1 --input="${srcdir}/0001-Use-shared-version-of-libjpeg-turbo.patch" } build() { - cd "v4l2loopback" + cd ${pkgname}-${_pkgver}/linux + make - gzip -f v4l2loopback-dc.ko } package() { + cd ${pkgname}-${_pkgver}/linux + # Install droidcam program files - install -Dm755 "$pkgname" "$pkgdir/usr/bin/$pkgname" - install -Dm755 "$pkgname-cli" "$pkgdir/usr/bin/$pkgname-cli" - install -Dm644 ../icon2.png "$pkgdir/usr/share/pixmaps/$pkgname.png" - install -Dm644 "../$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop" - install -Dm644 README.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE" - - # Install kernel module and config files - cd v4l2loopback - MODPATH="/usr/lib/modules/$(uname -r | sed 's/.[0-9]+-[0-9]+//')/extramodules" - install -Dm644 v4l2loopback-dc.ko.gz "$pkgdir$MODPATH/v4l2loopback_dc.ko.gz" - install -Dm644 "$pkgname.modules-load.conf" "$pkgdir/usr/lib/modules-load.d/$pkgname.conf" - install -Dm644 "$pkgname.modprobe.conf" "$pkgdir/etc/modprobe.d/$pkgname.conf" + install -Dm755 "${pkgname}" "$pkgdir/usr/bin/${pkgname}" + install -Dm755 "${pkgname}-cli" "$pkgdir/usr/bin/${pkgname}-cli" + install -Dm644 icon2.png "$pkgdir/usr/share/pixmaps/${pkgname}.png" + install -Dm644 "../../${pkgname}.desktop" "$pkgdir/usr/share/applications/${pkgname}.desktop" + install -Dm644 README.md "$pkgdir/usr/share/licenses/${pkgname}/LICENSE" } - diff --git a/droidcam.install b/droidcam.install deleted file mode 100644 index 52167625fe9b..000000000000 --- a/droidcam.install +++ /dev/null @@ -1,14 +0,0 @@ -post_install() { - insmod /lib/modules/"$(uname -r)"/extramodules/v4l2loopback_dc.ko.gz -} - -post_upgrade() { - post_install -} - -post_remove() { - rmmod /lib/modules/"$(uname -r)"/extramodules/v4l2loopback_dc.ko.gz -} - - -# vim: ts=2 sw=2 et: |