--- came-1.9.orig/example.camErc.ssh +++ came-1.9/example.camErc.ssh @@ -81,7 +81,7 @@ title_b = 0 title_a = 255 # font for title text. fontname/size -title_font = arial/8 +title_font = FreeSans/8 # fancy font styles # title_style = /path/to/title.style # color/transparency of message text @@ -90,7 +90,7 @@ text_b = 0 text_a = 255 # font for message text. fontname/size -text_font = arial/8 +text_font = FreeSans/8 # fancy font styles # text_style = /path/to/text.style # color/transparency of rectangle behind text --- came-1.9.orig/Makefile +++ came-1.9/Makefile @@ -23,7 +23,7 @@ all build: $(PROGS) camE: $(OBJS) - $(CC) $(CFLAGS) -o $@ $(OBJS) `giblib-config --libs` -lcurl + $(CC) $(CFLAGS) -o $@ $(OBJS) -lgiblib -lImlib2 -lcurl -lv4l1 install: all $(INSTALL_DIR) $(bindir) --- came-1.9.orig/example.camErc +++ came-1.9/example.camErc @@ -116,7 +116,7 @@ title_b = 0 title_a = 255 # font for title text. fontname/size -title_font = arial/8 +title_font = FreeSans/8 # fancy font styles # title_style = /path/to/title.style # color/transparency of message text @@ -125,7 +125,7 @@ text_b = 0 text_a = 255 # font for message text. fontname/size -text_font = arial/8 +text_font = FreeSans/8 # fancy font styles # text_style = /path/to/text.style # color/transparency of rectangle behind text @@ -178,5 +178,3 @@ # 1 rotates clockwise by 90 degrees, 2, rotates clockwise by 180 degrees, # 3 rotates clockwise by 270 degrees. # orientation = 1; - - --- came-1.9.orig/webcam.c +++ came-1.9/webcam.c @@ -33,6 +33,8 @@ #include +#include + #include "parseconfig.h" #include "pwc-ioctl.h" @@ -73,7 +75,7 @@ int text_g = 255; int text_b = 255; int text_a = 255; -char *text_font = "arial/8"; +char *text_font = "FreeSans/8"; int title_r = 255; int title_g = 255; int title_b = 255; @@ -90,7 +92,7 @@ int cam_colour = 50; int cam_whiteness = 50; int cam_framerate = 10; -char *title_font = "arial/8"; +char *title_font = "FreeSans/8"; char *ttf_dir = "/usr/X11R6/lib/X11/fonts/TrueType"; char *archive_ext = "jpg"; char *grab_archive = NULL; @@ -207,12 +209,12 @@ void close_device() { - if (munmap(grab_data, grab_size) != 0) { + if (v4l1_munmap(grab_data, grab_size) != 0) { perror("munmap()"); exit(1); } grab_data = NULL; - if (close(grab_fd)) + if (v4l1_close(grab_fd)) perror("close(grab_fd) "); grab_fd = -1; } @@ -224,9 +226,9 @@ { cam_pic.palette = pal; cam_pic.depth = depth; - if (ioctl(fd, VIDIOCSPICT, &cam_pic) < 0) + if (v4l1_ioctl(fd, VIDIOCSPICT, &cam_pic) < 0) return 0; - if (ioctl(fd, VIDIOCGPICT, &cam_pic) < 0) + if (v4l1_ioctl(fd, VIDIOCGPICT, &cam_pic) < 0) return 0; if (cam_pic.palette == pal) return 1; @@ -263,23 +265,23 @@ struct video_mbuf vid_mbuf; int type; - if ((grab_fd = open(grab_device, O_RDWR)) == -1) { + if ((grab_fd = v4l1_open(grab_device, O_RDWR)) == -1) { fprintf(stderr, "open %s: %s\n", grab_device, strerror(errno)); exit(1); } - if (ioctl(grab_fd, VIDIOCGCAP, &grab_cap) == -1) { + if (v4l1_ioctl(grab_fd, VIDIOCGCAP, &grab_cap) == -1) { fprintf(stderr, "%s: no v4l device\n", grab_device); exit(1); } - if (ioctl(grab_fd, VIDIOCGPICT, &cam_pic) < 0) + if (v4l1_ioctl(grab_fd, VIDIOCGPICT, &cam_pic) < 0) perror("getting pic info"); cam_pic.contrast = 65535 * ((float) cam_contrast / 100); cam_pic.brightness = 65535 * ((float) cam_brightness / 100); cam_pic.hue = 65535 * ((float) cam_hue / 100); cam_pic.colour = 65535 * ((float) cam_colour / 100); cam_pic.whiteness = 65535 * ((float) cam_whiteness / 100); - if (ioctl(grab_fd, VIDIOCSPICT, &cam_pic) < 0) + if (v4l1_ioctl(grab_fd, VIDIOCSPICT, &cam_pic) < 0) perror("setting cam pic"); device_palette = find_palette(grab_fd, &grab_buf); @@ -288,7 +290,7 @@ grab_buf.width = grab_width; grab_buf.height = grab_height; - ioctl(grab_fd, VIDIOCGMBUF, &vid_mbuf); + v4l1_ioctl(grab_fd, VIDIOCGMBUF, &vid_mbuf); camlog("%s detected\n", grab_cap.name); /* special philips features */ @@ -301,7 +303,7 @@ /* philips cam detected, maybe enable special features */ camlog("enabling pwc-specific features\n"); - ioctl(grab_fd, VIDIOCGWIN, &vwin); + v4l1_ioctl(grab_fd, VIDIOCGWIN, &vwin); if (vwin.flags & PWC_FPS_MASK) { /* Set new framerate */ vwin.flags &= ~PWC_FPS_FRMASK; @@ -311,12 +313,12 @@ /* Turning off snapshot mode */ vwin.flags &= ~(PWC_FPS_SNAPSHOT); - if (ioctl(grab_fd, VIDIOCSWIN, &vwin) < 0) + if (v4l1_ioctl(grab_fd, VIDIOCSWIN, &vwin) < 0) perror("trying to set extra pwc flags"); - if (ioctl(grab_fd, VIDIOCPWCSAGC, &gain) < 0) + if (v4l1_ioctl(grab_fd, VIDIOCPWCSAGC, &gain) < 0) perror("trying to set gain"); - if (ioctl(grab_fd, VIDIOCPWCSSHUTTER, &shutter) < 0) + if (v4l1_ioctl(grab_fd, VIDIOCPWCSSHUTTER, &shutter) < 0) perror("trying to set shutter"); wb.mode = PWC_WB_AUTO; @@ -338,19 +340,19 @@ camlog("unknown pwc white balance mode '%s' ignored\n", pwc_wb_mode); } - if (ioctl(grab_fd, VIDIOCPWCSAWB, &wb) < 0) + if (v4l1_ioctl(grab_fd, VIDIOCPWCSAWB, &wb) < 0) perror("trying to set pwc white balance mode"); } /* set image source and TV norm */ grab_chan.channel = grab_input; - if (ioctl(grab_fd, VIDIOCGCHAN, &grab_chan) == -1) { + if (v4l1_ioctl(grab_fd, VIDIOCGCHAN, &grab_chan) == -1) { perror("ioctl VIDIOCGCHAN"); exit(1); } grab_chan.channel = grab_input; grab_chan.norm = grab_norm; - if (ioctl(grab_fd, VIDIOCSCHAN, &grab_chan) == -1) { + if (v4l1_ioctl(grab_fd, VIDIOCSCHAN, &grab_chan) == -1) { perror("ioctl VIDIOCSCHAN"); exit(1); } @@ -358,7 +360,7 @@ /* grab_size = grab_buf.width * grab_buf.height * 3; */ grab_size = vid_mbuf.size; grab_data = - mmap(0, grab_size, PROT_READ | PROT_WRITE, MAP_SHARED, grab_fd, 0); + v4l1_mmap(0, grab_size, PROT_READ | PROT_WRITE, MAP_SHARED, grab_fd, 0); if ((grab_data == NULL) || (MAP_FAILED == grab_data)) { fprintf(stderr, "couldn't mmap vidcam. your card doesn't support that?\n"); @@ -456,9 +458,9 @@ su = sy + 4; sv = su + linewidth; - /* + /* The biggest problem is the interlaced data, and the fact that odd - add even lines have V and U data, resp. + add even lines have V and U data, resp. */ for (line = 0; line < height; line++) { @@ -558,11 +560,11 @@ j++; while (j--) { - if (ioctl(grab_fd, VIDIOCMCAPTURE, &grab_buf) == -1) { + if (v4l1_ioctl(grab_fd, VIDIOCMCAPTURE, &grab_buf) == -1) { perror("ioctl VIDIOCMCAPTURE"); return NULL; } - if (ioctl(grab_fd, VIDIOCSYNC, &i) == -1) { + if (v4l1_ioctl(grab_fd, VIDIOCSYNC, &i) == -1) { perror("ioctl VIDIOCSYNC"); return NULL; } @@ -732,7 +734,7 @@ } save_image(im, buffer); shot_counter = 0; - /* + /* * if archive thumbnails are enabled we save them here, * same filenames just in "archive_thumbnails_directory" directory * files are saved in the same format as archive @@ -988,8 +990,9 @@ if (ftp_debug) curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 1); else +#ifdef CURLOPT_MUTE curl_easy_setopt(curl_handle, CURLOPT_MUTE, 1); - +#endif curl_easy_setopt(curl_handle, CURLOPT_UPLOAD, 1); if (!ftp_passive) @@ -999,7 +1002,6 @@ } curl_easy_setopt(curl_handle, CURLOPT_INFILE, infile); - curl_easy_setopt(curl_handle, CURLOPT_INFILESIZE, st.st_size); /* get it! */ ret = curl_easy_perform(curl_handle); @@ -1558,8 +1560,8 @@ gib_imlib_free_image_and_decache(image); image = tmp_image; imlib_context_set_image(image); - - /* Set new values for width and height, else the image's + + /* Set new values for width and height, else the image's text might not show up in the correct position. */ width = crop_width; height = crop_height; @@ -1582,18 +1584,13 @@ image = tmp_image; imlib_context_set_image(image); - /* Set new values for width and height, else the image's + /* Set new values for width and height, else the image's text might not show up in the correct position. */ width = scale_width; height = scale_height; } camlog("** shot taken\n"); - if (action_post_shot) { - camlog("running post-shot action\n"); - system(action_post_shot); - camlog("post-shot action done\n"); - } if (flip_horizontal) { imlib_image_flip_horizontal(); @@ -1601,7 +1598,7 @@ if (flip_vertical) { imlib_image_flip_vertical(); } - + if (orientation && orientation > 0 && orientation < 4) { imlib_image_orientate(orientation); /* Changing orientation flips width and height, so we must swap them. */ @@ -1612,11 +1609,16 @@ width = swap_dimensions; } } - + if (overlay_im) draw_overlay(image); add_time_text(image, get_message(), width, height); save_image(image, temp_file); + if (action_post_shot) { + camlog("running post-shot action\n"); + system(action_post_shot); + camlog("post-shot action done\n"); + } do_postprocess(temp_file); archive_jpeg(image); gib_imlib_free_image_and_decache(image); --- came-1.9.orig/debian/control +++ came-1.9/debian/control @@ -0,0 +1,26 @@ +Source: came +Section: net +Priority: optional +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Cyril Bouthors +Build-Depends: debhelper (>> 4.0.0), giblib-dev (>= 1.2.3-4), libimlib2-dev, libcurl4-gnutls-dev, help2man, libv4l-dev +Build-Conflicts: linux-kernel-headers (<< 2.5.999-test7-bk-10) +Standards-Version: 3.6.2.2 + +Package: came +Architecture: any +Depends: ${shlibs:Depends} +Recommends: ttf-freefont +Description: Rewrite of the xawtv webcam app using imlib2 + camE is a rewrite of the xawtv webcam app using imlib2 + Features include: + * Uses Imlib2 + * TTF fonts + * Blended transparent text + * Title text + * Options in ~/.camErc + * Message read from separate file (eg echo "eating my dinner" > ~/.caminfo) + * Color the text as you like + * Text background any color/alpha value + * scp support for uploading + * And more... --- came-1.9.orig/debian/changelog +++ came-1.9/debian/changelog @@ -0,0 +1,196 @@ +came (1.9-3.2ubuntu1) lucid; urgency=low + + [ Kees Cook ] + * Merge from Debian testing. Remaining changes: + - webcam.c, Makefile: patched to use libv4l. + + [ David Rubin ] + * Removed curl option testing to see how valid this is LP: #614076 + + -- David Rubin Sat, 07 Aug 2010 14:19:05 +0200 + +came (1.9-3.2) unstable; urgency=low + + * Non-maintainer upload. + * debian/control: + - removed B-D on libcurl3 that was causing the package to + be linked with libssl causing a copyright breakage since + came is licensed under GPL. (with no exceptions granted + for OpenSSL use) Added libcurl4-gnutls-dev instead. + (Closes: #522334) + + -- Andrea Veri Sat, 14 Nov 2009 16:52:16 +0100 + +came (1.9-3.1ubuntu1) intrepid; urgency=low + + * webcam.c, Makefile: patched to use libv4l (LP: #260918). + - http://cvs.fedoraproject.org/viewvc/devel/camE/camE-1.9-libv4l1.patch + + -- Kees Cook Fri, 10 Oct 2008 15:48:37 -0700 + +came (1.9-3.1) unstable; urgency=high + + * Non-maintainer upload. + * Fix FTBFS due to use of obsolete curl API (Closes: #423747). + + -- Luk Claes Mon, 21 May 2007 19:46:44 +0200 + +came (1.9-3) unstable; urgency=low + + * New maintainer (I got Ben Armstrong approval by direct mail). + * Removed the dependency to the font called arial.ttf, which is non-free + and replaced it with FreeSans.ttf (closes: #357971). + * Applied patch from Ian Eure to allow the image to + be further processed with external tools by moving the + action_post_shot code to after save_image() (closes: #296954). + * debian/control: clean + * debian/changelog: clean + + -- Cyril Bouthors Sat, 8 Apr 2006 01:17:23 +0200 + +came (1.9-2) unstable; urgency=low + + * Hard-code -lgiblib -lImlib2 instead of using the output of giblib-config, + which is incorrect for GNU/* systems using dynamic linking. + (Closes: #349939) + - Thanks to Steve Langasek for the patch. + + -- Ben Armstrong Thu, 2 Feb 2006 15:35:04 -0400 + +came (1.9-1) unstable; urgency=low + + * New upstream. + * Build against libcurl3-dev. (Closes: #279470) + + -- Ben Armstrong Thu, 11 Nov 2004 16:23:08 -0400 + +came (1.7.cvs.20040505-1) unstable; urgency=low + + * New upstream, should fix text being cropped when image scaled. + (Closes: #147457) + * Fixed FTBFS on mips/mipsel. (Closes: #246964) + + -- Ben Armstrong Wed, 5 May 2004 14:04:36 -0300 + +came (1.7.cvs.20031217-3) unstable; urgency=low + + * Fixed FTBFS. (Closes: #229173) + + -- Ben Armstrong Sat, 24 Jan 2004 22:33:03 -0400 + +came (1.7.cvs.20031217-2) unstable; urgency=low + + * Some non-i386 build fixes. + + -- Ben Armstrong Tue, 30 Dec 2003 20:41:04 -0400 + +came (1.7.cvs.20031217-1) unstable; urgency=low + + * New upstream, should fix mips/mipsel builds. + + -- Ben Armstrong Wed, 17 Dec 2003 09:17:05 -0400 + +came (1.7.cvs.20031015-1) unstable; urgency=low + + * New upstream. (Closes: 214637) + - Patch applied upstream in cvs to detach after fork + when -d specified. (Closes: #205242) + * Replaced Recommends: ttf-openoffice with ttf-freefont. + * Include some help on customizing camE in README.Debian. + + -- Ben Armstrong Wed, 15 Oct 2003 20:50:18 -0300 + +came (1.6-1) unstable; urgency=low + + * New upstream. (Closes: #198678) + * Applied patch supporting upload_every option, provided by + Nathan Poznick . + + -- Ben Armstrong Tue, 24 Jun 2003 20:00:17 -0300 + +came (1.5-1) unstable; urgency=low + + * New upstream (Closes: #193211). + + -- Ben Armstrong Tue, 13 May 2003 16:18:04 -0300 + +came (1.3-5) unstable; urgency=low + + * Revert keepalive disabling patch, as #185254 fixes the seg fault + problem. + + -- Ben Armstrong Mon, 7 Apr 2003 15:35:12 -0300 + +came (1.3-4) unstable; urgency=low + + * Apply user-supplied patch to fix non-security-related buffer + overflow and typo in error msg command. Thanks. (Closes: #183166) + + -- Ben Armstrong Fri, 7 Mar 2003 15:28:47 -0400 + +came (1.3-3) unstable; urgency=low + + * Disabled keepalive, as it causes seg faults which occur with + new libcurl2 (Closes: #167944). + * New maintainer (Closes: #181508). + + -- Ben Armstrong Tue, 18 Feb 2003 16:39:18 -0400 + +came (1.3-2) unstable; urgency=low + + * Added Recommends: ttf-openoffice, closes: #128118 + + -- Brian M. Almeida Fri, 1 Mar 2002 09:39:52 -0500 + +came (1.3-1) unstable; urgency=low + + * New upstream release + + -- Brian M. Almeida Thu, 28 Feb 2002 16:27:56 -0500 + +came (1.2-3) unstable; urgency=low + + * Added short description to long description, closes: #135422 + + -- Brian M. Almeida Wed, 27 Feb 2002 08:42:28 -0500 + +came (1.2-2) unstable; urgency=low + + * Recompile against new imlib2 + + -- Brian M. Almeida Mon, 21 Jan 2002 17:23:24 -0500 + +came (1.2-1) unstable; urgency=low + + * New upstream release + * Moved to Section: graphics, more appropriate + * Added | libcurl-ssl-dev to Build-Depends, even though I think + libcurl-ssl-dev should Provide: libcurl-dev .. consider + this a formal noted objection for future reference (Closes: #103569) + + -- Brian M. Almeida Mon, 23 Jul 2001 01:30:12 -0400 + +came (0.9-1) unstable; urgency=low + + * New upstream release + + -- Brian M. Almeida Tue, 29 May 2001 22:42:57 -0400 + +came (0.8-1) unstable; urgency=low + + * New upstream relase (closes: #96771) + + -- Brian M. Almeida Wed, 9 May 2001 09:44:12 -0400 + +came (0.7-1) unstable; urgency=low + + * New release + * Added curl to build-depends + + -- Brian M. Almeida Sun, 1 Apr 2001 03:13:26 -0400 + +came (0.6-1) unstable; urgency=low + + * Initial Release. + + -- Brian M. Almeida Thu, 8 Mar 2001 12:40:17 -0500 --- came-1.9.orig/debian/copyright +++ came-1.9/debian/copyright @@ -0,0 +1,14 @@ +This package was debianized by Brian M. Almeida on +Thu, 8 Mar 2001 12:40:17 -0500. + +It was downloaded from http://www.linuxbrit.net/ + +Upstream Author: Tom Gilbert + +Copyright: + +GPL + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in /usr/share/common-licenses/GPL + --- came-1.9.orig/debian/README.Debian +++ came-1.9/debian/README.Debian @@ -0,0 +1,17 @@ +camE for Debian +--------------- + +To get started with camE, create a ~/.camErc from the sample rc +file example.camErc.gz provided in /usr/share/doc/came/examples/, and +edit it to suit your needs. + +To use truetype fonts for title and message text, I recommend you +install ttf-freefont and change these ~/.camErc variables: + +# font for title text. fontname/size +title_font = FreeSans/8 +# font for message text. fontname/size +text_font = FreeSans/8 +ttf_dir = /usr/share/fonts/truetype/freefont + + -- Ben Armstrong , Wed, 15 Oct 2003 20:32:49 -0300 --- came-1.9.orig/debian/examples +++ came-1.9/debian/examples @@ -0,0 +1,4 @@ +example.camErc +example.camErc.ssh +camE_text.style +camE_title.style --- came-1.9.orig/debian/rules +++ came-1.9/debian/rules @@ -0,0 +1,77 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This is the debhelper compatability version to use. +export DH_COMPAT=4 + +configure: configure-stamp +configure-stamp: + dh_testdir + # Add here commands to configure the package. + + + touch configure-stamp + +build: configure-stamp build-stamp +build-stamp: + dh_testdir + + # Add here commands to compile the package. + $(MAKE) prefix=/usr + + # No man page provided, so build one: + help2man -n "Rewrite of the xawtv webcam app using imlib2" \ + -h'-h' -v'-v' -N ./camE >camE.1 + + touch build-stamp + +clean: + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + + # Add here commands to clean up after the build process. + -$(MAKE) clean + + rm -f camE.1 + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + # Add here commands to install the package into debian/came. + $(MAKE) install ROOT=$(CURDIR)/debian/came prefix=/usr + + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installdocs + dh_installexamples + dh_installman $(CURDIR)/camE.1 + dh_installchangelogs + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_shlibdeps + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- came-1.9.orig/debian/dirs +++ came-1.9/debian/dirs @@ -0,0 +1 @@ +usr/bin