Re: UPDATE: multimedia/motion, tests wanted
On Wed, Jan 16, 2019 at 11:39:01PM +, Stuart Henderson wrote: > 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. works for me, i get the live stream on localhost:8081 using uvideo0 at uhub0 port 4 configuration 1 interface 0 "Logitech Webcam C310" rev 2.00/0.12 addr 2 Landry
UPDATE: multimedia/motion, tests wanted
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
--- Makefile5 Nov 2018 17:23:41 - 1.20
+++ Makefile16 Jan 2019 23:34:05 -
@@ -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 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 - 1.4
+++ patches/patch-track_c 16 Jan 2019 23:34:05 -
@@ -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 - 1.1
+++ patches/patch-video_v4l2_c 16 Jan 2019 23:34:05 -
@@ -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
+#endif
- /* video4linux stuff */
- #define NORM_DEFAULT0
+ #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 - 1.7
+++ pkg/PLIST 16 Jan 2019 23:34:05 -
@@ -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
UPDATE: multimedia/motion, tests wanted
Here's an update for motion, I can't test it because my webcam no longer
works on my machine ("uvideo0: could not open VS pipe: INVAL", same for
motion and video(1)).
If anyone has a working installation could you give it a spin and report
back please?
Brooktree support is merged into the main package now.
Index: Makefile
===
RCS file: /cvs/ports/multimedia/motion/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- Makefile5 Jan 2018 05:12:27 - 1.14
+++ Makefile5 Jan 2018 13:51:01 -
@@ -1,12 +1,11 @@
# $OpenBSD: Makefile,v 1.14 2018/01/05 05:12:27 bentley Exp $
+V= 4.1.1
COMMENT= motion detection software for video
GH_ACCOUNT=Motion-Project
GH_PROJECT=motion
-GH_COMMIT= 9b4c16cae0ea77950cc156a9c82947ac51825f68
-V= 3.4.1
-REVISION= 4
+GH_TAGNAME=release-$V
DISTNAME= motion-$V
CATEGORIES=multimedia
@@ -18,10 +17,13 @@ MAINTAINER= Stuart Henderson
${WRKSRC}/version.sh
-
post-patch:
cd ${WRKSRC} && AUTOCONF_VERSION=${AUTOCONF_VERSION} \
AUTOMAKE_VERSION=${AUTOMAKE_VERSION} autoreconf -fiv
@@ -71,6 +66,10 @@ post-patch:
pre-configure:
perl -pi -e s,/usr/local/etc,${SYSCONFDIR},g \
${WRKSRC}/motion-dist.conf.in
+
+post-install:
+ cd ${PREFIX}/share/examples/motion; \
+ rm -f motion.init-{Fedora,Debian,FreeBSD.sh} motion.service
.include
Index: distinfo
===
RCS file: /cvs/ports/multimedia/motion/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo6 May 2017 15:10:18 - 1.6
+++ distinfo5 Jan 2018 13:51:01 -
@@ -1,2 +1,2 @@
-SHA256 (motion-3.4.1-9b4c16ca.tar.gz) =
kU6defhInQp1gPFmhb5x9RvxriQAgtiTNLoztn4Qwao=
-SIZE (motion-3.4.1-9b4c16ca.tar.gz) = 387288
+SHA256 (motion-4.1.1.tar.gz) = IHS5Nb3+KPhMLDIzJ0sGkIM2d48wO7E1MNQpnD+KpOI=
+SIZE (motion-4.1.1.tar.gz) = 447795
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in 5 Jan 2018 13:51:01 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: Makefile.in
+--- Makefile.in.orig
Makefile.in
+@@ -103,7 +103,7 @@ pre-mobject-info:
+
+ %.o: @top_srcdir@/%.c
+ @echo -e "\tCompiling $< into $@..."
+- @$(CC) -c $(CFLAGS) -I@top_builddir@ $< -o $@
++ $(CC) -c $(CFLAGS) -I@top_builddir@ $< -o $@
+
+
+ # Include the dependency file if it exists.
#
+@@ -122,7 +122,7 @@ endif
+
+ $(DEPEND_FILE): *.h $(SRC)
+ @echo "Generating dependencies, please wait..."
+- @$(CC) $(CFLAGS) -I@top_builddir@ -M $(SRC) > .tmp
++ $(CC) $(CFLAGS) -I@top_builddir@ -M $(SRC) > .tmp
+ @mv -f .tmp $(DEPEND_FILE)
+ @echo
+
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac 5 Jan 2018 13:51:01 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: configure.ac
+--- configure.ac.orig
configure.ac
+@@ -106,7 +106,7 @@ if test "x${BKTR}" = "xyes"; then
+ fi
+ fi
+ if test "${V4L2}" = "yes"; then
+- AC_CHECK_HEADERS(linux/videodev2.h,[V4L2="yes"],[V4L2="no"])
++ AC_CHECK_HEADERS(sys/videoio.h,[V4L2="yes"],[V4L2="no"])
+ fi
+
+ if test "x${V4L2}" = "xyes"; then
Index: patches/patch-event_c
