debian/0000755000000000000000000000000012235362277007177 5ustar debian/rules0000755000000000000000000000031412235362213010243 0ustar #!/usr/bin/make -f export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: dh $@ --parallel --with autotools_dev override_dh_installman: dh_installman debian/coriander.1 .PHONY: override_dh_installman debian/changelog0000644000000000000000000001703412235362266011054 0ustar coriander (2.0.2-3ubuntu1) trusty; urgency=low * Merge from Debian unstable. Remaining changes: - debian/control: Build-depend on libtiff-dev rather than libtiff4-dev. -- Logan Rosen Sun, 03 Nov 2013 01:52:31 -0400 coriander (2.0.2-3) unstable; urgency=low * Don't define main() in AC_TRY_COMPILE. Closes: #684541 * Use the autotools-dev dh addon to update config.guess/config.sub for arm64. Closes: #727347 * Bump Standards-Version. * Re-add -Wl,--as-needed, which was lost when the package was converted to use the dh sequencer. -- Guus Sliepen Sun, 27 Oct 2013 22:27:39 +0100 coriander (2.0.2-2ubuntu1) saucy; urgency=low * Build-depend on libtiff-dev rather than libtiff4-dev. -- Logan Rosen Sun, 11 Aug 2013 20:53:13 -0400 coriander (2.0.2-2) unstable; urgency=low * Build-Depend on libtiff4-dev. -- Guus Sliepen Sun, 05 May 2013 16:17:01 +0200 coriander (2.0.2-1) unstable; urgency=low * New upstream release. * Replace debian/rules with dh sequencer. * Bump Standards-Version and debian/compat. * Enable parallel building. -- Guus Sliepen Sun, 05 May 2013 15:18:28 +0200 coriander (2.0.1-1) unstable; urgency=low * New upstream release. * Remove link-with-X11 patch. * Check return value of dc1394_camera_enumerate() and _new(). * Do not use the po/ directory when building. * Bump Standards-Version. -- Guus Sliepen Mon, 28 Jun 2010 15:47:18 +0200 coriander (2.0.0-4) unstable; urgency=low * Convert source package to 3.0 (quilt) format. * Bump Standards-Version. * Bump debhelper compatibility level. * Depend on ${misc:Depends}. * Use dh_prep instead of dh_clean -k. * Use portable macros for printing uint32_t and uint64_t. * Link with X11. Closes: #554118 -- Guus Sliepen Sun, 24 Jan 2010 17:48:10 +0100 coriander (2.0.0-3) unstable; urgency=low * Link with latest libdc1394-22 -- Guus Sliepen Wed, 10 Jun 2009 17:48:22 +0200 coriander (2.0.0-2) unstable; urgency=low * Build-Depend on libdc1394-22-dev >= 2.1.0 to get dual Firewire stack support. * Remove unnecesary build dependency on libgdk-pixbuf-dev. Closes: #509462 -- Guus Sliepen Tue, 17 Feb 2009 13:38:11 +0100 coriander (2.0.0-1) unstable; urgency=low * New upstream release. -- Guus Sliepen Wed, 02 Jul 2008 23:15:03 +0200 coriander (2.0.0~rc6-2) unstable; urgency=low * Link with -Wl,--as-needed to prevent linking to unused libraries. -- Guus Sliepen Tue, 12 Feb 2008 13:25:37 +0100 coriander (2.0.0~rc6-1) unstable; urgency=low * Adopting this package from Peter de Schrijver. * Added Peter de Schrijver to the Uploaders. * New upstream release. - No longer depends on old gnome-libs. Closes: #460762 * Upload to unstable, because gnome-libs will be removed. * Update copyright file. -- Guus Sliepen Sun, 20 Jan 2008 20:03:19 +0100 coriander (2.0.0~rc5-0.1) experimental; urgency=low * Non-maintainer upload to experimental. * New upstream release. Closes: #427801 * Fix segmentation fault that occurs when the coriander starts but doesn't know the framerates supported by the camera yet. * Set Architecture to any. Closes: #301053 -- Guus Sliepen Thu, 14 Jun 2007 14:35:26 +0200 coriander (1.0.1-3.1) unstable; urgency=low * NMU. * debian/control: Remove unnecessary autotool dependencies. (Closes: #376335) -- Eric Dorland Sat, 19 Aug 2006 01:55:28 -0400 coriander (1.0.1-3) unstable; urgency=low * Fix dependency problem (closes: #352519) -- Peter De Schrijver (p2) Mon, 13 Feb 2006 23:04:00 +0100 coriander (1.0.1-2) unstable; urgency=low * First upload to unstable. -- Peter De Schrijver (p2) Fri, 1 Apr 2005 16:06:00 +0200 coriander (1.0.1-1) unstable; urgency=low * New upstream version. (closes: #289867) -- Peter De Schrijver (p2) Sun, 23 Jan 2005 22:12:06 +0100 coriander (1.0.0-r-1) unstable; urgency=low * New upstream version. -- Peter De Schrijver (p2) Sun, 19 Sep 2004 14:10:15 +0200 coriander (1.0.0-pre3-3) unstable; urgency=low * Removed amd64 to correct lintian error -- Peter De Schrijver (p2) Sat, 3 Jul 2004 22:51:17 +0200 coriander (1.0.0-pre3-2) unstable; urgency=low * Fix dependency on libdc1394-10 (closes: #253726) * Now really added amd64 (closes: #249952) -- Peter De Schrijver (p2) Fri, 2 Jul 2004 00:20:39 +0200 coriander (1.0.0-pre3-1) unstable; urgency=low * New upstream release * Added amd64 as a supported architecture (closes: #249389) -- Peter De Schrijver (p2) Tue, 25 May 2004 20:45:28 +0200 coriander (1.0.0-pre1-2) unstable; urgency=low * Fixed erronous compile against Xfree86 4.3 libs (closes: #231712) -- Peter De Schrijver (p2) Sun, 8 Feb 2004 19:40:39 +0100 coriander (1.0.0-pre1-1) unstable; urgency=low * New upstream release -- Peter De Schrijver (p2) Sat, 31 Jan 2004 19:51:05 +0100 coriander (0.99.5-1) unstable; urgency=low * New upstream release -- Peter De Schrijver (p2) Sun, 23 Nov 2003 18:51:22 +0100 coriander (0.99.4-2) unstable; urgency=low * New Maintainer (closes: #158467) * Fixed compile problem on recent Linux kernels -- Peter De Schrijver (p2) Tue, 11 Nov 2003 00:55:09 +0100 coriander (0.99.4-1) unstable; urgency=low * New upstream release (closes: #188350) -- Peter De Schrijver (p2) Fri, 31 Oct 2003 00:51:51 +0100 coriander (0.99.3-1) unstable; urgency=low * New upstream release * Added man page -- Peter De Schrijver (p2) Mon, 29 Sep 2003 16:13:13 +0200 coriander (0.27.1-1) unstable; urgency=low * New upstream release. (closes: #175835) -- Chanop Silpa-Anan Mon, 10 Feb 2003 12:01:17 +1100 coriander (0.25-1) unstable; urgency=low * New upstream release. -- Chanop Silpa-Anan Mon, 23 Sep 2002 03:00:43 +1000 coriander (0.24-3) unstable; urgency=low * Fix my stupid upload (as debian native) for -1, -2. -- Chanop Silpa-Anan Tue, 7 May 2002 14:26:59 +1000 coriander (0.24-2) unstable; urgency=low * Fix Build-Depends with libdc1394. (closes: #146036) -- Chanop Silpa-Anan Tue, 7 May 2002 12:07:55 +1000 coriander (0.24-1) unstable; urgency=low * New upsteam release. (closes: #134154) * I skip the buggy 0.23 version. -- Chanop Silpa-Anan Mon, 6 May 2002 18:52:39 +1000 coriander (0.22-2) unstable; urgency=low * Fix Build-Depends with libsdl1.2-dev. (closes: #134153) * 0.23 is out but i could not get it to work properly on my box :-(. -- Chanop Silpa-Anan Wed, 20 Feb 2002 16:23:49 +1100 coriander (0.22-1) unstable; urgency=low * New upstream release. (closes: #131833) -- Chanop Silpa-Anan Wed, 6 Feb 2002 13:50:40 +1100 coriander (0.19-2) unstable; urgency=low * Add Build-Depends, libdc1394-dev (>= 0.8.3). (closes: #121242) -- Chanop Silpa-Anan Tue, 27 Nov 2001 09:05:53 +1100 coriander (0.19-1) unstable; urgency=low * New upstream release. (closes: #120183) -- Chanop Silpa-Anan Sun, 25 Nov 2001 18:50:39 +1100 coriander (0.17-pre1-1) unstable; urgency=low * Initial Release. (closes: #108316) -- Chanop Silpa-Anan Sun, 12 Aug 2001 20:57:21 +1000 debian/compat0000644000000000000000000000000212235362166010372 0ustar 9 debian/copyright0000644000000000000000000000250512235362166011131 0ustar This package was debianized by Peter De Schrijver (p2) Sun, 23 Nov 2003 18:51:22 +0100. It was downloaded from http://sourceforge.net/projects/coriander Upstream Authors: Damien Douxchamps Dan Dennedy Copyright for most files: Copyright (C) 2000-2008 Damien Douxchamps Copyright (C) 2003 Peter de Schrijver 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. On Debian GNU/Linux systems, the complete text of the GNU General Public License version 2 can be found in /usr/share/common-licenses/GPL-2. Copyright for src/subtitles.[ch] and src/video_encode.c: Copyright (C) 2004 Sergio Rui Silva This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. On Debian GNU/Linux systems, the complete text of the GNU Lesser General Public License version 2 can be found in /usr/share/common-licenses/LGPL-2. debian/source/0000755000000000000000000000000012235362276010476 5ustar debian/source/format0000644000000000000000000000001412235362166011702 0ustar 3.0 (quilt) debian/menu0000644000000000000000000000016212235362166010062 0ustar ?package(coriander):needs="X11" section="Applications/Graphics"\ title="coriander" command="/usr/bin/coriander" debian/coriander.10000644000000000000000000000336512235362166011233 0ustar .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.33. .TH GNOME "1" "May 2004" "Gnome coriander 1.0.0-pre3 "User Commands" .SH NAME coriander \- control and display dc1394 camera images .SH SYNOPSIS .B coriander [\fIOPTION\fR...] .SH DESCRIPTION GNOME options .TP \fB\-\-disable\-sound\fR Disable sound server usage .TP \fB\-\-enable\-sound\fR Enable sound server usage .TP \fB\-\-espeaker\fR=\fIHOSTNAME\fR:PORT Host:port on which the sound server to use is running .HP \fB\-\-version\fR .PP Help options .TP -?, \fB\-\-help\fR Show this help message .TP \fB\-\-usage\fR Display brief usage message .PP GTK options .TP \fB\-\-gdk\-debug\fR=\fIFLAGS\fR Gdk debugging flags to set .TP \fB\-\-gdk\-no\-debug\fR=\fIFLAGS\fR Gdk debugging flags to unset .TP \fB\-\-display\fR=\fIDISPLAY\fR X display to use .TP \fB\-\-sync\fR Make X calls synchronous .TP \fB\-\-no\-xshm\fR Don't use X shared memory extension .TP \fB\-\-name\fR=\fINAME\fR Program name as used by the window manager .TP \fB\-\-class\fR=\fICLASS\fR Program class as used by the window manager .HP \fB\-\-gxid_host\fR=\fIHOST\fR .HP \fB\-\-gxid_port\fR=\fIPORT\fR .HP \fB\-\-xim\-preedit\fR=\fISTYLE\fR .HP \fB\-\-xim\-status\fR=\fISTYLE\fR .TP \fB\-\-gtk\-debug\fR=\fIFLAGS\fR Gtk+ debugging flags to set .TP \fB\-\-gtk\-no\-debug\fR=\fIFLAGS\fR Gtk+ debugging flags to unset .TP \fB\-\-g\-fatal\-warnings\fR Make all warnings fatal .TP \fB\-\-gtk\-module\fR=\fIMODULE\fR Load an additional Gtk module .PP GNOME GUI options .HP \fB\-\-disable\-crash\-dialog\fR .PP Session management options .TP \fB\-\-sm\-client\-id\fR=\fIID\fR Specify session management ID .TP \fB\-\-sm\-config\-prefix\fR=\fIPREFIX\fR Specify prefix of saved configuration .TP \fB\-\-sm\-disable\fR Disable connection to session manager debian/control0000644000000000000000000000141412235362232010571 0ustar Source: coriander Section: gnome Priority: extra Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Guus Sliepen Uploaders: Peter De Schrijver (p2) Build-Depends: debhelper (>> 9), gettext, libdc1394-22-dev (>= 2.1.0), libgnomeui-dev, ftplib-dev, libsdl1.2-dev, libxv-dev, libtiff-dev, autotools-dev Standards-Version: 3.9.4 Homepage: http://sourceforge.net/projects/coriander/ Package: coriander Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: control IEEE1394 digital camera Coriander is a GUI that lets you view camera images and control all the features of an IEEE-1394 Digital Camera complying with the DC Specifications v1.04 or later (see http://www.1394ta.org). debian/docs0000644000000000000000000000003612235362166010046 0ustar README NEWS AUTHORS ChangeLog debian/dirs0000644000000000000000000000003212235362166010053 0ustar usr/bin usr/share/pixmaps debian/patches/0000755000000000000000000000000012235362276010625 5ustar debian/patches/do-not-make-in-po-directory0000644000000000000000000000103612235362166015703 0ustar --- a/Makefile.am +++ b/Makefile.am @@ -1,6 +1,6 @@ ## Process this file with automake to produce Makefile.in -SUBDIRS = po src +SUBDIRS = src EXTRA_DIST = \ coriander.glade \ --- a/Makefile.in +++ b/Makefile.in @@ -256,7 +256,7 @@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = po src +SUBDIRS = src EXTRA_DIST = \ coriander.glade \ coriander.gladep --- a/configure.in +++ b/configure.in @@ -316,6 +316,5 @@ AC_OUTPUT([ Makefile src/Makefile -po/Makefile.in ]) debian/patches/framerates-array-bounds-check.diff0000644000000000000000000000043412235362166017266 0ustar --- a/src/tools.c +++ b/src/tools.c @@ -200,7 +200,7 @@ { int i; - if (currentframerates[0]) { + if (currentframerates[0] || framerates->num == 0) { dc1394_video_set_framerate(camera->camera_info, framerates->framerates[0]); return 0; } debian/patches/series0000644000000000000000000000020612235362213012027 0ustar framerates-array-bounds-check.diff portable-format-strings.diff check-libdc1394-function-return-values no-main-in-ac_try_compile.diff debian/patches/check-libdc1394-function-return-values0000644000000000000000000000657112235362166017665 0ustar --- a/src/camera.c +++ b/src/camera.c @@ -32,6 +32,8 @@ gettimeofday(&t1,NULL); */ err=dc1394_camera_enumerate(dc1394,&camera_list); + if(err != DC1394_SUCCESS) + return err; /* gettimeofday(&t2,NULL); @@ -42,10 +44,15 @@ */ // create a list of cameras with coriander's camera type camera_t for (i=0;inum;i++) { + dc1394camera_t *camera=dc1394_camera_new(dc1394,camera_list->ids[i].guid); + + if(!camera) + continue; + camera_ptr=NewCamera(); // copy the info in the dc structure into the coriander struct. - camera_ptr->camera_info=dc1394_camera_new(dc1394,camera_list->ids[i].guid); + camera_ptr->camera_info=camera; /* gettimeofday(&t2,NULL); fprintf(stderr,"%s %s : %ld ms\n", @@ -63,7 +70,7 @@ // free camera list: dc1394_camera_free_list(camera_list); - return err; + return 0; } camera_t* --- a/src/tools.c +++ b/src/tools.c @@ -573,7 +573,7 @@ bus_reset_handler(raw1394handle_t handle, unsigned int generation) { - int i; + int i, err; camera_t *camera_ptr; camera_t* new_camera; dc1394camera_list_t *new_camera_list; @@ -590,11 +590,12 @@ // Now we have to deal with this bus reset... // get camera guids: - dc1394_camera_enumerate(dc1394,&new_camera_list); + err = dc1394_camera_enumerate(dc1394,&new_camera_list); // ADD NEW CAMERAS AND UPDATE PREVIOUS ONES --------------------------------- // try to match the GUID with previous cameras + if(err == DC1394_SUCCESS) for (i=0;inum;i++) { // was the current GUID already there? camera_ptr=cameras; @@ -606,8 +607,12 @@ } if (camera_ptr==NULL) { // the camera is new, add it + dc1394camera_t *new_handle = dc1394_camera_new(dc1394, new_camera_list->ids[i].guid); + if(!new_handle) + continue; + new_camera=NewCamera(); - new_camera->camera_info=dc1394_camera_new(dc1394,new_camera_list->ids[i].guid); + new_camera->camera_info=new_handle; GetCameraData(new_camera); AppendCamera(new_camera); @@ -622,11 +627,15 @@ // look if there is a camera that disappeared from the camera_t struct camera_ptr=cameras; while (camera_ptr!=NULL) { + int found = 0; + if(err == DC1394_SUCCESS) for (i=0;inum;i++) { - if (camera_ptr->camera_info->guid==new_camera_list->ids[i].guid) + if (camera_ptr->camera_info->guid==new_camera_list->ids[i].guid) { + found = 1; break; + } } - if (camera_ptr->camera_info->guid!=new_camera_list->ids[i].guid) { // the camera "camera_ptr" was unplugged + if (!found) { // the camera "camera_ptr" was unplugged if (camera->camera_info->guid!=camera_ptr->camera_info->guid) { // it was the current camera if ((camera->next==NULL)&&(cameras==camera)) { // it was also the only camera. Close GUI and revert to camera wait prompt waiting_camera_window=create_waiting_camera_window(); @@ -687,7 +696,7 @@ */ - if (new_camera_list->num>0) { + if (err == DC1394_SUCCESS && new_camera_list->num>0) { //eprint("build/refresh GUI\n"); if (waiting_camera_window!=NULL) { gtk_widget_destroy(GTK_WIDGET(waiting_camera_window)); @@ -717,7 +726,8 @@ // set ISO channels // SetIsoChannels(); - dc1394_camera_free_list(new_camera_list); + if(err == DC1394_SUCCESS) + dc1394_camera_free_list(new_camera_list); return(1); } debian/patches/no-main-in-ac_try_compile.diff0000644000000000000000000000103412235362213016375 0ustar --- a/configure +++ b/configure @@ -11851,7 +11851,7 @@ main () { - int main(void) { (void) XvGetPortAttribute(0, 0, 0, 0); return 0; } + (void) XvGetPortAttribute(0, 0, 0, 0); ; return 0; @@ -12018,15 +12018,12 @@ main () { - int main(void) { dc1394video_frame_t *frame; dc1394camera_t *camera; int depth, node, gen; dc1394_capture_setup(camera, 4, DC1394_CAPTURE_FLAGS_DEFAULT); dc1394_video_get_data_depth(camera, &depth); dc1394_camera_get_node(camera,&node,&gen); - return 0; - } ; return 0; debian/patches/portable-format-strings.diff0000644000000000000000000000364012235362166016245 0ustar --- a/src/callbacks.c +++ b/src/callbacks.c @@ -654,9 +654,9 @@ char string2[16]; string=(char*)gtk_entry_get_text(GTK_ENTRY(lookup_widget(main_window, "register_address_entry"))); - sscanf(string,"%llx",&offset); + sscanf(string,"%"PRIx64,&offset); string=(char*)gtk_entry_get_text(GTK_ENTRY(lookup_widget(main_window, "register_data_entry"))); - sscanf(string,"%x",&value); + sscanf(string,"%"PRIx32,&value); switch(camera->register_offset) { case REGISTER_OFFSET_BASE: @@ -717,7 +717,7 @@ dc1394error_t err=DC1394_SUCCESS; string=(char*)gtk_entry_get_text(GTK_ENTRY(lookup_widget(main_window, "register_address_entry"))); - sscanf(string,"%llx",&offset); + sscanf(string,"%"PRIx64,&offset); //fprintf(stderr,"0x%llx\n",offset); @@ -761,7 +761,7 @@ if (err!=DC1394_SUCCESS) sprintf(string2,"Error"); else - sprintf(string2,"%08x",value); + sprintf(string2,"%08"PRIx32,value); gtk_entry_set_text(GTK_ENTRY(lookup_widget(main_window, "register_data_entry")),string2); } @@ -899,7 +899,7 @@ const char *camera_name_str = "coriander/camera_names/"; tmp=(char*)malloc(STRING_SIZE*sizeof(char)); tmp_ptr=(char*)gtk_entry_get_text(GTK_ENTRY(lookup_widget(main_window, "camera_name_text"))); - sprintf(tmp,"%s%llx",camera_name_str, camera->camera_info->guid); + sprintf(tmp,"%s%"PRIx64,camera_name_str, camera->camera_info->guid); gnome_config_set_string(tmp,tmp_ptr); gnome_config_sync(); strcpy(camera->prefs.name,tmp_ptr); --- a/src/preferences.c +++ b/src/preferences.c @@ -107,7 +107,7 @@ //FIXME: update for multi-unit cameras tmp=(char*)malloc(STRING_SIZE*sizeof(char)); - sprintf(tmp,"coriander/camera_names/%llx=%s %s",cam->camera_info->guid, + sprintf(tmp,"coriander/camera_names/%"PRIx64"=%s %s",cam->camera_info->guid, cam->camera_info->vendor, cam->camera_info->model); tmp_ptr=gnome_config_get_string(tmp); strcpy(cam->prefs.name,tmp_ptr);