From 18f033cb17690c2ba844f8251342648ea5ad1bf2 Mon Sep 17 00:00:00 2001
From: graysky <graysky@archlinux.us>
Date: Mon, 6 Dec 2021 03:36:48 -0500
Subject: [PATCH] aur/shinobi-git to r2106.a2faa40-1

---
 aur/shinobi-git/PKGBUILD               | 35 +++++++++++++-------------
 aur/shinobi-git/shinobi-camera.service |  2 +-
 aur/shinobi-git/shinobi-cron.service   |  2 +-
 aur/shinobi-git/shinobi.target         |  2 +-
 4 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/aur/shinobi-git/PKGBUILD b/aur/shinobi-git/PKGBUILD
index e49286462..d31df8489 100644
--- a/aur/shinobi-git/PKGBUILD
+++ b/aur/shinobi-git/PKGBUILD
@@ -3,28 +3,29 @@
 
 buildarch=28
 
-pkgname="shinobi-git"
-pkgver=r2075.e89ad75
+pkgname=shinobi-git
+pkgver=r2106.a2faa40
 pkgrel=1
 pkgdesc="The Open Source CCTV and NVR Solution"
 url="https://shinobi.video/"
 license=(custom) # not free for commercial use
 arch=(any)
 provides=(shinobi)
-depends=(ffmpeg-shinobi mariadb nodejs)
+depends=(ffmpeg mariadb nodejs)
 makedepends=(npm git)
-source=("git+https://gitlab.com/Shinobi-Systems/Shinobi.git#branch=dev"
-        "shinobi-camera.service"
-        "shinobi-cron.service"
-        "shinobi.target"
-        "shinobi.sysusers"
-        "shinobi.tmpfiles"
-        "conf.json"
-        "super.json")
+optdepends=('ffmpeg-shinobi: if high CPU usage is seen using ffmpeg')
+source=(git+https://gitlab.com/Shinobi-Systems/Shinobi.git#branch=dev
+        shinobi-camera.service
+        shinobi-cron.service
+        shinobi.target
+        shinobi.sysusers
+        shinobi.tmpfiles
+        conf.json
+        super.json)
 sha256sums=('SKIP'
-            '59b51fe6cb3dc5e7e01401b20a1a7e51f649a7fd2292ff1d2d88df2cbdff9d5b'
-            '9794abc97379e84fc688977e6d675d607c1136dda8a428e6c5aa8a9cfac8029c'
-            '60cb5660061fccae12a8ffaf4b1ee2960ab4dc8106b4b95419274a359cd9cd22'
+            'da346d9858dafb1a42dd43153d26763de05bc7cdabb5563b979ca62d2cc51ce3'
+            'adacf7a3ec970e6d5c5d8c339f56bdce3720b952ab7278f31d70a294fd0b5bdd'
+            '676111c7502ed43671ac5a4451ee0f89913de1c4b4f1e2120cd5c4b89e842757'
             'e7c849bfcf8619a093ec75467cf5e44b34cd3621fa0d639bfacf4c88e0bad258'
             'a0213eb276dfd468ed835cccceece75da92141716afa4c2426e20a06f64b5625'
             '45c64bdaf8e7c99f14a8467fc3c996fefdaab8c100c9f28f03054c248f62a7d3'
@@ -34,13 +35,13 @@ install=shinobi.install
 options=(!strip)
 
 pkgver(){
- cd "Shinobi"
+ cd Shinobi
  printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 package(){
  # no /usr/bin, just systemd files
- cd "Shinobi"
+ cd Shinobi
  # program files
  npm install --user root
  install -d "$pkgdir/usr/share/shinobi"
@@ -58,7 +59,7 @@ package(){
  install -D -m 644 "$srcdir/shinobi.sysusers" "$pkgdir/usr/lib/sysusers.d/shinobi.conf"
  install -D -m 644 "$srcdir/shinobi.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/shinobi.conf"
  # custom license
- install -D -m 644 "LICENSE.md" "$pkgdir/usr/share/licenses/shinobi/LICENSE"
+ install -D -m 644 LICENSE.md "$pkgdir/usr/share/licenses/shinobi/LICENSE"
  # version.json is used by the web server
  echo '{"Product" : "Shinobi Professional (Pro)" , "Branch" : "master" , "Version" : "'"$(git rev-parse HEAD)"'" , "Date" : "'"$(date)"'" , "Repository" : "https://gitlab.com/Shinobi-Systems/Shinobi"}' > "$pkgdir/usr/share/shinobi/version.json"
 }
diff --git a/aur/shinobi-git/shinobi-camera.service b/aur/shinobi-git/shinobi-camera.service
index 760950346..41025cc4f 100644
--- a/aur/shinobi-git/shinobi-camera.service
+++ b/aur/shinobi-git/shinobi-camera.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Shinobi server component
-After=network.target
+After=network-online.target
 PartOf=shinobi.target
 
 [Service]
diff --git a/aur/shinobi-git/shinobi-cron.service b/aur/shinobi-git/shinobi-cron.service
index 5e2686778..f38b016e9 100644
--- a/aur/shinobi-git/shinobi-cron.service
+++ b/aur/shinobi-git/shinobi-cron.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Shinobi cleanup component
-After=network.target
+After=network-online.target
 PartOf=shinobi.target
 
 [Service]
diff --git a/aur/shinobi-git/shinobi.target b/aur/shinobi-git/shinobi.target
index cb480d790..42771dc5d 100644
--- a/aur/shinobi-git/shinobi.target
+++ b/aur/shinobi-git/shinobi.target
@@ -1,6 +1,6 @@
 [Unit]
 Description=Shinobi Open Source CCTV and NVR Solution
-After=network.target
+After=network-online.target
 Wants=shinobi-camera.service shinobi-cron.service
 
 [Install]