v2.1.3

6 files changed, 64 insertions, 106 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4777e99d58c7..ed35d40f4dcb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,33 +1,42 @@
 pkgbase = droidcam
-	pkgdesc = A tool for using your android device as a wireless/usb webcam
-	pkgver = 2.1.2
+	pkgdesc = A tool to turn your phone/tablet into a wireless/usb webcam
+	pkgver = 2.1.3
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/dev47apps/droidcam
 	arch = x86_64
-	license = GPL
-	makedepends = libappindicator-gtk3
-	makedepends = gtk3
+	license = GPL-2.0-or-later
+	makedepends = alsa-lib
 	makedepends = ffmpeg
+	makedepends = libappindicator-gtk3
+	makedepends = libjpeg-turbo
 	makedepends = libusbmuxd
-	source = droidcam.desktop
+	makedepends = gtk3
+	makedepends = speex
+	source = droidcam-2.1.3.tar.gz::https://github.com/dev47apps/droidcam/archive/refs/tags/v2.1.3.tar.gz
 	source = dkms.conf
 	source = droidcam.conf
-	source = droidcam-2.1.2.zip::https://github.com/dev47apps/droidcam/archive/refs/tags/v2.1.2.zip
-	sha256sums = 90dd73cf146fae0de0c11b46e97412d2aaca50ec879e1be2d793261e853dd0d3
-	sha256sums = 1e91f58ae83d433d32b483b14f1bb39cc245d2ace711b12c894de27dd2ea3413
+	sha256sums = 0eb46c1ef19bce817b78740600d5451d14f7b279ebfd4605993d81f96aad08db
+	sha256sums = 20de9d14877732f2f75c21bdd4c335c71dcaeccab4ce348c6c0a210f622ceed2
 	sha256sums = 1d4b3ff98b4af9de77a24d1b6fad6e004deadf1f157eb800aa878ba1e7693dac
-	sha256sums = c669ccac95a91b5a673eef6dfceb785658f337e69c2fe0f7b1d34c82ad00e04b
 
 pkgname = droidcam
 	depends = alsa-lib
-	depends = libjpeg-turbo
 	depends = ffmpeg
-	depends = v4l2loopback-dc-dkms
+	depends = glib2
+	depends = glibc
+	depends = gtk3
+	depends = libappindicator-gtk3
+	depends = libjpeg-turbo
 	depends = libusbmuxd
-	optdepends = gtk3: use GUI version in addition to CLI interface
-	optdepends = libappindicator-gtk3: use GUI version in addition to CLI interface
+	depends = libx11
+	depends = pango
+	depends = speex
+	depends = V4L2LOOPBACK-MODULE
 
 pkgname = v4l2loopback-dc-dkms
+	pkgdesc = v4l2-loopback kernel module - DroidCam version
+	arch = any
 	depends = dkms
+	provides = V4L2LOOPBACK-MODULE
 	backup = etc/modprobe.d/droidcam.conf
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index f81563eaa5d9..000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-services:
-- docker
-script:
-- docker build --pull .
diff --git a/Dockerfile b/Dockerfile
deleted file mode 100644
index eb2e4373baf2..000000000000
--- a/Dockerfile
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM archlinux
-
-# base-devel is required for building.
-#
-# gtk3 is an optional dependency, but to that all linked libraries are satisfied,
-# we also install it.
-RUN pacman -Syy --noconfirm base-devel gtk3
-
-RUN useradd build
-
-RUN bash -c "echo 'build ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/build"
-
-COPY . /home/build/src/droidcam
-
-WORKDIR /home/build/src/droidcam
-
-RUN chown build: -R /home/build/src
-
-RUN sudo -u build makepkg -scir --noconfirm
-
-# List all linked dependencies.
-RUN bash -c 'ldd $(which droidcam) $(which droidcam-cli)'
-
-# If some linked libraries are not found, fail.
-RUN bash -c '(ldd $(which droidcam) $(which droidcam-cli) | grep "not found" && exit 1) || exit 0'
diff --git a/PKGBUILD b/PKGBUILD
index 315248e6fb4d..896aee4212ce 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,85 +1,72 @@
-# Maintainer: CodeXYZ <jesusbalbastro@gmail.com>
-# Maintainer: Mateusz Gozdek <mgozdekof@gmail.com>
+# Maintainer: Mahdi Sarikhani <mahdisarikhani@outlook.com>
+# Contributor: CodeXYZ <jesusbalbastro@gmail.com>
+# Contributor: Mateusz Gozdek <mgozdekof@gmail.com>
 # Contributor: Rein Fernhout <me@levitati.ng>
-# Past Contributor: James An <james@jamesan.ca>
+# Contributor: James An <james@jamesan.ca>
 
 pkgbase=droidcam
-pkgname=('droidcam' 'v4l2loopback-dc-dkms')
-pkgver=2.1.2
+pkgname=(droidcam v4l2loopback-dc-dkms)
+pkgver=2.1.3
 pkgrel=1
 epoch=1
-pkgdesc='A tool for using your android device as a wireless/usb webcam'
+pkgdesc="A tool to turn your phone/tablet into a wireless/usb webcam"
 arch=('x86_64')
-url="https://github.com/dev47apps/${pkgbase}"
-license=('GPL')
-makedepends=('libappindicator-gtk3' 'gtk3' 'ffmpeg' 'libusbmuxd')
-
-source=("${pkgbase}.desktop"
+url="https://github.com/dev47apps/droidcam"
+license=('GPL-2.0-or-later')
+makedepends=('alsa-lib' 'ffmpeg' 'libappindicator-gtk3' 'libjpeg-turbo' 'libusbmuxd' 'gtk3' 'speex')
+source=("${pkgbase}-${pkgver}.tar.gz::${url}/archive/refs/tags/v${pkgver}.tar.gz"
         "dkms.conf"
-        "${pkgbase}.conf"
-        "${pkgbase}-${pkgver}.zip::${url}/archive/refs/tags/v${pkgver}.zip"
-)
-
-sha256sums=('90dd73cf146fae0de0c11b46e97412d2aaca50ec879e1be2d793261e853dd0d3'
-            '1e91f58ae83d433d32b483b14f1bb39cc245d2ace711b12c894de27dd2ea3413'
-            '1d4b3ff98b4af9de77a24d1b6fad6e004deadf1f157eb800aa878ba1e7693dac'
-            'c669ccac95a91b5a673eef6dfceb785658f337e69c2fe0f7b1d34c82ad00e04b')
+        "${pkgbase}.conf")
+sha256sums=('0eb46c1ef19bce817b78740600d5451d14f7b279ebfd4605993d81f96aad08db'
+            '20de9d14877732f2f75c21bdd4c335c71dcaeccab4ce348c6c0a210f622ceed2'
+            '1d4b3ff98b4af9de77a24d1b6fad6e004deadf1f157eb800aa878ba1e7693dac')
 
 prepare() {
   # Generate the module loading configuration files
   echo "options v4l2loopback_dc width=640 height=480" >| "${pkgbase}.modprobe.conf"
+
+  sed -i "s/@PKGVER@/${pkgver}/" dkms.conf
+
+  cd "${pkgbase}-${pkgver}"
+  sed -i 's|/opt/droidcam-icon.png|/usr/share/pixmaps/droidcam.png|' src/droidcam.c
+  sed -i -e 's|/usr/local/bin/||' -e 's|/opt/droidcam-icon.png|droidcam|' droidcam.desktop
+
 }
 
 build() {
-  cd ${pkgbase}-${pkgver}
+  cd "${pkgbase}-${pkgver}"
 
   # All JPEG* parameters are needed to use shared version of libturbojpeg instead of
   # static one.
   #
   # Also libusbmuxd requires an override while linking.
-  make JPEG_DIR="/usr/lib" JPEG_INCLUDE="/usr/include" JPEG_LIB="-lturbojpeg" USBMUXD=-lusbmuxd-2.0
+  make JPEG_DIR='/usr/lib' JPEG_INCLUDE='/usr/include' USBMUXD='-lusbmuxd-2.0'
 }
 
 package_droidcam() {
-  depends=('alsa-lib' 'libjpeg-turbo' 'ffmpeg' 'v4l2loopback-dc-dkms' 'libusbmuxd')
-  optdepends=('gtk3: use GUI version in addition to CLI interface' 'libappindicator-gtk3: use GUI version in addition to CLI interface')
-
-  pushd ${pkgbase}-${pkgver}
+  depends=('alsa-lib' 'ffmpeg' 'glib2' 'glibc' 'gtk3' 'libappindicator-gtk3' 'libjpeg-turbo' 'libusbmuxd' 'libx11' 'pango' 'speex' 'V4L2LOOPBACK-MODULE')
 
+  cd "${pkgbase}-${pkgver}"
   # Install droidcam program files
-  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 "${srcdir}/${pkgbase}.desktop" "${pkgdir}/usr/share/applications/${pkgbase}.desktop"
-  install -Dm644 "${srcdir}/${pkgbase}.conf" "${pkgdir}/etc/modules-load.d/${pkgbase}.conf"
-  install -Dm644 README.md "${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE"
+  install -Dm755 "${pkgname}" "${pkgname}-cli" -t "${pkgdir}/usr/bin"
+  install -Dm644 icon2.png "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+  install -Dm644 "${pkgname}.desktop" -t "${pkgdir}/usr/share/applications"
+  install -Dm644 "${srcdir}/${pkgname}.conf" -t "${pkgdir}/etc/modules-load.d"
 }
 
 package_v4l2loopback-dc-dkms() {
+  pkgdesc='v4l2-loopback kernel module - DroidCam version'
+  arch=('any')
   depends=('dkms')
+  provides=('V4L2LOOPBACK-MODULE')
   backup=("etc/modprobe.d/${pkgbase}.conf")
 
-  _pkgname=v4l2loopback-dc
-  local install_dir="${pkgdir}/usr/src/${_pkgname}-${pkgver}"
-
-  # Copy dkms.conf
-  install -Dm644 dkms.conf "${install_dir}/dkms.conf"
-
-  # Set name and version
-  sed -e "s/@_PKGNAME@/${_pkgname}/" -e "s/@PKGVER@/${pkgver}/" -i "${install_dir}/dkms.conf"
+  _pkgname="${pkgname%-*}"
 
   # Install module loading configuration
   install -Dm644 "${pkgbase}.modprobe.conf" "${pkgdir}/etc/modprobe.d/${pkgbase}.conf"
 
   # Install module source
-  cd ${pkgbase}-${pkgver}/v4l2loopback
-
-  for d in $(find . -type d); do
-    install -dm755 "${install_dir}/${d}"
-  done
-
-  for f in $(find . -type f ! -name '.gitignore'); do
-    install -m644 "${f}" "${install_dir}/${f}"
-  done
+  cd "${pkgbase}-${pkgver}/v4l2loopback"
+  install -Dm644 Makefile test.c v4l2loopback-dc.c "${srcdir}/dkms.conf" -t "${pkgdir}/usr/src/${_pkgname}-${pkgver}"
 }
diff --git a/dkms.conf b/dkms.conf
index 09f460bc779f..df6f71ac0e17 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,6 +1,7 @@
-PACKAGE_NAME="@_PKGNAME@"
+PACKAGE_NAME="v4l2loopback_dc"
 PACKAGE_VERSION="@PKGVER@"
-MAKE[0]="make"
-BUILT_MODULE_NAME[0]="@_PKGNAME@"
-DEST_MODULE_LOCATION[0]="/extramodules"
+CLEAN="make clean"
+MAKE[0]="make all"
+BUILT_MODULE_NAME[0]="v4l2loopback-dc"
+DEST_MODULE_LOCATION[0]="/updates"
 AUTOINSTALL="yes"
diff --git a/droidcam.desktop b/droidcam.desktop
deleted file mode 100644
index b180df821a40..000000000000
--- a/droidcam.desktop
+++ /dev/null
@@ -1,10 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=3.2.1
-Name=Droidcam
-Type=Application
-Exec=droidcam
-Icon=droidcam
-Categories=GNOME;AudioVideo;
-Comment=A tool for using your Android phone as a wireless/usb webcam
-