I can't get my uvideo working even with "disable xhci" any more
(no devices show up, even the keyboard etc) - does anyone have a working
uvideo setup that can test this please? Basic config should just involve
setting 'target_dir /tmp' or point at a path writable by _motion, set
permissions on /dev/video0 so _motion can access it, start the program
and leave it run for a little bit, remove cover from your webcam ;-),
move about a bit.
If it's working you should get new files under target_dir.
Index: Makefile
===================================================================
RCS file: /cvs/ports/multimedia/motion/Makefile,v
retrieving revision 1.20
diff -u -p -u -r1.20 Makefile
--- Makefile 5 Nov 2018 17:23:41 -0000 1.20
+++ Makefile 16 Jan 2019 23:34:05 -0000
@@ -1,7 +1,6 @@
# $OpenBSD: Makefile,v 1.20 2018/11/05 17:23:41 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@open
# 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
Index: distinfo
===================================================================
RCS file: /cvs/ports/multimedia/motion/distinfo,v
retrieving revision 1.7
diff -u -p -u -r1.7 distinfo
--- distinfo 29 Mar 2018 19:31:00 -0000 1.7
+++ distinfo 16 Jan 2019 23:34:05 -0000
@@ -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
Index: patches/patch-Makefile_in
===================================================================
RCS file: /cvs/ports/multimedia/motion/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 29 Mar 2018 19:31:00 -0000 1.1
+++ patches/patch-Makefile_in 16 Jan 2019 23:34:05 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-Makefile_in,v 1.1 2018/0
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..."
Index: patches/patch-event_c
===================================================================
RCS file: /cvs/ports/multimedia/motion/patches/patch-event_c,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-event_c
--- patches/patch-event_c 29 Mar 2018 19:31:00 -0000 1.1
+++ patches/patch-event_c 16 Jan 2019 23:34:05 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-event_c,v 1.1 2018/03/29
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
},
Index: patches/patch-motion-dist_conf_in
===================================================================
RCS file: patches/patch-motion-dist_conf_in
diff -N patches/patch-motion-dist_conf_in
--- patches/patch-motion-dist_conf_in 29 Mar 2018 19:31:00 -0000 1.3
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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)
Index: patches/patch-motion_c
===================================================================
RCS file: /cvs/ports/multimedia/motion/patches/patch-motion_c,v
retrieving revision 1.3
diff -u -p -u -r1.3 patch-motion_c
--- patches/patch-motion_c 29 Mar 2018 19:31:00 -0000 1.3
+++ patches/patch-motion_c 16 Jan 2019 23:34:05 -0000
@@ -3,12 +3,12 @@ $OpenBSD: patch-motion_c,v 1.3 2018/03/2
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
Index: patches/patch-track_c
===================================================================
RCS file: /cvs/ports/multimedia/motion/patches/patch-track_c,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-track_c
--- patches/patch-track_c 29 Mar 2018 19:31:00 -0000 1.4
+++ patches/patch-track_c 16 Jan 2019 23:34:05 -0000
@@ -2,7 +2,7 @@ $OpenBSD: patch-track_c,v 1.4 2018/03/29
Index: track.c
--- track.c.orig
+++ track.c
-@@ -9,7 +9,11 @@
+@@ -10,7 +10,11 @@
#include "motion.h"
#ifdef HAVE_V4L2
Index: patches/patch-video_v4l2_c
===================================================================
RCS file: /cvs/ports/multimedia/motion/patches/patch-video_v4l2_c,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-video_v4l2_c
--- patches/patch-video_v4l2_c 29 Mar 2018 19:31:00 -0000 1.1
+++ patches/patch-video_v4l2_c 16 Jan 2019 23:34:05 -0000
@@ -3,7 +3,7 @@ $OpenBSD: patch-video_v4l2_c,v 1.1 2018/
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
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/multimedia/motion/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -u -r1.7 PLIST
--- pkg/PLIST 29 May 2018 07:30:45 -0000 1.7
+++ pkg/PLIST 16 Jan 2019 23:34:05 -0000
@@ -3,6 +3,7 @@
@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
