--- motion-3.2.9-2/work/motion-3.2.9/video_common.c Tue Nov 6 04:35:35 2007 +++ motion-3.2.9-2.pwc/work/motion-3.2.9/video_common.c Thu Jan 24 13:34:12 2008 @@ -616,6 +616,10 @@ static int vid_v4lx_start(struct context struct config *conf = &cnt->conf; int dev = -1; + if (debug_level){ + motion_log(LOG_DEBUG, 0, "vid_v4lx_start videodevice %s",conf->video_device); + } + /* Start a new block so we can make declarations without breaking good old * gcc 2.95 or older. */ --- motion-3.2.9-2/work/motion-3.2.9/Makefile Thu Jan 24 13:35:34 2008 +++ motion-3.2.9-2.pwc/work/motion-3.2.9/Makefile Thu Jan 24 13:34:12 2008 @@ -12,7 +12,7 @@ CC = cc INSTALL = install -VERSION = 3.2.9 +VERSION = 3.2.9_pwc ################################################################################ # Install locations, controlled by setting configure flags. # @@ -35,7 +35,7 @@ CFLAGS = -O2 -fno-strict-aliasing -Dsysconfdir=\"$(sysconfdir)\" LDFLAGS = -L/usr/local/lib -L/usr/local/lib LIBS = -lm -L/usr/local/lib -lpthread -ljpeg -L/usr/local/lib -lavformat -lavcodec -lm -lz -VIDEO_OBJ = video_freebsd.o +VIDEO_OBJ = video.o video2.o video_common.o OBJ = motion.o conf.o draw.o $(VIDEO_OBJ) netcam.o \ netcam_ftp.o netcam_jpeg.o netcam_wget.o track.o \ alg.o event.o picture.o rotate.o webhttpd.o \ @@ -50,12 +50,7 @@ DEPEND_FILE = .depend # ALL and PROGS build Motion and, possibly, Motion-control. # ################################################################################ all: progs -ifneq (,$(findstring freebsd,$(VIDEO_OBJ))) - @echo "Build complete, run \"gmake install\" to install Motion!" -else - @echo "Build complete, run \"make install\" to install Motion!" -endif - @echo + @echo "Build complete, run \"make install clean\" to install Motion!" progs: pre-build-info $(PROGS) @@ -69,11 +64,7 @@ pre-build-info: @echo "Run \"make updateguide\" to download the latest version of the Motion Guide." @echo @echo "Version: $(VERSION)" -ifneq (,$(findstring freebsd,$(VIDEO_OBJ))) @echo "Platform: FreeBSD" -else - @echo "Platform: Linux (if this is incorrect, please read README.FreeBSD)" -endif @echo ################################################################################ --- motion-3.2.9-2/work/motion-3.2.9/motion-dist.conf Thu Jan 24 13:35:29 2008 +++ motion-3.2.9-2.pwc/work/motion-3.2.9/motion-dist.conf Thu Jan 24 13:34:12 2008 @@ -26,7 +26,7 @@ setup_mode off # Videodevice to be used for capturing (default /dev/video0) # for FreeBSD default is /dev/bktr0 -videodevice /dev/bktr0 +videodevice /dev/video0 # Tuner device to be used for capturing using tuner as source (default /dev/tuner0) # This is ONLY used for FreeBSD. Leave it commented out for Linux @@ -34,7 +34,7 @@ videodevice /dev/bktr0 # The video input to be used (default: 8) # Should normally be set to 1 for video/TV cards, and 8 for USB cameras -input 1 +input 8 # 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) @@ -508,16 +508,16 @@ quiet on ############################################################ # Log to the database when creating motion triggered image file (default: on) -sql_log_image on +;sql_log_image on # Log to the database when creating a snapshot image file (default: on) -sql_log_snapshot on +;sql_log_snapshot on # Log to the database when creating motion triggered mpeg file (default: off) -sql_log_mpeg off +;sql_log_mpeg off # Log to the database when creating timelapse mpeg file (default: off) -sql_log_timelapse off +;sql_log_timelapse off # SQL query string that is sent to the database # Use same conversion specifiers has for text features @@ -526,7 +526,7 @@ sql_log_timelapse off # %f = filename with full path # Default value: # insert into security(camera, filename, frame, file_type, time_stamp, text_event) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C') -sql_query insert into security(camera, filename, frame, file_type, time_stamp, event_time_stamp) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C') +;sql_query insert into security(camera, filename, frame, file_type, time_stamp, event_time_stamp) values('%t', '%f', '%q', '%n', '%Y-%m-%d %T', '%C') ############################################################ --- motion-3.2.9-2/work/motion-3.2.9/motion.c Thu Jan 24 13:35:30 2008 +++ motion-3.2.9-2.pwc/work/motion-3.2.9/motion.c Thu Jan 24 13:34:12 2008 @@ -9,11 +9,7 @@ #include "ffmpeg.h" #include "motion.h" -#if (defined(BSD)) -#include "video_freebsd.h" -#else #include "video.h" -#endif /* BSD */ #include "conf.h" #include "alg.h" --- motion-3.2.9-2/work/motion-3.2.9/motion.h Thu Nov 15 10:34:54 2007 +++ motion-3.2.9-2.pwc/work/motion-3.2.9/motion.h Thu Jan 24 13:34:12 2008 @@ -35,7 +35,7 @@ #include #define _LINUX_TIME_H 1 -#if (!defined(WITHOUT_V4L)) && (!defined(BSD)) +#if (!defined(WITHOUT_V4L)) #include #endif --- motion-3.2.9-2/work/motion-3.2.9/conf.c Thu Nov 15 10:40:28 2007 +++ motion-3.2.9-2.pwc/work/motion-3.2.9/conf.c Thu Jan 24 13:34:12 2008 @@ -25,12 +25,7 @@ */ #include "motion.h" - -#if (defined(BSD)) -#include "video_freebsd.h" -#else #include "video.h" -#endif /* BSD */ #define stripnewline(x) {if ((x)[strlen(x)-1]=='\n') (x)[strlen(x) - 1] = 0; }