rpms/libgphoto2/F-10 gphoto2-canontimeout.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 libgphoto2.spec, 1.14, 1.15 sources, 1.6, 1.7

[Jindrich Novy]

Author: jnovy

Update of /cvs/pkgs/rpms/libgphoto2/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv28432

Modified Files:
	.cvsignore libgphoto2.spec sources 
Added Files:
	gphoto2-canontimeout.patch 
Log Message:
* Wed Apr 01 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-1
- update to 2.4.4
- many fixes and improvements to Nikon and Canon cameras
- translation updates
- increase timeouts for Canon cameras (#476355), thanks to
  Andrzej Nowak and Russell Harrison


gphoto2-canontimeout.patch:

--- NEW FILE gphoto2-canontimeout.patch ---
diff -upr libgphoto2-2.4.3/camlibs/canon/usb.c libgphoto2-2.4.3.rlh/camlibs/canon/usb.c
--- libgphoto2-2.4.3/camlibs/canon/usb.c	2008-08-08 16:12:57.000000000 -0400
+++ libgphoto2-2.4.3.rlh/camlibs/canon/usb.c	2009-03-31 12:44:05.000000000 -0400
@@ -72,7 +72,7 @@
 
 /* CANON_FAST_TIMEOUT: how long (in milliseconds) we should wait for
  * an URB to come back on an interrupt endpoint */
-#define CANON_FAST_TIMEOUT 175
+#define CANON_FAST_TIMEOUT 500
 
 /* WARNING: This destroys reentrancy of the code. Better to put this
  * in the camera descriptor somewhere. */
diff -upr libgphoto2-2.4.3/camlibs/ptp2/library.c libgphoto2-2.4.3.rlh/camlibs/ptp2/library.c
--- libgphoto2-2.4.3/camlibs/ptp2/library.c	2008-10-19 12:41:36.000000000 -0400
+++ libgphoto2-2.4.3.rlh/camlibs/ptp2/library.c	2009-03-31 12:44:49.000000000 -0400
@@ -59,7 +59,7 @@
 #define GP_MODULE "PTP2"
 
 #define USB_START_TIMEOUT 8000
-#define USB_CANON_START_TIMEOUT 500	/* 0.5 seconds */
+#define USB_CANON_START_TIMEOUT 1500	/* 1.5 seconds */
 #define USB_NORMAL_TIMEOUT 20000
 #define USB_TIMEOUT_CAPTURE 20000
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	20 Oct 2008 10:25:51 -0000	1.6
+++ .cvsignore	1 Apr 2009 13:09:07 -0000	1.7
@@ -1 +1 @@
-libgphoto2-2.4.3.tar.bz2
+libgphoto2-2.4.4.tar.bz2


Index: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/F-10/libgphoto2.spec,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- libgphoto2.spec	20 Oct 2008 10:25:51 -0000	1.14
+++ libgphoto2.spec	1 Apr 2009 13:09:07 -0000	1.15
@@ -1,6 +1,6 @@
 Summary: Library for accessing digital cameras
 Name: libgphoto2
-Version: 2.4.3
+Version: 2.4.4
 Release: 1%{?dist}
 # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
 License: GPLv2+ and GPLv2
@@ -11,6 +11,7 @@
 Patch2: gphoto2-storage.patch
 Patch3: gphoto2-ixany.patch
 Patch4: gphoto2-maxentries.patch
+Patch5: gphoto2-canontimeout.patch
 Url: http://www.gphoto.org/
 Requires: lockdev
 BuildRequires: libusb-devel >= 0.1.5
@@ -54,6 +55,7 @@
 %patch2 -p1 -b .storage
 %patch3 -p1 -b .ixany
 %patch4 -p1 -b .maxentries
+%patch5 -p1 -b .canontimeout
 
 for i in AUTHORS COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
 	mv ${i} ${i}.old
@@ -151,6 +153,13 @@
 %{_mandir}/man3/*
 
 %changelog
+* Wed Apr 01 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-1
+- update to 2.4.4
+- many fixes and improvements to Nikon and Canon cameras
+- translation updates
+- increase timeouts for Canon cameras (#476355), thanks to
+  Andrzej Nowak and Russell Harrison
+
 * Mon Oct 20 2008 Jindrich Novy <jnovy at redhat.com> 2.4.3-1
 - update to libgphoto2-2.4.3
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	20 Oct 2008 10:25:51 -0000	1.6
+++ sources	1 Apr 2009 13:09:07 -0000	1.7
@@ -1 +1 @@
-6c23b8b3021aee4187b2c11d4bb7265b  libgphoto2-2.4.3.tar.bz2
+8aff5ac4ca72cba17de633078cf1612e  libgphoto2-2.4.4.tar.bz2