diff options
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | PKGBUILD | 35 | ||||
| -rw-r--r-- | ffmpeg.patch | 42 |
3 files changed, 19 insertions, 71 deletions
@@ -1,7 +1,7 @@ pkgbase = motion pkgdesc = A software motion detector which grabs images from video4linux devices and/or from webcams - pkgver = 4.1.1 - pkgrel = 4 + pkgver = 4.2 + pkgrel = 1 url = https://motion-project.github.io arch = x86_64 arch = i686 @@ -11,17 +11,18 @@ pkgbase = motion license = GPL depends = sqlite depends = ffmpeg + depends = libmicrohttpd + depends = libwebp + optdepends = gettext: native language support backup = etc/motion/motion.conf - source = motion-4.1.1.tar.gz::https://github.com/Motion-Project/motion/archive/release-4.1.1.tar.gz + source = motion-4.2.tar.gz::https://github.com/Motion-Project/motion/archive/release-4.2.tar.gz source = motion.service source = motion.sysusers source = motion.tmpfiles - source = ffmpeg.patch - sha256sums = 2074b935bdfe28f84c2c3233274b06908336778f303bb13530d4299c3f8aa4e2 + sha256sums = 6ef8504fc5be00a49c82c4045c0004fbf575d9a5df8687025a9b06923efda2a9 sha256sums = a78dba35414f4d7147cc2c622eecdb3df249978023cbea5c6bc420c34ca387e7 sha256sums = 353fe3c2ee0afb7dafe1c6b7d1ac5655449dab836ab387cf335b4bd1dd37bf27 sha256sums = b34eaf6b085a25ef310102f892d0909247f1acb9d6a75cc9faca85e1ef076a1c - sha256sums = 14302daa63c0cdc8b0f1e7a8c790e254797b6f97e25bf9b8fab0453029151cbc pkgname = motion @@ -1,35 +1,24 @@ -# $Id: PKGBUILD 273896 2017-12-11 20:04:09Z jlichtblau $ # Maintainer: Evgeny Kurnevsky <kurnevsky@gmail.com> # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com> pkgname=motion -pkgver=4.1.1 -pkgrel=4 +pkgver=4.2 +pkgrel=1 pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams" arch=('x86_64' 'i686' 'armv7h' 'armv6h' 'aarch64') license=('GPL') url="https://motion-project.github.io" -depends=('sqlite' 'ffmpeg') +depends=('sqlite' 'ffmpeg' 'libmicrohttpd' 'libwebp') +optdepends=('gettext: native language support') backup=('etc/motion/motion.conf') -source=( - "$pkgname-$pkgver.tar.gz::https://github.com/Motion-Project/motion/archive/release-$pkgver.tar.gz" - 'motion.service' - 'motion.sysusers' - 'motion.tmpfiles' - "ffmpeg.patch" -) -sha256sums=( - '2074b935bdfe28f84c2c3233274b06908336778f303bb13530d4299c3f8aa4e2' - 'a78dba35414f4d7147cc2c622eecdb3df249978023cbea5c6bc420c34ca387e7' - '353fe3c2ee0afb7dafe1c6b7d1ac5655449dab836ab387cf335b4bd1dd37bf27' - 'b34eaf6b085a25ef310102f892d0909247f1acb9d6a75cc9faca85e1ef076a1c' - '14302daa63c0cdc8b0f1e7a8c790e254797b6f97e25bf9b8fab0453029151cbc' -) - -prepare() { - cd "${srcdir}/${pkgname}-release-${pkgver}" - patch -Np1 -i "${srcdir}/ffmpeg.patch" -} +source=("$pkgname-$pkgver.tar.gz::https://github.com/Motion-Project/motion/archive/release-$pkgver.tar.gz" + 'motion.service' + 'motion.sysusers' + 'motion.tmpfiles') +sha256sums=('6ef8504fc5be00a49c82c4045c0004fbf575d9a5df8687025a9b06923efda2a9' + 'a78dba35414f4d7147cc2c622eecdb3df249978023cbea5c6bc420c34ca387e7' + '353fe3c2ee0afb7dafe1c6b7d1ac5655449dab836ab387cf335b4bd1dd37bf27' + 'b34eaf6b085a25ef310102f892d0909247f1acb9d6a75cc9faca85e1ef076a1c') build() { cd "${srcdir}/${pkgname}-release-${pkgver}" diff --git a/ffmpeg.patch b/ffmpeg.patch deleted file mode 100644 index ea4e83e28732..000000000000 --- a/ffmpeg.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/ffmpeg.c b/ffmpeg.c -index 1e6cdf6..4299ba3 100644 ---- a/ffmpeg.c -+++ b/ffmpeg.c -@@ -67,6 +67,19 @@ - - #endif - -+/*********************************************/ -+#if (LIBAVCODEC_VERSION_MAJOR >= 57) -+ -+#define MY_CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER -+#define MY_CODEC_FLAG_QSCALE AV_CODEC_FLAG_QSCALE -+ -+#else -+ -+#define MY_CODEC_FLAG_GLOBAL_HEADER CODEC_FLAG_GLOBAL_HEADER -+#define MY_CODEC_FLAG_QSCALE CODEC_FLAG_QSCALE -+ -+#endif -+ - /*********************************************/ - AVFrame *my_frame_alloc(void){ - AVFrame *pic; -@@ -548,7 +561,7 @@ static int ffmpeg_set_quality(struct ffmpeg *ffmpeg){ - /* The selection of 8000 is a subjective number based upon viewing output files */ - if (ffmpeg->vbr > 0){ - ffmpeg->vbr =(int)(((100-ffmpeg->vbr)*(100-ffmpeg->vbr)*(100-ffmpeg->vbr) * 8000) / 1000000) + 1; -- ffmpeg->ctx_codec->flags |= CODEC_FLAG_QSCALE; -+ ffmpeg->ctx_codec->flags |= MY_CODEC_FLAG_QSCALE; - ffmpeg->ctx_codec->global_quality=ffmpeg->vbr; - } - } -@@ -673,7 +686,7 @@ static int ffmpeg_set_codec(struct ffmpeg *ffmpeg){ - ffmpeg->ctx_codec->strict_std_compliance = -2; - ffmpeg->ctx_codec->level = 3; - } -- ffmpeg->ctx_codec->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ ffmpeg->ctx_codec->flags |= MY_CODEC_FLAG_GLOBAL_HEADER; - - retcd = ffmpeg_set_quality(ffmpeg); - if (retcd < 0){ |