From cf220737132a446f78969cdb37b4078013ed7d33 Mon Sep 17 00:00:00 2001 From: Andrea Brancaleoni Date: Sat, 3 Nov 2018 11:04:06 +0100 Subject: [PATCH] motion: update to 4.2. --- srcpkgs/motion/patches/ffmpeg4.patch | 21 --------------------- srcpkgs/motion/template | 8 ++++---- 2 files changed, 4 insertions(+), 25 deletions(-) delete mode 100644 srcpkgs/motion/patches/ffmpeg4.patch diff --git a/srcpkgs/motion/patches/ffmpeg4.patch b/srcpkgs/motion/patches/ffmpeg4.patch deleted file mode 100644 index c78ea117a4..0000000000 --- a/srcpkgs/motion/patches/ffmpeg4.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- ffmpeg.c 2017-12-10 02:05:49.000000000 +0100 -+++ ffmpeg.c 2018-05-03 21:53:50.044464387 +0200 -@@ -538,7 +538,7 @@ - /* The selection of 8000 in the else 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 |= AV_CODEC_FLAG_QSCALE; - ffmpeg->ctx_codec->global_quality=ffmpeg->vbr; - } - } -@@ -663,7 +663,7 @@ - ffmpeg->ctx_codec->strict_std_compliance = -2; - ffmpeg->ctx_codec->level = 3; - } -- ffmpeg->ctx_codec->flags |= CODEC_FLAG_GLOBAL_HEADER; -+ ffmpeg->ctx_codec->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; - - retcd = ffmpeg_set_quality(ffmpeg); - if (retcd < 0){ - diff --git a/srcpkgs/motion/template b/srcpkgs/motion/template index 9d84afa38f..8727fb386c 100644 --- a/srcpkgs/motion/template +++ b/srcpkgs/motion/template @@ -1,17 +1,17 @@ # Template file for 'motion' pkgname=motion -version=4.1.1 -revision=2 +version=4.2 +revision=1 wrksrc="motion-release-${version}" build_style=gnu-configure hostmakedepends="automake pkg-config" -makedepends="v4l-utils-devel zlib-devel ffmpeg-devel" +makedepends="v4l-utils-devel zlib-devel ffmpeg-devel libmicrohttpd-devel" short_desc="A motion detector software" maintainer="Andrea Brancaleoni " license="GPL-2" homepage="https://motion-project.github.io/" distfiles="https://github.com/Motion-Project/motion/archive/release-${version}.tar.gz" -checksum=2074b935bdfe28f84c2c3233274b06908336778f303bb13530d4299c3f8aa4e2 +checksum=6ef8504fc5be00a49c82c4045c0004fbf575d9a5df8687025a9b06923efda2a9 pre_configure() { autoreconf -fi