summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatolii Sakhnik2018-06-12 21:53:46 +0300
committerAnatolii Sakhnik2018-06-12 21:54:25 +0300
commit3c981652ec24661232e5f41c4c2d1676f922510c (patch)
tree5b1df97c5b4725c65208a7fd0537a7456b99cf01
parente5dd4904d604d38dd752bbc93bbf55f281fe7d19 (diff)
downloadaur-3c981652ec24661232e5f41c4c2d1676f922510c.tar.gz
Avoid overwriting config files
-rw-r--r--.SRCINFO13
-rw-r--r--PKGBUILD17
2 files changed, 24 insertions, 6 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 6289e3fd6fda..7f31fc6b0dfc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Mon Jun 11 13:23:14 UTC 2018
+# Tue Jun 12 18:54:06 UTC 2018
pkgbase = kerberosio-machinery
pkgdesc = An image processing framework, which uses your USB-, IP- or RPi-camera to recognize events (e.g. motion).
pkgver = 2.6.1
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/kerberos-io/machinery
arch = x86_64
arch = armv7h
@@ -18,6 +18,15 @@ pkgbase = kerberosio-machinery
makedepends = automake
makedepends = git
depends = ffmpeg2.8
+ backup = /etc/opt/kerberosio/config/algorithm.xml
+ backup = /etc/opt/kerberosio/config/capture.xml
+ backup = /etc/opt/kerberosio/config/cloud.xml
+ backup = /etc/opt/kerberosio/config/condition.xml
+ backup = /etc/opt/kerberosio/config/config.xml
+ backup = /etc/opt/kerberosio/config/expositor.xml
+ backup = /etc/opt/kerberosio/config/heuristic.xml
+ backup = /etc/opt/kerberosio/config/io.xml
+ backup = /etc/opt/kerberosio/config/stream.xml
source = https://github.com/kerberos-io/machinery/archive/v2.6.1.tar.gz
source = 0001-Avoid-using-TLS.patch
source = 0002-Fix-for-distcc.patch
diff --git a/PKGBUILD b/PKGBUILD
index 04b7935902c5..7cd323428257 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Anatolii Sakhnik <sakhnik at gmail dot com>
pkgname=kerberosio-machinery
pkgver=2.6.1
-pkgrel=1
+pkgrel=2
_revision=v${pkgver}
pkgdesc="An image processing framework, which uses your USB-, IP- or RPi-camera to recognize events (e.g. motion)."
arch=('x86_64' 'armv7h' 'armv6h')
@@ -15,6 +15,15 @@ source=(${url}/archive/${_revision}.tar.gz
sha1sums=('db309f2a4a586f5cf679d5cf6a029cabe63c7d3a'
'd05ed01303a09d103f703118126348b1402b3950'
'b41c3ab8d1665584dac93b8dabab1ab3ed0a19ac')
+backup=('/etc/opt/kerberosio/config/algorithm.xml'
+ '/etc/opt/kerberosio/config/capture.xml'
+ '/etc/opt/kerberosio/config/cloud.xml'
+ '/etc/opt/kerberosio/config/condition.xml'
+ '/etc/opt/kerberosio/config/config.xml'
+ '/etc/opt/kerberosio/config/expositor.xml'
+ '/etc/opt/kerberosio/config/heuristic.xml'
+ '/etc/opt/kerberosio/config/io.xml'
+ '/etc/opt/kerberosio/config/stream.xml')
prepare()
{
@@ -26,9 +35,9 @@ prepare()
build()
{
ffmpeg_path=/usr/lib/ffmpeg2.8
- export LD_LIBRARY_PATH=$ffmpeg_path/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
- export PKG_CONFIG_PATH=$ffmpeg_path/lib/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
- export PKG_CONFIG_LIBDIR=$ffmpeg_path/lib${PKG_CONFIG_LIBDIR:+:$PKG_CONFIG_LIBDIR}
+ export LD_LIBRARY_PATH=${ffmpeg_path}${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+ export PKG_CONFIG_PATH=${ffmpeg_path}/pkgconfig${PKG_CONFIG_PATH:+:$PKG_CONFIG_PATH}
+ export PKG_CONFIG_LIBDIR=${ffmpeg_path}${PKG_CONFIG_LIBDIR:+:$PKG_CONFIG_LIBDIR}
if [[ $CARCH == armv7h ]]; then
echo "Requested LDFLAGS: $LDFLAGS"
echo "Removing --as-needed because it breaks the build for RPI"