summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnatolii Sakhnik2018-06-11 16:23:33 +0300
committerAnatolii Sakhnik2018-06-11 16:23:33 +0300
commite5dd4904d604d38dd752bbc93bbf55f281fe7d19 (patch)
treefa5d0d0ad8bd2bf4a650733f3d6f8a665fbc149b
parent871c37a154fbaf006909507dadaff9a5ef19b8d7 (diff)
downloadaur-e5dd4904d604d38dd752bbc93bbf55f281fe7d19.tar.gz
Update to 2.6.1, build with ffmpeg2.8
-rw-r--r--.SRCINFO12
-rw-r--r--PKGBUILD12
2 files changed, 14 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index ea74acabe185..6289e3fd6fda 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
# Generated by mksrcinfo v8
-# Sat Mar 24 20:48:01 UTC 2018
+# Mon Jun 11 13:23:14 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.5.0
- pkgrel = 2
+ pkgver = 2.6.1
+ pkgrel = 1
url = https://github.com/kerberos-io/machinery
arch = x86_64
arch = armv7h
@@ -17,11 +17,11 @@ pkgbase = kerberosio-machinery
makedepends = autoconf
makedepends = automake
makedepends = git
- depends = ffmpeg
- source = https://github.com/kerberos-io/machinery/archive/v2.5.0.tar.gz
+ depends = ffmpeg2.8
+ 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
- sha1sums = a8e61416e98e1febc790ffe1aa0127961611d87a
+ sha1sums = db309f2a4a586f5cf679d5cf6a029cabe63c7d3a
sha1sums = d05ed01303a09d103f703118126348b1402b3950
sha1sums = b41c3ab8d1665584dac93b8dabab1ab3ed0a19ac
diff --git a/PKGBUILD b/PKGBUILD
index 058453dab7e9..04b7935902c5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,18 +1,18 @@
# Maintainer: Anatolii Sakhnik <sakhnik at gmail dot com>
pkgname=kerberosio-machinery
-pkgver=2.5.0
-pkgrel=2
+pkgver=2.6.1
+pkgrel=1
_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')
url="https://github.com/kerberos-io/machinery"
license=('CC-NC-ND')
-depends=('ffmpeg')
+depends=('ffmpeg2.8')
makedepends=('make' 'gcc' 'binutils' 'patch' 'cmake' 'autoconf' 'automake' 'git')
source=(${url}/archive/${_revision}.tar.gz
0001-Avoid-using-TLS.patch
0002-Fix-for-distcc.patch)
-sha1sums=('a8e61416e98e1febc790ffe1aa0127961611d87a'
+sha1sums=('db309f2a4a586f5cf679d5cf6a029cabe63c7d3a'
'd05ed01303a09d103f703118126348b1402b3950'
'b41c3ab8d1665584dac93b8dabab1ab3ed0a19ac')
@@ -25,6 +25,10 @@ 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}
if [[ $CARCH == armv7h ]]; then
echo "Requested LDFLAGS: $LDFLAGS"
echo "Removing --as-needed because it breaks the build for RPI"