Skip to content

Commit

Permalink
 from 3.2 branch
  • Loading branch information
sackmotion committed May 2, 2010
1 parent 7022d0e commit d9dfccf
Show file tree
Hide file tree
Showing 5 changed files with 28 additions and 9 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,9 @@ Bugfixes
http://www.lavrsen.dk/foswiki/bin/view/Motion/BugReport2010x04x13x032553
* Fix conv_uyvyto420p segfault ( William M Brack )
* Enhancing the palette selection ( William M Brack )
* Fix zombies on OpenBSD. (Mark Feenstra)
http://www.lavrsen.dk/foswiki/bin/view/Motion/BugReport2010x04x28x054348


3.2.11.1 Sumary of Changes

Expand Down
4 changes: 4 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -463,6 +463,10 @@ Michael Finsterbusch
to the "Live Stream Server".
http://www.lavrsen.dk/foswiki/bin/view/Motion/MotionStreamAuthPatch

Mark Feenstra
* Fix zombies on OpenBSD.
http://www.lavrsen.dk/foswiki/bin/view/Motion/BugReport2010x04x28x054348

Miguel Freitas
* Came up with the round robing idea.

Expand Down
18 changes: 9 additions & 9 deletions configure
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.65 for motion trunkREV511.
# Generated by GNU Autoconf 2.65 for motion trunkREV513.
#
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
Expand Down Expand Up @@ -549,8 +549,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='motion'
PACKAGE_TARNAME='motion'
PACKAGE_VERSION='trunkREV511'
PACKAGE_STRING='motion trunkREV511'
PACKAGE_VERSION='trunkREV513'
PACKAGE_STRING='motion trunkREV513'
PACKAGE_BUGREPORT=''
PACKAGE_URL=''

Expand Down Expand Up @@ -1213,7 +1213,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures motion trunkREV511 to adapt to many kinds of systems.
\`configure' configures motion trunkREV513 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
Expand Down Expand Up @@ -1274,7 +1274,7 @@ fi

if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of motion trunkREV511:";;
short | recursive ) echo "Configuration of motion trunkREV513:";;
esac
cat <<\_ACEOF
Expand Down Expand Up @@ -1415,7 +1415,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
motion configure trunkREV511
motion configure trunkREV513
generated by GNU Autoconf 2.65
Copyright (C) 2009 Free Software Foundation, Inc.
Expand Down Expand Up @@ -2012,7 +2012,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by motion $as_me trunkREV511, which was
It was created by motion $as_me trunkREV513, which was
generated by GNU Autoconf 2.65. Invocation command line was
$ $0 $@
Expand Down Expand Up @@ -5817,7 +5817,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by motion $as_me trunkREV511, which was
This file was extended by motion $as_me trunkREV513, which was
generated by GNU Autoconf 2.65. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
Expand Down Expand Up @@ -5879,7 +5879,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
motion config.status trunkREV511
motion config.status trunkREV513
configured by $0, generated by GNU Autoconf 2.65,
with options \\"\$ac_cs_config\\"
Expand Down
10 changes: 10 additions & 0 deletions motion.c
Original file line number Diff line number Diff line change
Expand Up @@ -1146,6 +1146,16 @@ static void *motion_loop(void *arg)
if (cnt->track.type)
cnt->moved = track_center(cnt, cnt->video_dev, 0, 0, 0);

#ifdef __OpenBSD__
/*
* FIXMARK
* Fixes zombie issue on OpenBSD 4.6
*/
struct sigaction sig_handler_action;
struct sigaction sigchild_action;
setup_signals(&sig_handler_action, &sigchild_action);
#endif

/*
* MAIN MOTION LOOP BEGINS HERE
* Should go on forever... unless you bought vaporware :)
Expand Down
2 changes: 2 additions & 0 deletions video_freebsd.h
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@

#ifdef __NetBSD__
#include <dev/ic/bt8xx.h>
#elif __OpenBSD__
#include <dev/ic/bt8xx.h>
#elif defined(OLD_BKTR)
#include <machine/ioctl_meteor.h>
#include <machine/ioctl_bt848.h>
Expand Down

0 comments on commit d9dfccf

Please sign in to comment.