openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

update to motion-4.2.1

Browse Source
This commit is contained in:
sthen
2019-01-29 22:40:53 +00:00
parent 6bd627d28f
commit 1b65d2ed6a
9 changed files with 35 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
multimedia/motion/Makefile
+9 -6
View File
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.20 2018/11/05 17:23:41 sthen Exp $
# $OpenBSD: Makefile,v 1.21 2019/01/29 22:40:53 sthen Exp $
V= 4.1.1
REVISION= 2
V= 4.2.1
COMMENT= motion detection software for video
GH_ACCOUNT= Motion-Project
@@ -18,7 +17,8 @@ MAINTAINER= Stuart Henderson <sthen@openbsd.org>
# GPL (according to source files, v2 only. website says v2+).
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += avcodec avdevice avformat avutil c jpeg m pthread sqlite3 swscale
WANTLIB += avcodec avdevice avformat avutil c intl jpeg m microhttpd
WANTLIB += pthread sqlite3 swscale webp webpmux
FLAVOR?=
FLAVORS= mysql pgsql
@@ -28,10 +28,13 @@ SUBST_VARS= FLAVOR_COMMA
LIB_DEPENDS= databases/sqlite3 \
graphics/jpeg \
graphics/ffmpeg
graphics/ffmpeg \
graphics/libwebp \
www/libmicrohttpd
FAKE_FLAGS= docdir=${PREFIX}/share/doc/motion \
examplesdir=${PREFIX}/share/examples/motion
examplesdir=${PREFIX}/share/examples/motion \
sysconfdir=${PREFIX}/share/examples
USE_GMAKE= Yes
CONFIGURE_STYLE= autoconf
multimedia/motion/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (motion-4.1.1.tar.gz) = IHS5Nb3+KPhMLDIzJ0sGkIM2d48wO7E1MNQpnD+KpOI=
SIZE (motion-4.1.1.tar.gz) = 447795
SHA256 (motion-4.2.1.tar.gz) = 2X7GrnZq39R4tvf5zA2l8v4h+qk2bZhmS+JVcUwc+B0=
SIZE (motion-4.2.1.tar.gz) = 701697
multimedia/motion/patches/patch-Makefile_in
+3 -3
View File
@@ -1,9 +1,9 @@
$OpenBSD: patch-Makefile_in,v 1.1 2018/03/29 19:31:00 sthen Exp $
$OpenBSD: patch-Makefile_in,v 1.2 2019/01/29 22:40:53 sthen Exp $
Index: Makefile.in
--- Makefile.in.orig
+++ Makefile.in
@@ -103,7 +103,7 @@ pre-mobject-info:
@@ -129,7 +129,7 @@ pre-mobject-info:
################################################################################
%.o: @top_srcdir@/%.c
@echo -e "\tCompiling $< into $@..."
@@ -12,7 +12,7 @@ Index: Makefile.in
################################################################################
# Include the dependency file if it exists. #
@@ -122,7 +122,7 @@ endif
@@ -148,7 +148,7 @@ endif
################################################################################
$(DEPEND_FILE): *.h $(SRC)
@echo "Generating dependencies, please wait..."
multimedia/motion/patches/patch-event_c
+3 -3
View File
@@ -1,9 +1,9 @@
$OpenBSD: patch-event_c,v 1.1 2018/03/29 19:31:00 sthen Exp $
$OpenBSD: patch-event_c,v 1.2 2019/01/29 22:40:53 sthen Exp $
Index: event.c
--- event.c.orig
+++ event.c
@@ -353,7 +353,7 @@ static void event_stream_put(struct context *cnt,
@@ -474,7 +474,7 @@ static void event_stream_put(struct context *cnt,
}
@@ -12,7 +12,7 @@ Index: event.c
static void event_vlp_putpipe(struct context *cnt,
motion_event type ATTRIBUTE_UNUSED,
struct image_data *img_data, char *dummy ATTRIBUTE_UNUSED, void *devpipe,
@@ -1022,7 +1022,7 @@ struct event_handlers event_handlers[] = {
@@ -1239,7 +1239,7 @@ struct event_handlers event_handlers[] = {
EVENT_IMAGE_SNAPSHOT,
event_image_snapshot
},
multimedia/motion/patches/patch-motion-dist_conf_in
-13
View File
@@ -1,13 +0,0 @@
$OpenBSD: patch-motion-dist_conf_in,v 1.3 2018/03/29 19:31:00 sthen Exp $
Index: motion-dist.conf.in
--- motion-dist.conf.in.orig
+++ motion-dist.conf.in
@@ -49,7 +49,7 @@ v4l2_palette 17
# The video input to be used (default: -1)
# Should normally be set to 0 or 1 for video/TV cards, and -1 for USB cameras
# Set to 0 for uvideo(4) on OpenBSD
-input -1
+input 0
# The video norm to use (only for video capture and TV tuner cards)
# Values: 0 (PAL), 1 (NTSC), 2 (SECAM), 3 (PAL NC no colour). Default: 0 (PAL)
multimedia/motion/patches/patch-motion_c
+7 -7
View File
@@ -1,14 +1,14 @@
$OpenBSD: patch-motion_c,v 1.3 2018/03/29 19:31:00 sthen Exp $
$OpenBSD: patch-motion_c,v 1.4 2019/01/29 22:40:53 sthen Exp $
Index: motion.c
--- motion.c.orig
+++ motion.c
@@ -1071,7 +1071,7 @@ static int motion_init(struct context *cnt)
@@ -1393,7 +1393,7 @@ static int motion_init(struct context *cnt)
/* create a reference frame */
alg_update_reference_frame(cnt, RESET_REF_FRAME);
-#if defined(HAVE_V4L2) && !defined(__FreeBSD__)
+#if defined(HAVE_V4L2) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
/* open video loopback devices if enabled */
if (cnt->conf.vidpipe) {
MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO, "Opening video loopback device for normal pictures");
- #if defined(HAVE_V4L2) && !defined(__FreeBSD__)
+ #if defined(HAVE_V4L2) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
/* open video loopback devices if enabled */
if (cnt->conf.video_pipe) {
MOTION_LOG(NTC, TYPE_ALL, NO_ERRNO
multimedia/motion/patches/patch-track_c
+2 -2
View File
@@ -1,8 +1,8 @@
$OpenBSD: patch-track_c,v 1.4 2018/03/29 19:31:00 sthen Exp $
$OpenBSD: patch-track_c,v 1.5 2019/01/29 22:40:53 sthen Exp $
Index: track.c
--- track.c.orig
+++ track.c
@@ -9,7 +9,11 @@
@@ -10,7 +10,11 @@
#include "motion.h"
#ifdef HAVE_V4L2
multimedia/motion/patches/patch-video_v4l2_c
+4 -4
View File
@@ -1,9 +1,9 @@
$OpenBSD: patch-video_v4l2_c,v 1.1 2018/03/29 19:31:00 sthen Exp $
$OpenBSD: patch-video_v4l2_c,v 1.2 2019/01/29 22:40:53 sthen Exp $
Index: video_v4l2.c
--- video_v4l2.c.orig
+++ video_v4l2.c
@@ -23,7 +23,11 @@
@@ -26,7 +26,11 @@
#ifdef HAVE_V4L2
@@ -13,5 +13,5 @@ Index: video_v4l2.c
#include <linux/videodev2.h>
+#endif
/* video4linux stuff */
#define NORM_DEFAULT 0
#define u8 unsigned char
#define u16 unsigned short
multimedia/motion/pkg/PLIST
+5 -2
View File
@@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST,v 1.7 2018/05/29 07:30:45 espie Exp $
@comment $OpenBSD: PLIST,v 1.8 2019/01/29 22:40:53 sthen Exp $
@pkgpath multimedia/motion,bktr${FLAVOR_COMMA}
@newgroup _motion:808
@newuser _motion:808:_motion:daemon:motion user:/nonexistent:/sbin/nologin
@sample ${SYSCONFDIR}/motion/
@rcscript ${RCDIR}/motion
@bin bin/motion
@man man/man1/motion.1
share/doc/motion/
@@ -11,7 +12,10 @@ share/doc/motion/COPYING
share/doc/motion/CREDITS
share/doc/motion/README.md
share/doc/motion/mask1.png
share/doc/motion/motion_build.html
share/doc/motion/motion_config.html
share/doc/motion/motion_guide.html
share/doc/motion/motion_stylesheet.css
share/doc/motion/normal.jpg
share/doc/motion/outputmotion1.jpg
share/doc/motion/outputnormal1.jpg
@@ -22,4 +26,3 @@ share/examples/motion/camera3-dist.conf
share/examples/motion/camera4-dist.conf
share/examples/motion/motion-dist.conf
@sample ${SYSCONFDIR}/motion/motion.conf
@rcscript ${RCDIR}/motion