diff options
author | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-07 10:51:24 -0300 |
---|---|---|
committer | Nicolás Reynolds <fauno@kiwwwi.com.ar> | 2012-05-07 10:51:24 -0300 |
commit | bbcf09daf7ecaf715e986eb0eadab27a14d2408a (patch) | |
tree | e65686ba80c43b9a15038fd0a7fe177492b0470a /community/motion | |
parent | 479fa0a84b45b9ddb084568db5075a8592cb29ee (diff) | |
parent | 9d0c8979390868a2913fc8830a9f62a45174746b (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/ruby-gtk2/PKGBUILD
core/lvm2/PKGBUILD
Diffstat (limited to 'community/motion')
-rw-r--r-- | community/motion/PKGBUILD | 8 | ||||
-rwxr-xr-x | community/motion/rc.motion | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/community/motion/PKGBUILD b/community/motion/PKGBUILD index df25eb4d9..a165015eb 100644 --- a/community/motion/PKGBUILD +++ b/community/motion/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 67264 2012-03-06 01:23:37Z spupykin $ +# $Id: PKGBUILD 70406 2012-05-05 14:52:58Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=motion pkgver=3.2.12 -pkgrel=3 +pkgrel=4 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" arch=('i686' 'x86_64' 'mips64el') license=('GPL') @@ -16,11 +16,11 @@ source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz ffmpeg-0.8.patch linux-headers.patch) md5sums=('1ba0065ed50509aaffb171594c689f46' - '77be944e4466ab66836d50ea216af3b6' + '2e8c53c4980edddd420f08fdd572c9be' 'd36687710837d69fbce4608b1345fa34' 'd8c3c4fdded5cfbd729710475559a21d') sha1sums=('dc59b36e45e7626baa65ce62c961af918fea76bd' - 'e092b0d880d0169feb56ed1e8a3c95729a7896f7' + '47536a115d4df7497f6e6c616b76ea98e3372e29' '6912448db0711f85322505ee6f8052f8f98ae634' '6f33dab895ae398cc5e7017cbf5dc5d728f3ca9e') diff --git a/community/motion/rc.motion b/community/motion/rc.motion index b6057744a..5b4c65500 100755 --- a/community/motion/rc.motion +++ b/community/motion/rc.motion @@ -8,7 +8,7 @@ case "$1" in start) stat_busy "Starting Motion" mkdir -p /var/run/motion - [ -z "$PID" ] && /usr/bin/motion + [ -z "$PID" ] && /usr/bin/motion 1>/dev/null 2>&1 if [ $? -gt 0 ]; then stat_fail else |