rpms/libgphoto2/devel gphoto2-canontimeout.patch, NONE, 1.1 libgphoto2.spec, 1.18, 1.19
Jindrich Novy
jnovy at fedoraproject.org
Wed Apr 1 06:35:25 UTC 2009
- Previous message (by thread): rpms/sugar-browse/devel .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 sugar-browse.spec, 1.14, 1.15
- Next message (by thread): rpms/jd/F-9 .cvsignore, 1.356, 1.357 jd.spec, 1.405, 1.406 sources, 1.357, 1.358
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jnovy
Update of /cvs/pkgs/rpms/libgphoto2/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24152
Modified Files:
libgphoto2.spec
Added Files:
gphoto2-canontimeout.patch
Log Message:
* Wed Apr 01 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-4
- 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: libgphoto2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libgphoto2/devel/libgphoto2.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- libgphoto2.spec 5 Mar 2009 10:43:12 -0000 1.18
+++ libgphoto2.spec 1 Apr 2009 06:34:55 -0000 1.19
@@ -1,7 +1,7 @@
Summary: Library for accessing digital cameras
Name: libgphoto2
Version: 2.4.4
-Release: 3%{?dist}
+Release: 4%{?dist}
# GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
License: GPLv2+ and GPLv2
Group: Development/Libraries
@@ -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,10 @@
%{_mandir}/man3/*
%changelog
+* Wed Apr 01 2009 Jindrich Novy <jnovy at redhat.com> 2.4.4-4
+- increase timeouts for Canon cameras (#476355), thanks to
+ Andrzej Nowak and Russell Harrison
+
* Thu Mar 05 2009 Caolán McNamara <caolanm at redhat.com> - 2.4.4-3
- tweak BR to get to build
- Previous message (by thread): rpms/sugar-browse/devel .cvsignore, 1.5, 1.6 sources, 1.6, 1.7 sugar-browse.spec, 1.14, 1.15
- Next message (by thread): rpms/jd/F-9 .cvsignore, 1.356, 1.357 jd.spec, 1.405, 1.406 sources, 1.357, 1.358
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list