summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Michalopoulos2020-12-02 16:34:16 +0200
committerAlexander Michalopoulos2020-12-02 16:34:16 +0200
commit34bc203f9489c781389cf8b35d06046baeee452b (patch)
treef5281f6d58cab849edd95b87331ffe23fee1276e
parent5600ecb838efb0537fd436c1808ba142fcf9e300 (diff)
downloadaur-34bc203f9489c781389cf8b35d06046baeee452b.tar.gz
v=6.0.6,r=2 - Trigger rebuild for Python 3.9
-rw-r--r--.SRCINFO6
-rw-r--r--PKGBUILD128
2 files changed, 67 insertions, 67 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eb13f869ee87..1a81f595a397 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = zmeventnotification
pkgdesc = A machine learning powered, secure websocket & MQTT based event notification server for ZoneMinder
pkgver = 6.0.6
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/pliablepixels/zmeventnotification
install = zmeventnotification.install
arch = any
@@ -28,12 +28,12 @@ pkgbase = zmeventnotification
depends = python-psutil
depends = python-sqlalchemy
depends = qt5-base
- conflicts = zmeventnotification-git
+ replaces = zmeventnotification-git
backup = etc/zoneminder/zmeventnotification.ini
backup = etc/zoneminder/secrets.ini
backup = etc/zoneminder/objectconfig.ini
backup = etc/zoneminder/es_rules.json
- source = git+https://github.com/pliablepixels/zmeventnotification.git#tag=v6.0.6
+ source = zmeventnotification-git::git+https://github.com/pliablepixels/zmeventnotification.git#tag=v6.0.6
source = https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/yolov3.cfg
source = https://raw.githubusercontent.com/pjreddie/darknet/master/data/coco.names
source = https://pjreddie.com/media/files/yolov3.weights
diff --git a/PKGBUILD b/PKGBUILD
index 019f9b7dbb7d..8f23e02ddc73 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
pkgname=zmeventnotification
pkgver=6.0.6
-pkgrel=1
+pkgrel=2
pkgdesc='A machine learning powered, secure websocket & MQTT based event notification server for ZoneMinder'
arch=('any')
url='https://github.com/pliablepixels/zmeventnotification'
@@ -16,32 +16,32 @@ depends=('opencv' 'perl-config-inifiles' 'perl-crypt-eksblowfish' 'perl-json' 'p
#'edgetpu_api'
)
makedepends=('git')
-conflicts=('zmeventnotification-git')
+replaces=('zmeventnotification-git')
backup=('etc/zoneminder/zmeventnotification.ini'
'etc/zoneminder/secrets.ini'
'etc/zoneminder/objectconfig.ini'
'etc/zoneminder/es_rules.json')
-install=$pkgname.install
-source=("git+https://github.com/pliablepixels/$pkgname.git#tag=v$pkgver"
+install=${pkgname}.install
+source=("${pkgname}-git::git+https://github.com/pliablepixels/${pkgname}.git#tag=v${pkgver}"
# YOLOv3
- "https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/yolov3.cfg"
- "https://raw.githubusercontent.com/pjreddie/darknet/master/data/coco.names"
- "https://pjreddie.com/media/files/yolov3.weights"
+ 'https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/yolov3.cfg'
+ 'https://raw.githubusercontent.com/pjreddie/darknet/master/data/coco.names'
+ 'https://pjreddie.com/media/files/yolov3.weights'
# YOLOv3 Tiny
- "https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/yolov3-tiny.cfg"
- #"https://raw.githubusercontent.com/pjreddie/darknet/master/data/coco.names"
- "https://pjreddie.com/media/files/yolov3-tiny.weights"
+ 'https://raw.githubusercontent.com/pjreddie/darknet/master/cfg/yolov3-tiny.cfg'
+ #'https://raw.githubusercontent.com/pjreddie/darknet/master/data/coco.names'
+ 'https://pjreddie.com/media/files/yolov3-tiny.weights'
# YOLOv4
- "https://raw.githubusercontent.com/AlexeyAB/darknet/master/cfg/yolov4.cfg"
- #"https://raw.githubusercontent.com/pjreddie/darknet/master/data/coco.names"
- "https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v3_optimal/yolov4.weights"
+ 'https://raw.githubusercontent.com/AlexeyAB/darknet/master/cfg/yolov4.cfg'
+ #'https://raw.githubusercontent.com/pjreddie/darknet/master/data/coco.names'
+ 'https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v3_optimal/yolov4.weights'
# YOLOv4 Tiny
- "https://raw.githubusercontent.com/AlexeyAB/darknet/master/cfg/yolov4-tiny.cfg"
- #"https://raw.githubusercontent.com/pjreddie/darknet/master/data/coco.names"
- "https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v4_pre/yolov4-tiny.weights"
+ 'https://raw.githubusercontent.com/AlexeyAB/darknet/master/cfg/yolov4-tiny.cfg'
+ #"https://raw.githubusercontent.com/pjreddie/darknet/master/data/coco.names'
+ 'https://github.com/AlexeyAB/darknet/releases/download/darknet_yolo_v4_pre/yolov4-tiny.weights'
# Google Coral Edge TPU
- "https://dl.google.com/coral/canned_models/coco_labels.txt"
- "https://github.com/google-coral/edgetpu/raw/master/test_data/ssd_mobilenet_v2_coco_quant_postprocess_edgetpu.tflite"
+ 'https://dl.google.com/coral/canned_models/coco_labels.txt'
+ 'https://github.com/google-coral/edgetpu/raw/master/test_data/ssd_mobilenet_v2_coco_quant_postprocess_edgetpu.tflite'
)
sha256sums=('SKIP'
'22489ea38575dfa36c67a90048e8759576416a79d32dc11e15d2217777b9a953'
@@ -57,7 +57,7 @@ sha256sums=('SKIP'
'232775917b5e0162b25c07bb1502ec3bbdeb5d0f1a835aba3097d5a2f4fc11e1')
prepare() {
- cd $pkgname
+ cd ${pkgname}-git
# Change the default upstream ZM address to match the one used by the ZoneMinder package in the AUR
sed -i 's|https://portal/zm|http://localhost:8095|g' secrets.ini
@@ -68,68 +68,68 @@ prepare() {
package() {
# Create the folder structure
- install -dm755 $pkgdir/etc/zoneminder
- install -dm755 $pkgdir/usr/bin
- install -dm755 $pkgdir/var/lib/$pkgname
- install -dm755 -o http -g http $pkgdir/var/lib/$pkgname/bin
- install -dm755 -o http -g http $pkgdir/var/lib/$pkgname/push
- install -dm755 -o http -g http $pkgdir/var/lib/$pkgname/contrib
- install -dm755 -o http -g http $pkgdir/var/lib/$pkgname/images
- install -dm755 -o http -g http $pkgdir/var/lib/$pkgname/mlapi
- install -dm755 -o http -g http $pkgdir/var/lib/$pkgname/known_faces
- install -dm755 -o http -g http $pkgdir/var/lib/$pkgname/unknown_faces
- install -dm755 -o http -g http $pkgdir/var/lib/$pkgname/models/yolov3
- install -dm755 -o http -g http $pkgdir/var/lib/$pkgname/models/tinyyolov3
- install -dm755 -o http -g http $pkgdir/var/lib/$pkgname/models/yolov4
- install -dm755 -o http -g http $pkgdir/var/lib/$pkgname/models/tinyyolov4
- install -dm755 -o http -g http $pkgdir/var/lib/$pkgname/models/coral_edgetpu
- install -dm755 -o http -g http $pkgdir/var/lib/$pkgname/misc
+ install -dm755 ${pkgdir}/etc/zoneminder
+ install -dm755 ${pkgdir}/usr/bin
+ install -dm755 ${pkgdir}/var/lib/${pkgname}
+ install -dm755 -o http -g http ${pkgdir}/var/lib/${pkgname}/bin
+ install -dm755 -o http -g http ${pkgdir}/var/lib/${pkgname}/push
+ install -dm755 -o http -g http ${pkgdir}/var/lib/${pkgname}/contrib
+ install -dm755 -o http -g http ${pkgdir}/var/lib/${pkgname}/images
+ install -dm755 -o http -g http ${pkgdir}/var/lib/${pkgname}/mlapi
+ install -dm755 -o http -g http ${pkgdir}/var/lib/${pkgname}/known_faces
+ install -dm755 -o http -g http ${pkgdir}/var/lib/${pkgname}/unknown_faces
+ install -dm755 -o http -g http ${pkgdir}/var/lib/${pkgname}/models/yolov3
+ install -dm755 -o http -g http ${pkgdir}/var/lib/${pkgname}/models/tinyyolov3
+ install -dm755 -o http -g http ${pkgdir}/var/lib/${pkgname}/models/yolov4
+ install -dm755 -o http -g http ${pkgdir}/var/lib/${pkgname}/models/tinyyolov4
+ install -dm755 -o http -g http ${pkgdir}/var/lib/${pkgname}/models/coral_edgetpu
+ install -dm755 -o http -g http ${pkgdir}/var/lib/${pkgname}/misc
# Move the object recognition model files into place
- install -m644 yolov3.cfg $pkgdir/var/lib/$pkgname/models/yolov3
- install -m644 coco.names $pkgdir/var/lib/$pkgname/models/yolov3
- install -m644 yolov3.weights $pkgdir/var/lib/$pkgname/models/yolov3
+ install -m644 yolov3.cfg ${pkgdir}/var/lib/${pkgname}/models/yolov3
+ install -m644 coco.names ${pkgdir}/var/lib/${pkgname}/models/yolov3
+ install -m644 yolov3.weights ${pkgdir}/var/lib/${pkgname}/models/yolov3
- install -m644 yolov3-tiny.cfg $pkgdir/var/lib/$pkgname/models/tinyyolov3
- install -m644 coco.names $pkgdir/var/lib/$pkgname/models/tinyyolov3
- install -m644 yolov3-tiny.weights $pkgdir/var/lib/$pkgname/models/tinyyolov3
+ install -m644 yolov3-tiny.cfg ${pkgdir}/var/lib/${pkgname}/models/tinyyolov3
+ install -m644 coco.names ${pkgdir}/var/lib/${pkgname}/models/tinyyolov3
+ install -m644 yolov3-tiny.weights ${pkgdir}/var/lib/${pkgname}/models/tinyyolov3
- install -m644 yolov4.cfg $pkgdir/var/lib/$pkgname/models/yolov4
- install -m644 coco.names $pkgdir/var/lib/$pkgname/models/yolov4
- install -m644 yolov4.weights $pkgdir/var/lib/$pkgname/models/yolov4
+ install -m644 yolov4.cfg ${pkgdir}/var/lib/${pkgname}/models/yolov4
+ install -m644 coco.names ${pkgdir}/var/lib/${pkgname}/models/yolov4
+ install -m644 yolov4.weights ${pkgdir}/var/lib/${pkgname}/models/yolov4
- install -m644 yolov4-tiny.cfg $pkgdir/var/lib/$pkgname/models/tinyyolov4
- install -m644 coco.names $pkgdir/var/lib/$pkgname/models/tinyyolov4
- install -m644 yolov4-tiny.weights $pkgdir/var/lib/$pkgname/models/tinyyolov4
+ install -m644 yolov4-tiny.cfg ${pkgdir}/var/lib/${pkgname}/models/tinyyolov4
+ install -m644 coco.names ${pkgdir}/var/lib/${pkgname}/models/tinyyolov4
+ install -m644 yolov4-tiny.weights ${pkgdir}/var/lib/${pkgname}/models/tinyyolov4
- install -m644 coco_labels.txt $pkgdir/var/lib/$pkgname/models/coral_edgetpu/coco_indexed.names
- install -m644 ssd_mobilenet_v2_coco_quant_postprocess_edgetpu.tflite $pkgdir/var/lib/$pkgname/models/coral_edgetpu
+ install -m644 coco_labels.txt ${pkgdir}/var/lib/${pkgname}/models/coral_edgetpu/coco_indexed.names
+ install -m644 ssd_mobilenet_v2_coco_quant_postprocess_edgetpu.tflite ${pkgdir}/var/lib/${pkgname}/models/coral_edgetpu
# Move the rest of the files into place
- cd $pkgname
+ cd ${pkgname}-git
- install -m755 -o http -g http zmeventnotification.pl $pkgdir/usr/bin
+ install -m755 -o http -g http zmeventnotification.pl ${pkgdir}/usr/bin
- install -m755 -o http -g http pushapi_plugins/pushapi_pushover.py $pkgdir/var/lib/$pkgname/bin
+ install -m755 -o http -g http pushapi_plugins/pushapi_pushover.py ${pkgdir}/var/lib/${pkgname}/bin
- install -m755 -o http -g http hook/zm_event_start.sh $pkgdir/var/lib/$pkgname/bin
- install -m755 -o http -g http hook/zm_event_end.sh $pkgdir/var/lib/$pkgname/bin
- install -m755 -o http -g http hook/zm_detect.py $pkgdir/var/lib/$pkgname/bin
- install -m755 -o http -g http hook/zm_train_faces.py $pkgdir/var/lib/$pkgname/bin
+ install -m755 -o http -g http hook/zm_event_start.sh ${pkgdir}/var/lib/${pkgname}/bin
+ install -m755 -o http -g http hook/zm_event_end.sh ${pkgdir}/var/lib/${pkgname}/bin
+ install -m755 -o http -g http hook/zm_detect.py ${pkgdir}/var/lib/${pkgname}/bin
+ install -m755 -o http -g http hook/zm_train_faces.py ${pkgdir}/var/lib/${pkgname}/bin
# Optional script to migrate your settings from 5.15.x to 6.x.x (read the official documentation for instructions)
- install -m755 -o http -g http hook/config_upgrade.py $pkgdir/var/lib/$pkgname/bin
+ install -m755 -o http -g http hook/config_upgrade.py ${pkgdir}/var/lib/${pkgname}/bin
- install -m644 -o http -g http docs/guides/contrib_guidelines.rst $pkgdir/var/lib/$pkgname/contrib
- install -m755 -o http -g http contrib/* $pkgdir/var/lib/$pkgname/contrib
+ install -m644 -o http -g http docs/guides/contrib_guidelines.rst ${pkgdir}/var/lib/${pkgname}/contrib
+ install -m755 -o http -g http contrib/* ${pkgdir}/var/lib/${pkgname}/contrib
- install -m644 zmeventnotification.ini $pkgdir/etc/zoneminder/
- install -m644 secrets.ini $pkgdir/etc/zoneminder/
- install -m644 hook/objectconfig.ini $pkgdir/etc/zoneminder/
- install -m644 es_rules.json $pkgdir/etc/zoneminder/
+ install -m644 zmeventnotification.ini ${pkgdir}/etc/zoneminder/
+ install -m644 secrets.ini ${pkgdir}/etc/zoneminder/
+ install -m644 hook/objectconfig.ini ${pkgdir}/etc/zoneminder/
+ install -m644 es_rules.json ${pkgdir}/etc/zoneminder/
# Temp fix for hardcoded /zm/ links in the configuration files
- ln -sf /etc/zoneminder $pkgdir/etc/zm
+ ln -sf /etc/zoneminder ${pkgdir}/etc/zm
# Install the accompanying Python package zmes_hooks
cd hook