[arch-commits] Commit in motion/trunk (4 files)
Sergej Pupykin
spupykin at archlinux.org
Mon Oct 24 11:58:30 UTC 2016
Date: Monday, October 24, 2016 @ 11:58:29
Author: spupykin
Revision: 193194
upgpkg: motion 4.0-1
upd
Modified:
motion/trunk/PKGBUILD
Deleted:
motion/trunk/ffmpeg-0.8.patch
motion/trunk/ffmpeg-compat.patch
motion/trunk/linux-headers.patch
---------------------+
PKGBUILD | 30 ++------
ffmpeg-0.8.patch | 112 --------------------------------
ffmpeg-compat.patch | 172 --------------------------------------------------
linux-headers.patch | 35 ----------
4 files changed, 10 insertions(+), 339 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2016-10-24 11:58:06 UTC (rev 193193)
+++ PKGBUILD 2016-10-24 11:58:29 UTC (rev 193194)
@@ -2,45 +2,35 @@
# Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
pkgname=motion
-pkgver=3.2.12
-pkgrel=14
+pkgver=4.0
+pkgrel=1
pkgdesc="A software motion detector which grabs images from video4linux devices and/or from webcams"
arch=('i686' 'x86_64')
license=('GPL')
url="http://www.lavrsen.dk/foswiki/bin/view/Motion/WebHome"
-depends=('libjpeg' 'v4l-utils' 'ffmpeg0.10')
+depends=('libjpeg' 'v4l-utils' 'ffmpeg')
backup=('etc/motion/motion.conf')
options=('!makeflags')
-source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=("$pkgname-$pkgver.tar.gz::https://github.com/Motion-Project/motion/archive/release-$pkgver.tar.gz"
motion.service
- motion.tmpfiles
- ffmpeg-0.8.patch
- linux-headers.patch
- ffmpeg-compat.patch)
-md5sums=('1ba0065ed50509aaffb171594c689f46'
+ motion.tmpfiles)
+md5sums=('e99336d0d9b531498b0eda6ed5b41375'
'c8e9a9e9fd2dcc1ee8bcee1f32a91559'
- 'f863f8c025f7f025b2178def8418decd'
- 'd36687710837d69fbce4608b1345fa34'
- 'd8c3c4fdded5cfbd729710475559a21d'
- 'b2666cade705f6bb663a2139717e0da7')
+ 'f863f8c025f7f025b2178def8418decd')
build() {
- cd "${srcdir}/${pkgname}-${pkgver}"
- export PKG_CONFIG_PATH=/usr/lib/ffmpeg0.10/pkgconfig:$PKG_CONFIG_PATH
- patch -Np1 -i $srcdir/ffmpeg-0.8.patch
- patch -Np1 -i $srcdir/linux-headers.patch
- patch -Np1 -i $srcdir/ffmpeg-compat.patch
+ cd "${srcdir}/${pkgname}-release-${pkgver}"
autoreconf
./configure --prefix=/usr \
--without-pgsql \
--without-mysql \
- --sysconfdir=/etc/motion \
+ --sysconfdir=/etc \
--with-ffmpeg
make
}
package(){
- cd "${srcdir}/${pkgname}-${pkgver}"
+ cd "${srcdir}/${pkgname}-release-${pkgver}"
make DESTDIR="${pkgdir}" install
mv "${pkgdir}/etc/motion/motion-dist.conf" "${pkgdir}/etc/motion/motion.conf"
install -Dm644 "${srcdir}/motion.service" "${pkgdir}/usr/lib/systemd/system/motion.service"
Deleted: ffmpeg-0.8.patch
===================================================================
--- ffmpeg-0.8.patch 2016-10-24 11:58:06 UTC (rev 193193)
+++ ffmpeg-0.8.patch 2016-10-24 11:58:29 UTC (rev 193194)
@@ -1,112 +0,0 @@
-diff -aur motion-3.2.12/ffmpeg.c motion-3.2.12.new/ffmpeg.c
---- motion-3.2.12/ffmpeg.c 2010-06-01 08:48:23.000000000 +0200
-+++ motion-3.2.12.new/ffmpeg.c 2011-10-31 17:25:03.000000000 +0100
-@@ -14,7 +14,7 @@
-
- #include "ffmpeg.h"
- #include "motion.h"
--
-+#include <libavformat/avformat.h>
- #if LIBAVCODEC_BUILD > 4680
- /* FFmpeg after build 4680 doesn't have support for mpeg1 videos with
- * non-standard framerates. Previous builds contained a broken hack
-@@ -228,10 +228,12 @@
- mpeg1_file_protocol.url_close = file_protocol.url_close;
-
- /* Register the append file protocol. */
--#if LIBAVFORMAT_BUILD >= (52<<16 | 31<<8)
-- av_register_protocol(&mpeg1_file_protocol);
-+#ifdef have_av_register_protocol2
-+ av_register_protocol2(&mpeg1_file_protocol, sizeof(mpeg1_file_protocol));
-+#elif defined have_av_register_protocol
-+ av_register_protocol(&mpeg1_file_protocol);
- #else
-- register_protocol(&mpeg1_file_protocol);
-+# warning av_register_protocolXXX missing
- #endif
- }
-
-@@ -244,7 +246,7 @@
- const char *ext;
- AVOutputFormat *of = NULL;
-
-- /* Here, we use guess_format to automatically setup the codec information.
-+ /* Here, we use av_guess_format to automatically setup the codec information.
- * If we are using msmpeg4, manually set that codec here.
- * We also dynamically add the file extension to the filename here. This was
- * done to support both mpeg1 and mpeg4 codecs since they have different extensions.
-@@ -258,7 +260,7 @@
- /* We use "mpeg1video" for raw mpeg1 format. Using "mpeg" would
- * result in a muxed output file, which isn't appropriate here.
- */
-- of = guess_format("mpeg1video", NULL, NULL);
-+ of = av_guess_format("mpeg1video", NULL, NULL);
- if (of) {
- /* But we want the trailer to be correctly written. */
- of->write_trailer = mpeg1_write_trailer;
-@@ -270,24 +272,24 @@
- #endif
- } else if (strcmp(codec, "mpeg4") == 0) {
- ext = ".avi";
-- of = guess_format("avi", NULL, NULL);
-+ of = av_guess_format("avi", NULL, NULL);
- } else if (strcmp(codec, "msmpeg4") == 0) {
- ext = ".avi";
-- of = guess_format("avi", NULL, NULL);
-+ of = av_guess_format("avi", NULL, NULL);
- if (of) {
- /* Manually override the codec id. */
- of->video_codec = CODEC_ID_MSMPEG4V2;
- }
- } else if (strcmp(codec, "swf") == 0) {
- ext = ".swf";
-- of = guess_format("swf", NULL, NULL);
-+ of = av_guess_format("swf", NULL, NULL);
- } else if (strcmp(codec, "flv") == 0) {
- ext = ".flv";
-- of = guess_format("flv", NULL, NULL);
-+ of = av_guess_format("flv", NULL, NULL);
- of->video_codec = CODEC_ID_FLV1;
- } else if (strcmp(codec, "ffv1") == 0) {
- ext = ".avi";
-- of = guess_format("avi", NULL, NULL);
-+ of = av_guess_format("avi", NULL, NULL);
- if (of) {
- /* Use the FFMPEG Lossless Video codec (experimental!).
- Requires strict_std_compliance to be <= -2 */
-@@ -295,7 +297,7 @@
- }
- } else if (strcmp(codec, "mov") == 0) {
- ext = ".mov";
-- of = guess_format("mov", NULL, NULL);
-+ of = av_guess_format("mov", NULL, NULL);
- } else {
- motion_log(LOG_ERR, 0, "ffmpeg_video_codec option value %s is not supported", codec);
- return NULL;
-@@ -377,7 +379,7 @@
-
- ffmpeg->c = c = AVSTREAM_CODEC_PTR(ffmpeg->video_st);
- c->codec_id = ffmpeg->oc->oformat->video_codec;
-- c->codec_type = CODEC_TYPE_VIDEO;
-+ c->codec_type = AVMEDIA_TYPE_VIDEO;
- is_mpeg1 = c->codec_id == CODEC_ID_MPEG1VIDEO;
-
- if (strcmp(ffmpeg_video_codec, "ffv1") == 0)
-@@ -646,7 +648,7 @@
- if (ffmpeg->oc->oformat->flags & AVFMT_RAWPICTURE) {
- /* raw video case. The API will change slightly in the near future for that */
- #ifdef FFMPEG_AVWRITEFRAME_NEWAPI
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- pkt.data = (uint8_t *)pic;
- pkt.size = sizeof(AVPicture);
- ret = av_write_frame(ffmpeg->oc, &pkt);
-@@ -667,7 +669,7 @@
- #ifdef FFMPEG_AVWRITEFRAME_NEWAPI
- pkt.pts = AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->pts;
- if (AVSTREAM_CODEC_PTR(ffmpeg->video_st)->coded_frame->key_frame) {
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
- }
- pkt.data = ffmpeg->video_outbuf;
- pkt.size = out_size;
Deleted: ffmpeg-compat.patch
===================================================================
--- ffmpeg-compat.patch 2016-10-24 11:58:06 UTC (rev 193193)
+++ ffmpeg-compat.patch 2016-10-24 11:58:29 UTC (rev 193194)
@@ -1,172 +0,0 @@
-diff -wbBur motion-3.2.12/configure.in motion-3.2.12.q/configure.in
---- motion-3.2.12/configure.in 2010-06-01 10:48:23.000000000 +0400
-+++ motion-3.2.12.q/configure.in 2012-06-20 13:51:42.000000000 +0400
-@@ -290,163 +290,11 @@
- fi
-
-
--#
--# Check for libavcodec and libavformat from ffmpeg
--#
--FFMPEG_DIR="yes"
--FFMPEG_OK="no_found"
--FFMPEG_OBJ=""
--AC_ARG_WITH(ffmpeg,
--[ --with-ffmpeg[=DIR] Specify the prefix for the install path for
-- libavcodec/libavformat (part of ffmpeg) be able to
-- encode mpeg movies realtime.
-- If this is not specified motion will try to find
-- the libraries in /usr and /usr/local.
-- ],
--FFMPEG_DIR="$withval"
--)
--#
--# --without-ffmpeg or with-ffmpeg=no
--#
--if test "${FFMPEG_DIR}" = "no"; then
-- AC_MSG_CHECKING(for ffmpeg)
-- AC_MSG_RESULT(skipping)
--#
--# with-ffmpeg=<dir> or nothing
--#
--else if test "${FFMPEG_DIR}" = "yes"; then
-- # AUTODETECT STATIC/SHARED LIB
-- AC_MSG_CHECKING(for ffmpeg autodetecting)
--
-- if test -f /usr/lib64/libavcodec.a -o -f /usr/lib64/libavcodec.so && test -f /usr/lib64/libavformat.a -o -f /usr/lib64/libavformat.so ; then
-- AC_MSG_RESULT(found in /usr/lib64)
-- FFMPEG_OK="found"
-- FFMPEG_LIB="/usr/lib64"
-- FFMPEG_DIR="/usr"
-- elif test -f /usr/lib/libavcodec.a -o -f /usr/lib/libavcodec.so && test -f /usr/lib/libavformat.a -o -f /usr/lib/libavformat.so ; then
-- AC_MSG_RESULT(found in /usr/lib)
-- FFMPEG_OK="found"
-- FFMPEG_LIB="/usr/lib"
-- FFMPEG_DIR="/usr"
-- elif test -f /usr/local/lib/libavcodec.a -o -f /usr/local/lib/libavcodec.so && test -f /usr/local/lib/libavformat.a -o -f /usr/local/lib/libavformat.so ; then
-- AC_MSG_RESULT(found in /usr/local/lib)
-- FFMPEG_OK="found"
-- FFMPEG_LIB="/usr/local/lib"
-- FFMPEG_DIR="/usr/local"
-- else
-- AC_MSG_RESULT(not found)
-- echo ""
-- echo "**********************************************"
-- echo "* libavcodec.a or libavcodec.so or *"
-- echo "* libavformat.a or libavformat.so not found: *"
-- echo "* ALL FFMPEG FEATURES DISABLED *"
-- echo "* *"
-- echo "* Please read the Motion Guide for help: *"
-- echo "* http://motion.sourceforge.net *"
-- echo "**********************************************"
-- echo ""
-- fi
--else
-- AC_MSG_CHECKING(for ffmpeg in -> [${FFMPEG_DIR}] <-)
-- if test -f ${FFMPEG_DIR}/lib/libavcodec.a -o -f ${FFMPEG_DIR}/lib/libavcodec.so && test -f ${FFMPEG_DIR}/lib/libavformat.a -o -f ${FFMPEG_DIR}/lib/libavformat.so ; then
-- AC_MSG_RESULT(found)
-- FFMPEG_OK="found"
-- FFMPEG_LIB="${FFMPEG_DIR}/lib"
-- elif test -f ${FFMPEG_DIR}/libavcodec.a -o -f ${FFMPEG_DIR}/libavcodec.so && test -f ${FFMPEG_DIR}/libavformat.a -o -f ${FFMPEG_DIR}/libavformat.so ; then
-- AC_MSG_RESULT(found)
-- FFMPEG_LIB="${FFMPEG_DIR}"
-- FFMPEG_OK="found"
-- else
-- AC_MSG_RESULT(not found)
-- if test "${FFMPEG_OK}" != "found"; then
-- echo ""
-- echo "**********************************************"
-- echo "* libavcodec.a or libavcodec.so or *"
-- echo "* libavformat.a or libavformat.so not found: *"
-- echo "* ALL FFMPEG FEATURES DISABLED *"
-- echo "* *"
-- echo "* Please read the Motion Guide for help: *"
-- echo "* http://motion.sourceforge.net *"
-- echo "**********************************************"
-- echo ""
-- fi
-- fi
--fi
--
--#
--# Now check for ffmpeg headers ( avformat.h ) if ffmpeg libs were found
--#
--
--if test "${FFMPEG_OK}" = "found"; then
-- AC_MSG_CHECKING(for ffmpeg headers in ${FFMPEG_DIR})
--
-- if test -f ${FFMPEG_DIR}/include/avformat.h; then
-- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/avformat.h)
-- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include"
-- elif test -f ${FFMPEG_DIR}/avformat.h; then
-- AC_MSG_RESULT(found ${FFMPEG_DIR}/avformat.h)
-- FFMPEG_CFLAGS="-I${FFMPEG_DIR}"
-- elif test -f ${FFMPEG_DIR}/include/ffmpeg/avformat.h; then
-- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/avformat.h)
-- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg"
-- elif test -f ${FFMPEG_DIR}/include/libavformat/avformat.h; then
-- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/libavformat/avformat.h)
-- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include -DFFMPEG_NEW_INCLUDES"
-- elif test -f ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h; then
-- AC_MSG_RESULT(found ${FFMPEG_DIR}/include/ffmpeg/libavformat/avformat.h)
-- FFMPEG_CFLAGS="-I${FFMPEG_DIR}/include/ffmpeg -DFFMPEG_NEW_INCLUDES"
-- else
-- AC_MSG_RESULT(not found)
-- FFMPEG_OK="no_found"
-- echo "**********************************************"
-- echo "* avformat.h not found: *"
-- echo "* ALL FFMPEG FEATURES DISABLED *"
-- echo "* *"
-- echo "* Please read the Motion Guide for help: *"
-- echo "* http://motion.sourceforge.net *"
-- echo "**********************************************"
-- echo ""
-- fi
--
--#
--# If ffmpeg libs and headers have been found
--#
--
-- if test "${FFMPEG_OK}" = "found"; then
-- TEMP_LIBS="$TEMP_LIBS -L${FFMPEG_LIB} -lavformat -lavcodec -lavutil -lm -lz"
-- TEMP_LDFLAGS="${TEMP_LDFLAGS} -L${FFMPEG_LIB}"
-- TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG ${FFMPEG_CFLAGS}"
--
-- FFMPEG_OBJ="ffmpeg.o"
-- AC_SUBST(FFMPEG_OBJ)
--
-- AC_MSG_CHECKING([file_protocol is defined in ffmpeg ?])
-- saved_CFLAGS=$CFLAGS
-- saved_LIBS=$LIBS
-- CFLAGS="${FFMPEG_CFLAGS}"
-- LIBS="$TEMP_LIBS"
--
-- AC_COMPILE_IFELSE(
-- [
-- #include <avformat.h>
-- URLProtocol test_file_protocol;
-- int main(void){
-- test_file_protocol.url_read = file_protocol.url_read;
-- return 0;
-- }
-- ],
-- [AC_MSG_RESULT(yes)],
-- [
-- AC_MSG_RESULT(no)
-- TEMP_CFLAGS="${TEMP_CFLAGS} -DHAVE_FFMPEG_NEW"
-- ]
-- )
-- CFLAGS=$saved_CFLAGS
-- LIBS=$saved_LIBS
-- fi
--fi
--fi
--
-+TEMP_CFLAGS+=" `pkg-config --cflags libavformat libavcodec` -DHAVE_FFMPEG -DFFMPEG_NEW_INCLUDES -DHAVE_FFMPEG_NEW"
-+TEMP_LIBS+=" `pkg-config --libs libavformat libavcodec` -lavutil -Wl,-rpath /usr/lib/ffmpeg0.10"
-+FFMPEG_OK=found
-+FFMPEG_OBJ="ffmpeg.o"
-+AC_SUBST(FFMPEG_OBJ)
-
- #
- # Check Mysql
Deleted: linux-headers.patch
===================================================================
--- linux-headers.patch 2016-10-24 11:58:06 UTC (rev 193193)
+++ linux-headers.patch 2016-10-24 11:58:29 UTC (rev 193194)
@@ -1,35 +0,0 @@
-diff -urN motion-3.2.12-OLD/motion.h motion-3.2.12-NEW/motion.h
---- motion-3.2.12-OLD/motion.h 2010-05-31 23:48:23.000000000 -0700
-+++ motion-3.2.12-NEW/motion.h 2011-08-30 02:11:08.000000000 -0700
-@@ -40,7 +40,7 @@
-
- #define _LINUX_TIME_H 1
- #if !defined(WITHOUT_V4L) && !defined(BSD)
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #endif
-
- #include <pthread.h>
-diff -urN motion-3.2.12-OLD/track.c motion-3.2.12-NEW/track.c
---- motion-3.2.12-OLD/track.c 2010-05-31 23:48:23.000000000 -0700
-+++ motion-3.2.12-NEW/track.c 2011-08-30 23:05:09.000000000 -0700
-@@ -11,6 +11,7 @@
- #include "motion.h"
-
- #ifndef WITHOUT_V4L
-+#include <linux/videodev2.h>
- #include "pwc-ioctl.h"
- #endif
-
-diff -urN motion-3.2.12-OLD/video.h motion-3.2.12-NEW/video.h
---- motion-3.2.12-OLD/video.h 2010-05-31 23:48:23.000000000 -0700
-+++ motion-3.2.12-NEW/video.h 2011-08-30 02:11:12.000000000 -0700
-@@ -12,7 +12,7 @@
-
- #define _LINUX_TIME_H 1
- #ifndef WITHOUT_V4L
--#include <linux/videodev.h>
-+#include <libv4l1-videodev.h>
- #include <sys/mman.h>
- #include "pwc-ioctl.h"
- #endif
More information about the arch-commits
mailing list