--- camorama-0.19.orig/camorama.desktop.in.costela +++ camorama-0.19/camorama.desktop.in.costela @@ -0,0 +1,13 @@ +[Desktop Entry] +_Name=Camorama Webcam Viewer +_Comment=View, alter and save images from a webcam +Exec=camorama +Terminal=0 +Type=Application +Icon=camorama.png +Categories=Video;Graphics;Viewer +StartupNotify=true +X-GNOME-Bugzilla-Bugzilla=GNOME +X-GNOME-Bugzilla-Product=camorama +X-GNOME-Bugzilla-Component=General +X-GNOME-Bugzilla-Component=User Interface --- camorama-0.19.orig/debian/compat +++ camorama-0.19/debian/compat @@ -0,0 +1 @@ +5 --- camorama-0.19.orig/debian/rules +++ camorama-0.19/debian/rules @@ -0,0 +1,15 @@ +#!/usr/bin/make -f +# +# CDBS-based rules file for camorama. +# Copyright © Leo Costela , 2003. +# Released under the public domain. + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/class/gnome.mk + +DEB_CONFIGURE_EXTRA_FLAGS := --disable-schemas-install + +common-install-prehook-impl:: + mkdir -p debian/camorama/usr/share/pixmaps/ + cp debian/camorama.xpm debian/camorama/usr/share/pixmaps/ --- camorama-0.19.orig/debian/docs +++ camorama-0.19/debian/docs @@ -0,0 +1,4 @@ +AUTHORS +THANKS +README +TODO --- camorama-0.19.orig/debian/control +++ camorama-0.19/debian/control @@ -0,0 +1,15 @@ +Source: camorama +Section: gnome +Priority: optional +Maintainer: Leo Costela +Build-Depends: libgconf2-dev, file, gettext, libgtk2.0-dev (>= 2.10), libglib2.0-dev, pkg-config, libgnutls-dev, cdbs, libgnomevfs2-dev, debhelper (>= 5), libpng12-dev, libgnome2-dev, libgnomeui-dev, libglade2-dev, libx11-dev, libxml-parser-perl, libv4l-dev +Homepage: http://camorama.fixedgear.org +Standards-Version: 3.7.2 + +Package: camorama +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: gnome utility to view and save images from a webcam + Camorama is a small utility to view and save images from a webcam + or any other Video4Linux device. It can apply a number of image filters and + make remote captures. --- camorama-0.19.orig/debian/changelog +++ camorama-0.19/debian/changelog @@ -0,0 +1,94 @@ +camorama (0.19-2.2) unstable; urgency=low + + * Non-maintainer upload. + * V4L1 was removed from recent kernels, rely on libv4l-dev and replace + #include statements to fix FTBFS (Closes: #621953). + Thanks to Daniel Polehn for the patch (LP: #749079). + + -- Alessio Treglia Wed, 10 Aug 2011 10:50:25 +0200 + +camorama (0.19-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Use libv4l1 as an emulation layer to ensure compatibility with the most + new drivers (Closes: #569089). + + -- Alessio Treglia Tue, 18 May 2010 18:29:28 +0200 + +camorama (0.19-2) unstable; urgency=low + + * debian/patches: add S50_0.19_versionfix.patch to fix VERSION use + * debian/compat: bump to 5 + * debian/control: version build-dep on libgtk2.0-dev, bump debhelper + build-dep + + -- Leo Costela Sun, 02 Dec 2007 17:07:03 +0100 + +camorama (0.19-1) unstable; urgency=low + + * New upstream release + * debian/watch: add watch file (I'm assuming upstream will use ftp.gnome.org + from now on...) + * debian/control: adding Homepage field, minor subjective improvements to + description + * debian/menu: Apps -> Applications + * debian/patches: add S50_0.19_desktop.patch to update desktop file section + + -- Leo Costela Fri, 23 Nov 2007 20:21:05 +0100 + +camorama (0.18-2) unstable; urgency=low + + * Add patch for missing prototype (closes: #424900) + + -- Leo Costela Thu, 17 May 2007 23:27:59 -0300 + +camorama (0.18-1) unstable; urgency=low + + * New upstream release (closes: #402349) + * Add patch for FTBFS regarding locale constant (closes: #420723) + * Can now save/read device info to/from GConf (closes: #209238) + + -- Leo Costela Wed, 16 May 2007 12:58:32 -0300 + +camorama (0.17-5) unstable; urgency=low + + * Changed build-dep on libgnutls to libgnutls-dev and cleaned a lot of + useless build-deps (but it's still full of cruft) (closes: #335754) + * policy: 3.7.2 (no changes) + + -- Leo Costela Fri, 12 May 2006 20:37:16 -0300 + +camorama (0.17-4) unstable; urgency=low + + * build-dep on libx11-dev instead of xlibs-dev (thanks Nico Golde and + Amaya!) (closes: #346629) + * update gconf behaviour (closes: #340510) + * policy: 3.6.2 (no changes) + + -- Leo Costela Mon, 16 Jan 2006 23:14:40 -0200 + +camorama (0.17-3) unstable; urgency=low + + * Corrected typo in manpage (closes: #284071) + * Updated build-deps (closes: #292372) + * Patched to compile on amd64/gcc-4.0 (closes: #284753) + * Correctly quoted the menu file + + -- Leo Costela Wed, 26 Jan 2005 15:22:40 -0300 + +camorama (0.17-2) unstable; urgency=low + + * Corrected build-dependencies (many were missing) + * Corrected the debian menu entry to use the logo (thanks: Luca Capello) + (closes: #234027) + + -- Leo Costela Wed, 18 Feb 2004 09:57:53 -0300 + +camorama (0.17-1) unstable; urgency=low + + * First Debian release (closes: #202419) + * Big thanks to Jordi Mallach who did almost everything for this first + release, since I was too occupied (read "slacker") + + -- Leo Costela Fri, 29 Aug 2003 14:04:09 -0300 + --- camorama-0.19.orig/debian/camorama.1 +++ camorama-0.19/debian/camorama.1 @@ -0,0 +1,50 @@ +.TH "Camorama" "1" "29 August 2003" "" "" +.SH "NAME" +Camorama \- GNOME2 Video4Linux viewer +.SH "SYNOPSIS" +.B camorama +.RI [ options ] +.SH "DESCRIPTION" +This manual page documents briefly the +.B camorama +command. +This manual page was written for the Debian GNU/Linux distribution +because the original program does not have a manual page. +.PP + +\fBCamorama\fP +is an open\-source Video4Linux application with view, record and even effect capabilities. +.br +.SH "OPTIONS" +Options: +.TP +.B \-h +usage +.TP +.B \-V +version info +.TP +.B \-D +debugging info +.TP +.B \-d +use video_dev instead of /dev/video0 +.TP +.B \-M +use maximum capture size (depends on camera) +.TP +.B \-m +use minimum capture size (depends on camera) +.TP +.B \-H +use middle capture size (depends on camera) +.TP +.B \-x +capture width +.TP +.B \-y +capture height + +.SH "AUTHOR" +This manual page was written by Leo Costela Antunes , +for the Debian GNU/Linux system (but may be used by others). --- camorama-0.19.orig/debian/copyright +++ camorama-0.19/debian/copyright @@ -0,0 +1,23 @@ +This package was debianized by Leo Costela from +the source at: +http://camorama.fixedgear.org + +Upstream Author: Greg Jones + + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, + * MA 02110-1301, USA. + +On Debian systems, the GNU General Public License, version 2, is +available as the file /usr/share/common-licenses/copyright/GPL . --- camorama-0.19.orig/debian/camorama.xpm +++ camorama-0.19/debian/camorama.xpm @@ -0,0 +1,63 @@ +/* XPM */ +static char *camorama[] = { +/* columns rows colors chars-per-pixel */ +"32 32 25 1", +" c #000800080008", +". c #0BBF0BA90BD7", +"X c #179F173E17F3", +"o c #2FAE2F12305C", +"O c #203520251FEF", +"+ c #519E4FE9528F", +"@ c #71B56F987008", +"# c #636C6032614A", +"$ c #7EB97DB181B5", +"% c #818D7CDA7B9F", +"& c #81777FBB82CE", +"* c #8E9C88607B29", +"= c #90578F3C91C8", +"- c #9DD19DCEA1D0", +"; c #A1059FE9A237", +": c #ADBCAE57B197", +"> c #B0D4B042B217", +", c #ACF9A78D98D3", +"< c #BE5DBEF9C233", +"1 c #C096C0C4C348", +"2 c #CE15CFF5D25D", +"3 c #DB93DF88E2FB", +"4 c #DD21E0FDE3EE", +"5 c #E342E427E576", +"6 c None", +/* pixels */ +"66666666666666666666666666666666", +"6666666666666666===o666666666666", +"666666666666X>432222-+ 6666666", +"66666666666@>432212><>+. 666666", +"6666666666O>532221>2::;@ 66666", +"6666666666>542322>>>::--o 6666", +"666666666o5521>2><,,;;-;#. 6666", +"66666666 -5>@#@,<<>:--===O 666", +"66666666 =>@##+@::;--====o 66", +"66666666 -=#@*@+;:--=$=$$o 66", +"66666666 -=@*,*+-:--==$$$o 66", +"66666666 =:@,,#+;---=$$=@o 66", +"66666666 #2=##+=>;-=$$@@+X 66", +"66666666 X11===>:;===$$@+ 66", +"66666666 @22<>>;-;=$$@#. 66", +"66666666 #>32>>>;;===$=&. 666", +"6666666o333322>>>;-==$=;# 666", +"666666o233335521>;--=:22=o 666", +"6666O:333333332>23223333<$ 66", +"666#:33333332,>,=23333332:o 66", +"66@433333355%=@==<33333332=X 6", +"6+2333333333=$>;:2333333332+ 6", +"6@::::>>12223>2333333333333>2223333333333@. ", +"6 .Ooo++@@===-:22222232+ ", +"6 ..X...XOo+#-:>><><= ", +"6 X+#@@== ", +"66 .XX ", +"666666 ", +"666666666 ", +"66666666666666666666 ", +"66666666666666666666666666 " +}; --- camorama-0.19.orig/debian/watch +++ camorama-0.19/debian/watch @@ -0,0 +1,6 @@ +# Compulsory line, this is a version 3 file +version=3 + +http://ftp.gnome.org/pub/GNOME/sources/camorama/(?:[\d\.]+)/camorama-(.+)\.tar\.(?:bz2|gz) \ +debian uupdate + --- camorama-0.19.orig/debian/menu +++ camorama-0.19/debian/menu @@ -0,0 +1,3 @@ +?package(camorama):needs="X11" section="Applications/Viewers" \ + title="Camorama" command="/usr/bin/camorama" \ + icon="/usr/share/pixmaps/camorama.xpm" --- camorama-0.19.orig/debian/manpages +++ camorama-0.19/debian/manpages @@ -0,0 +1 @@ +debian/camorama.1 --- camorama-0.19.orig/debian/patches/S50_0.18_missing_prototype.patch +++ camorama-0.19/debian/patches/S50_0.18_missing_prototype.patch @@ -0,0 +1,10 @@ +--- camorama-0.18/src/camorama-window.c.orig 2007-05-17 11:01:43.000000000 -0600 ++++ camorama-0.18/src/camorama-window.c 2007-05-17 11:01:56.000000000 -0600 +@@ -36,6 +36,7 @@ + #include "camorama-stock-items.h" + #include "filter.h" + #include "glib-helpers.h" ++#include "support.h" + + static GQuark menu_item_filter_type = 0; + --- camorama-0.19.orig/debian/patches/S50_0.19_desktop.patch +++ camorama-0.19/debian/patches/S50_0.19_desktop.patch @@ -0,0 +1,11 @@ +--- camorama-0.19/camorama.desktop.in 2007-06-14 16:05:33.000000000 +0200 ++++ camorama-0.19/camorama.desktop.in.costela 2007-11-24 00:47:48.000000000 +0100 +@@ -5,7 +5,7 @@ + Terminal=0 + Type=Application + Icon=camorama.png +-Categories=Application;Graphics ++Categories=Video;Graphics;Viewer + StartupNotify=true + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=camorama --- camorama-0.19.orig/debian/patches/S50_0.19_newv4l.patch +++ camorama-0.19/debian/patches/S50_0.19_newv4l.patch @@ -0,0 +1,290 @@ +diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/callbacks.c camorama-0.19.new/src/callbacks.c +--- camorama-0.19/src/callbacks.c 2007-09-16 15:36:55.000000000 +0200 ++++ camorama-0.19.new/src/callbacks.c 2010-05-18 18:15:21.533068008 +0200 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + extern GtkWidget *main_window, *prefswindow; + //extern state func_state; +@@ -387,13 +388,10 @@ + } + } + +- cam->pixmap = gdk_pixmap_new (NULL, cam->x, cam->y, cam->desk_depth); +- gtk_widget_set_size_request (glade_xml_get_widget (cam->xml, "da"), +- cam->x, cam->y); + + /* + * if(cam->read == FALSE) { +- * cam->pic = mmap(0, cam->vid_buf.size, PROT_READ | PROT_WRITE, MAP_SHARED, cam->dev, 0); ++ * cam->pic = v4l1_mmap(0, cam->vid_buf.size, PROT_READ | PROT_WRITE, MAP_SHARED, cam->dev, 0); + * + * if((unsigned char *) -1 == (unsigned char *) cam->pic) { + * if(cam->debug == TRUE) { +@@ -404,7 +402,7 @@ + * } + * }else{ + * cam->pic_buf = malloc(cam->x * cam->y * cam->depth); +- * read(cam->dev,cam->pic,(cam->x * cam->y * 3)); ++ * v4l1_read(cam->dev,cam->pic,(cam->x * cam->y * 3)); + * } + */ + +@@ -430,7 +428,7 @@ + * if(cam->read == FALSE) { + * * for(frame = 0; frame < cam->vid_buf.frames; frame++) { + * * cam->vid_map.frame = frame; +- * * if(ioctl(cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) { ++ * * if(v4l1_ioctl(cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) { + * * if(cam->debug == TRUE) { + * * fprintf(stderr, "Unable to capture image (VIDIOCMCAPTURE) during resize.\n"); + * * } +@@ -441,6 +439,11 @@ + * * } + */ + get_win_info (cam); ++ ++ cam->pixmap = gdk_pixmap_new (NULL, cam->x, cam->y, cam->desk_depth); ++ gtk_widget_set_size_request (glade_xml_get_widget (cam->xml, "da"), ++ cam->x, cam->y); ++ + frame = 0; + gtk_window_resize (GTK_WINDOW + (glade_xml_get_widget (cam->xml, "main_window")), 320, +@@ -520,8 +523,14 @@ + gtk_widget_show (about); + } + ++void ++camorama_filter_color_filter(void* filter, guchar *image, int x, int y, int depth); ++ + static void + apply_filters(cam* cam) { ++ /* v4l has reverse rgb order from what camora expect so call the color ++ filter to fix things up before running the user selected filters */ ++ camorama_filter_color_filter(NULL, cam->pic_buf, cam->x, cam->y, cam->depth); + camorama_filter_chain_apply(cam->filter_chain, cam->pic_buf, cam->x, cam->y, cam->depth); + #warning "FIXME: enable the threshold channel filter" + // if((effect_mask & CAMORAMA_FILTER_THRESHOLD_CHANNEL) != 0) +@@ -539,7 +548,7 @@ + int i, count = 0; + GdkGC *gc; + +- read (cam->dev, cam->pic, (cam->x * cam->y * 3)); ++ v4l1_read (cam->dev, cam->pic, (cam->x * cam->y * 3)); + frames2++; + /* + * update_rec.x = 0; +@@ -580,7 +589,7 @@ + + i = -1; + while (i < 0) { +- i = ioctl (cam->dev, VIDIOCSYNC, &frame); ++ i = v4l1_ioctl (cam->dev, VIDIOCSYNC, &frame); + + if (i < 0 && errno == EINTR) { + if (cam->debug == TRUE) { +@@ -622,7 +631,7 @@ + 0, cam->x, cam->y); + + cam->vid_map.frame = frame; +- if (ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) { ++ if (v4l1_ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) { + if (cam->debug == TRUE) { + fprintf (stderr, "Unable to capture image (VIDIOCMCAPTURE)\n"); + } +@@ -669,7 +678,7 @@ + void init_cam (GtkWidget * capture, cam * cam) + { + cam->pic = +- mmap (0, cam->vid_buf.size, PROT_READ | PROT_WRITE, ++ v4l1_mmap (0, cam->vid_buf.size, PROT_READ | PROT_WRITE, + MAP_SHARED, cam->dev, 0); + + if ((unsigned char *) -1 == (unsigned char *) cam->pic) { +@@ -684,7 +693,7 @@ + cam->vid_map.format = cam->vid_pic.palette; + for (frame = 0; frame < cam->vid_buf.frames; frame++) { + cam->vid_map.frame = frame; +- if (ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) { ++ if (v4l1_ioctl (cam->dev, VIDIOCMCAPTURE, &cam->vid_map) < 0) { + if (cam->debug == TRUE) { + fprintf (stderr, + "Unable to capture image (VIDIOCMCAPTURE).\n"); +diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/camorama-window.c camorama-0.19.new/src/camorama-window.c +--- camorama-0.19/src/camorama-window.c 2010-05-18 18:15:20.893067745 +0200 ++++ camorama-0.19.new/src/camorama-window.c 2010-05-18 18:15:21.533068008 +0200 +@@ -210,11 +210,7 @@ + + logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(glade_xml_get_widget(cam->xml, "main_window"))), CAMORAMA_STOCK_WEBCAM, 24, 0, NULL); + gtk_window_set_default_icon(logo); +- logo = (GdkPixbuf *) create_pixbuf (PACKAGE_DATA_DIR "/pixmaps/camorama.png"); +- if (logo == NULL) { +- printf ("\n\nLOGO NO GO\n\n"); +- } +- ++ logo = gtk_icon_theme_load_icon(gtk_icon_theme_get_for_screen(gtk_widget_get_screen(glade_xml_get_widget(cam->xml, "main_window"))), "camorama", 48, 0, NULL); + if (cam->show_adjustments == FALSE) { + gtk_widget_hide (glade_xml_get_widget + (cam->xml, "adjustments_table")); +diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/filter.c camorama-0.19.new/src/filter.c +--- camorama-0.19/src/filter.c 2007-09-16 14:48:50.000000000 +0200 ++++ camorama-0.19.new/src/filter.c 2010-05-18 18:15:21.533068008 +0200 +@@ -151,12 +151,12 @@ + static void + camorama_filter_color_init(CamoramaFilterColor* self) {} + +-static void ++void + camorama_filter_color_filter(CamoramaFilterColor* filter, guchar *image, int x, int y, int depth) { + int i; + char tmp; + i = x * y; +- while (--i) { ++ while (i--) { + tmp = image[0]; + image[0] = image[2]; + image[2] = tmp; +diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/main.c camorama-0.19.new/src/main.c +--- camorama-0.19/src/main.c 2007-09-16 15:36:55.000000000 +0200 ++++ camorama-0.19.new/src/main.c 2010-05-18 18:15:21.533068008 +0200 +@@ -9,6 +9,7 @@ + #include + #include + #include ++#include + + #include "camorama-display.h" + #include "camorama-stock-items.h" +@@ -206,7 +207,7 @@ + gdk_pixbuf_xlib_init (display, 0); + cam->desk_depth = xlib_rgb_get_depth (); + +- cam->dev = open (cam->video_dev, O_RDWR); ++ cam->dev = v4l1_open (cam->video_dev, O_RDWR); + + camera_cap (cam); + get_win_info (cam); +@@ -224,8 +225,7 @@ + + /* get picture attributes */ + get_pic_info (cam); +-// set_pic_info(cam); +- /* set_pic_info(cam); */ ++ set_pic_info (cam); + cam->contrast = cam->vid_pic.contrast; + cam->brightness = cam->vid_pic.brightness; + cam->colour = cam->vid_pic.colour; +@@ -285,5 +285,8 @@ + + gtk_timeout_add (2000, (GSourceFunc) fps, cam->status); + gtk_main (); ++ v4l1_munmap(cam->pic, cam->vid_buf.size); ++ v4l1_close(cam->dev); ++ + return 0; + } +diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/Makefile.am camorama-0.19.new/src/Makefile.am +--- camorama-0.19/src/Makefile.am 2007-09-16 14:48:05.000000000 +0200 ++++ camorama-0.19.new/src/Makefile.am 2010-05-18 18:15:21.533068008 +0200 +@@ -36,7 +36,7 @@ + filter.h \ + $(BUILT_SOURCES)\ + $(NULL) +-camorama_LDADD = $(PACKAGE_LIBS) ++camorama_LDADD = $(PACKAGE_LIBS) -lv4l1 + + DISTCLEANFILES=$(BUILT_SOURCES) + +diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/Makefile.in camorama-0.19.new/src/Makefile.in +--- camorama-0.19/src/Makefile.in 2007-10-06 21:06:28.000000000 +0200 ++++ camorama-0.19.new/src/Makefile.in 2010-05-18 18:15:21.533068008 +0200 +@@ -248,7 +248,7 @@ + $(BUILT_SOURCES)\ + $(NULL) + +-camorama_LDADD = $(PACKAGE_LIBS) ++camorama_LDADD = $(PACKAGE_LIBS) -lv4l1 + DISTCLEANFILES = $(BUILT_SOURCES) + all: $(BUILT_SOURCES) + $(MAKE) $(AM_MAKEFLAGS) all-am +diff -Nur -x '*.orig' -x '*~' camorama-0.19/src/v4l.c camorama-0.19.new/src/v4l.c +--- camorama-0.19/src/v4l.c 2007-09-16 14:48:05.000000000 +0200 ++++ camorama-0.19.new/src/v4l.c 2010-05-18 18:15:21.533068008 +0200 +@@ -2,6 +2,7 @@ + #include + #include + #include ++#include + #include "support.h" + + extern int frame_number; +@@ -87,7 +88,7 @@ + void camera_cap(cam * cam) + { + char *msg; +- if(ioctl(cam->dev, VIDIOCGCAP, &cam->vid_cap) == -1) { ++ if(v4l1_ioctl(cam->dev, VIDIOCGCAP, &cam->vid_cap) == -1) { + if(cam->debug == TRUE) { + fprintf(stderr, "VIDIOCGCAP -- could not get camera capabilities, exiting.....\n"); + } +@@ -158,10 +159,10 @@ + if(cam->debug) { + g_message("SET PIC"); + } +- //cam->vid_pic.palette = VIDEO_PALETTE_RGB24; +- //cam->vid_pic.depth = 24; ++ cam->vid_pic.palette = VIDEO_PALETTE_RGB24; ++ cam->vid_pic.depth = 24; + //cam->vid_pic.palette = VIDEO_PALETTE_YUV420P; +- if(ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) { ++ if(v4l1_ioctl(cam->dev, VIDIOCSPICT, &cam->vid_pic) == -1) { + if(cam->debug) { + g_message("VIDIOCSPICT -- could not set picture info, exiting...."); + } +@@ -176,7 +177,7 @@ + //set_pic_info(cam); + char *msg; + +- if(ioctl(cam->dev, VIDIOCGPICT, &cam->vid_pic) == -1) { ++ if(v4l1_ioctl(cam->dev, VIDIOCGPICT, &cam->vid_pic) == -1) { + msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev); + error_dialog(msg); + if(cam->debug == TRUE) { +@@ -201,7 +202,7 @@ + void get_win_info(cam * cam) + { + gchar *msg; +- if(ioctl(cam->dev, VIDIOCGWIN, &cam->vid_win) == -1) { ++ if(v4l1_ioctl(cam->dev, VIDIOCGWIN, &cam->vid_win) == -1) { + msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev); + error_dialog(msg); + if(cam->debug == TRUE) { +@@ -222,7 +223,7 @@ + void set_win_info(cam * cam) + { + gchar *msg; +- if(ioctl(cam->dev, VIDIOCSWIN, &cam->vid_win) == -1) { ++ if(v4l1_ioctl(cam->dev, VIDIOCSWIN, &cam->vid_win) == -1) { + msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev); + error_dialog(msg); + if(cam->debug == TRUE) { +@@ -232,12 +233,14 @@ + exit(0); + } + ++ cam->x = cam->vid_win.width; ++ cam->y = cam->vid_win.height; + } + + void set_buffer(cam * cam) + { + char *msg; +- if(ioctl(cam->dev, VIDIOCGMBUF, &cam->vid_buf) == -1) { ++ if(v4l1_ioctl(cam->dev, VIDIOCGMBUF, &cam->vid_buf) == -1) { + msg = g_strdup_printf(_("Could not connect to video device (%s).\nPlease check connection."), cam->video_dev); + error_dialog(msg); + if(cam->debug == TRUE) { --- camorama-0.19.orig/debian/patches/S50_0.19_deprecated_v4l1.patch +++ camorama-0.19/debian/patches/S50_0.19_deprecated_v4l1.patch @@ -0,0 +1,17 @@ +Description: V4L1 support was removed in the most recent kernels. + Update #include statements to rely on v4l-utils's headers. +Origin: Ubuntu +Bug-Ubuntu: https://launchpad.net/bugs/749079 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=621953 +diff -Nur -x '*.orig' -x '*~' camorama-0.19//src/v4l.h camorama-0.19.new//src/v4l.h +--- camorama-0.19//src/v4l.h 2007-09-16 15:36:55.000000000 +0200 ++++ camorama-0.19.new//src/v4l.h 2011-08-10 10:48:11.127104703 +0200 +@@ -13,7 +13,7 @@ + #include + #include + #include +-#include ++#include + #include + #include + #include --- camorama-0.19.orig/debian/patches/S50_0.19_versionfix.patch +++ camorama-0.19/debian/patches/S50_0.19_versionfix.patch @@ -0,0 +1,12 @@ +diff -Nur camorama-0.19/src/main.c camorama-0.19.new/src/main.c +--- camorama-0.19/src/main.c 2007-07-20 13:13:51.000000000 +0200 ++++ camorama-0.19.new/src/main.c 2007-07-20 13:14:44.000000000 +0200 +@@ -101,7 +101,7 @@ + glade_gnome_init (); + + if (ver) { +- fprintf (stderr, _("\n\nCamorama version %s\n\n"), VERSION); ++ fprintf (stderr, _("\n\nCamorama version %s\n\n"), PACKAGE_VERSION); + exit (0); + } + if (max) {