Hello community, here is the log from the commit of package libgphoto2.682 for openSUSE:12.2:Update checked in at 2012-07-26 13:03:12 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.2:Update/libgphoto2.682 (Old) and /work/SRC/openSUSE:12.2:Update/.libgphoto2.682.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgphoto2.682", Maintainer is "" Changes: -------- New Changes file: --- /dev/null 2012-07-06 19:40:38.919402255 +0200 +++ /work/SRC/openSUSE:12.2:Update/.libgphoto2.682.new/libgphoto2.changes 2012-07-26 13:03:13.000000000 +0200 @@ -0,0 +1,1012 @@ +------------------------------------------------------------------- +Thu Jul 19 18:40:18 UTC 2012 - [email protected] + +- added 2.4 branch fixes + - libusb1: do not crash immediately (avoid global context usage) + - canon: --wait-for-event append \0 to filename + - ptp2: new USB ids, fixed Canon EOS thumbnail retrieval + +------------------------------------------------------------------- +Thu Jul 12 07:58:37 UTC 2012 - [email protected] + +- generate v 175 udev rules (basically will use internal usb_id now) + +------------------------------------------------------------------- +Sun Apr 15 23:15:29 CEST 2012 - [email protected] + +- 2.4.14 release + - Canon EOS 5D Mark III support + - Samsung Galaxy support restored + - bugfixes + +------------------------------------------------------------------- +Tue Feb 21 18:03:48 CET 2012 - [email protected] + +- 2.4.12.1 temp snapshot + - various libusb 1.0 fixes (including last one merged) + - EOS fast directory listing + +------------------------------------------------------------------- +Sat Feb 18 22:59:56 UTC 2012 - [email protected] + +- Add libgphoto2-libusb.patch: Fix initialization of libusb 1.0. + The initialization of libusb was not always done with the default + context and if not done with the default context, the right one + needs to be passed to subsequent calls. + +------------------------------------------------------------------- +Wed Jan 25 10:37:10 UTC 2012 - [email protected] + +- Updated to 2.4.12 final release. + - libusb 1.0 support + - canon and nikon capture enhancements + - lots of bugs fixed + - lots of new devices + - updated translations + +------------------------------------------------------------------- +Sun Dec 11 14:13:06 CET 2011 - [email protected] + +- do not explicitly require libusb 0.1 in pkgconfig file +- some more bugfixes + +------------------------------------------------------------------- +Tue Nov 29 11:39:03 CET 2011 - [email protected] + +- Updated to 2.4.11.2 temp snapshot + - libusb 1.0 support + - changed canon powershot event handling + - fixed several bugs + - added new devices + +------------------------------------------------------------------- +Sat Nov 19 15:57:21 UTC 2011 - [email protected] + +- add libtool as buildrequire to avoid implicit dependency + +------------------------------------------------------------------- +Mon May 30 17:06:35 CEST 2011 - [email protected] + +- disable hal support completely for 12.1 bnc#697024 + +------------------------------------------------------------------- +Tue Apr 19 15:09:27 CEST 2011 - [email protected] + +- Updated to the 2.4.11 release + - lots of PTP fixes for Canon and Nikons. + - sierra mode now uses SCSI wrapping directly. + - fixes also in other drivers + - lots of new USB ids + - translations updates + +------------------------------------------------------------------- +Tue Aug 31 09:50:22 UTC 2010 - [email protected] + +- Recommend instead of require lang package since it's not mandatory. + +------------------------------------------------------------------- +Sun Aug 15 20:04:51 CEST 2010 - [email protected] + +- Updated to 2.4.10 release + - lots of PTP and EOS related fixes + - shortcuts in UDEV rules + - new jl2005c driver for small cameras + - translation updates + +------------------------------------------------------------------- +Mon Jun 21 16:43:41 CEST 2010 - [email protected] + +- bump maximum file limit to 4096, as 2.5 is not ready yet bnc#439065 +- Fixed some bugs in the ptp2 drivers. + +------------------------------------------------------------------- +Sat May 8 10:24:20 CEST 2010 - [email protected] + +- build against lockdev-devel + +------------------------------------------------------------------- +Tue Apr 27 08:54:31 CEST 2010 - [email protected] + +- remove the major .la files + +------------------------------------------------------------------- +Sun Apr 11 23:25:39 CEST 2010 - [email protected] + +- Updated to 2.4.9 final release + - more EOS and other PTP fixes + - more picture frame fixes + +------------------------------------------------------------------- +Thu Mar 25 09:48:06 CET 2010 - [email protected] + +- disable hal inclusion +- updated to temp snapshot 2.4.8.1 + - new usbdiskdirect driver for certain picture frames + - new libgd dependency for picture frame + - new picture frame driver + - lots of PTP fixes and enhancements + +------------------------------------------------------------------- +Mon Jan 25 11:21:22 CET 2010 - [email protected] + +- updated to version 2.4.8 + - Lots of improvements to EOS and Nikon capture support + - fuji s5 pro capture support + - several new ids + - stability fixes + - translation updates + +------------------------------------------------------------------- +Tue Dec 22 19:03:10 CET 2009 - [email protected] + +- package baselibs.conf + +------------------------------------------------------------------- +Sat Nov 21 19:42:05 CET 2009 - [email protected] + +- 2.4.7.3 tempsnapshot + +------------------------------------------------------------------- +Mon Oct 12 17:04:31 CEST 2009 - [email protected] + +- tag mediaplayers correctly in the new style UDEV model. + +------------------------------------------------------------------- +Sat Sep 26 11:34:46 CEST 2009 - [email protected] + +- 2.4.7.1 temp snapshot + - directory bugfix to allow fileretrieval with unix fds + - translation updates + - various ptp stabilizing bug fixes + +------------------------------------------------------------------- +Mon Aug 17 13:12:04 CEST 2009 - [email protected] + +- 2.4.7 final release + - just small cleanups compared to last + +------------------------------------------------------------------- +Tue Aug 11 18:25:34 CEST 2009 - [email protected] + +- 2.4.6.6 temp snapshot + - fixed udev v 136 rule generation +- 2.4.6.5 temp snapshot + - more ptp improvements +- generate UDEV 3rd generation rules (for gudev) + +------------------------------------------------------------------- +Mon Jul 27 11:41:52 CEST 2009 - [email protected] + +- 2.4.6.4 temp snapshot + - lots of Canon EOS improvements in capture support + - New ids for PTP2 + - lots of PTP2 bugfixes and improvements + - bugfixes + +------------------------------------------------------------------- +Tue May 26 10:51:54 CEST 2009 - [email protected] + +- updated to 2.4.6.1 temp snapshot + - various Canon EOS bug fixes/improvements + - new ids + +------------------------------------------------------------------- +Sun May 17 22:53:28 CEST 2009 - [email protected] + +- Updated to 2.4.6 final (just some small stuff) + ++++ 815 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:12.2:Update/.libgphoto2.682.new/libgphoto2.changes New: ---- baselibs.conf lg-24-branch.patch libgphoto2-2.4.14.tar.bz2 libgphoto2-4096files.patch libgphoto2.changes libgphoto2.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgphoto2.spec ++++++ # # spec file for package libgphoto2 # # Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: libgphoto2 BuildRequires: doxygen BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: gd-devel BuildRequires: libexif-devel BuildRequires: libjpeg-devel BuildRequires: libtool BuildRequires: libusb-1_0-devel BuildRequires: lockdev-devel BuildRequires: pkg-config BuildRequires: udev Url: http://gphoto.org/ # bug437293 %ifarch ppc64 Obsoletes: libgphoto2-64bit %endif # %define prefix /usr Summary: A Digital Camera Library License: LGPL-2.1+ Group: Hardware/Camera Version: 2.4.14 Release: 0 Source0: libgphoto2-%{version}.tar.bz2 Source1: baselibs.conf Patch0: lg-24-branch.patch Patch1: libgphoto2-4096files.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-lang = %{version} %package devel Summary: Development headers for libgphoto2 Group: Hardware/Camera Requires: libexif-devel Requires: libgphoto2 = %version Requires: libusb-1_0-devel %description gPhoto (GNU Photo) is a set of libraries for previewing, retrieving, and capturing images from a range of supported digital cameras to your local hard drive. It does not support digital cameras based on the USB storage protocol. Those can be mounted by Linux directly. As of this time, gPhoto supports around 1200 cameras, listed on: http://gphoto.org/proj/libgphoto2/support.php or by running gphoto2 --list-cameras %description devel gPhoto (GNU Photo) is a set of libraries for previewing, retrieving, and capturing images from a range of supported digital cameras to your local hard drive. These are its development libraries and headers. %lang_package %prep %setup -q %patch0 -p0 %patch1 -p1 %build #AUTOPOINT=true autoreconf -fi PATH="/usr/X11R6/bin:$PATH" \ %configure \ --with-doc-dir=%{_defaultdocdir}/%{name} \ --without-hal \ --with-drivers=all make %{?jobs:-j%jobs} %check make check %install # skip-check-libtool-deps export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} %makeinstall %{find_lang} libgphoto2-2 %{find_lang} libgphoto2_port-0 cat libgphoto2-2.lang libgphoto2_port-0.lang > libgphoto2-all.lang pushd packaging/generic export CAMLIBS=$RPM_BUILD_ROOT/%_libdir/libgphoto2/%version/ # new style UDEV rules (gudev) which will obsolete HAL fdi files if [ ! -d /lib/udev/rules.d/ ] ; then echo "*** The udev rules file location has changed. Fix the build." exit 1 fi install -m 0755 -d $RPM_BUILD_ROOT/lib/udev/rules.d/ ./print-camera-list udev-rules version 175 > $RPM_BUILD_ROOT/lib/udev/rules.d/40-libgphoto2.rules popd # udev helpers not used here. rm $RPM_BUILD_ROOT/usr/%_lib/udev/check-ptp-camera mv doc/doxygen-output/libgphoto2-api.html apidocs fn=$RPM_BUILD_ROOT/%{_libdir}/pkgconfig/libgphoto2_port.pc grep -v driverdir= $fn > $fn.new mv $fn.new $fn # These two should not be required, but the driver .la can stay rm $RPM_BUILD_ROOT/%{_libdir}/libgphoto2.la rm $RPM_BUILD_ROOT/%{_libdir}/libgphoto2_port.la %fdupes $RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root) %{_libdir}/libgphoto2 %{_libdir}/libgphoto2_port %dir %{_defaultdocdir}/%{name} %exclude %{_defaultdocdir}/%{name}/apidocs.html %{_defaultdocdir}/%{name}/* %{prefix}/share/%{name} %{_libdir}/libgphoto2.so.* %{_libdir}/libgphoto2_port.so.* %{_mandir}/man3/libgphoto2.3* %{_mandir}/man3/libgphoto2_port.3* /lib/udev/rules.d/40-libgphoto2.rules # /usr/share/hal/fdi/information/20thirdparty/10-camera-libgphoto2-device.fdi %files lang -f libgphoto2-all.lang %files devel %defattr(-,root,root) %doc apidocs %{prefix}/include/gphoto2 %{prefix}/bin/gphoto2-config %{prefix}/bin/gphoto2-port-config %{_libdir}/libgphoto2.so %{_libdir}/libgphoto2_port.so %{_libdir}/pkgconfig/libgphoto2.pc %{_libdir}/pkgconfig/libgphoto2_port.pc %post /sbin/ldconfig %postun /sbin/ldconfig %changelog ++++++ baselibs.conf ++++++ libgphoto2 ++++++ lg-24-branch.patch ++++++ diff -ru ./camlibs/canon/canon.c /home/marcus/projects/libgphoto2-2_4/libgphoto2/camlibs/canon/canon.c --- camlibs/canon/canon.c 2012-03-30 23:23:47.000000000 +0200 +++ camlibs/canon/canon.c 2012-07-19 20:19:15.693782425 +0200 @@ -1333,8 +1333,7 @@ if ( is_image ( new_name ) ) { /* Yup, we'll assume that this is the new image. */ GP_DEBUG ( " Found our new image file" ); - strncpy ( path->name, new_name, - strlen ( new_name ) ); + strcpy ( path->name, new_name ); strcpy ( path->folder, canon2gphotopath ( camera, path->folder ) ); /* FIXME: Marcus: make it less large effort... */ diff -ru ./camlibs/ptp2/library.c /home/marcus/projects/libgphoto2-2_4/libgphoto2/camlibs/ptp2/library.c --- camlibs/ptp2/library.c 2012-04-15 17:11:15.000000000 +0200 +++ camlibs/ptp2/library.c 2012-07-19 20:19:15.686782359 +0200 @@ -715,7 +715,7 @@ {"Nikon:Coolpix L110 (PTP mode)", 0x04b0, 0x017e, PTP_CAP}, /* [email protected] */ - {"Nikon:Coolpix P500 (PTP mode)", 0x04b0, 0x0184, 0}, + {"Nikon:Coolpix P500 (PTP mode)", 0x04b0, 0x0184, PTP_CAP}, /* Graeme Wyatt <[email protected]> */ {"Nikon:Coolpix L120 (PTP mode)", 0x04b0, 0x0185, PTP_CAP}, /* Kévin Ottens <[email protected]> */ @@ -740,6 +740,8 @@ {"Nikon:Coolpix S8000 (PTP mode)",0x04b0, 0x021f, 0}, /* Aleksej Serdjukov <[email protected]> */ {"Nikon:Coolpix S5100 (PTP mode)",0x04b0, 0x0220, 0}, + /* [email protected] */ + {"Nikon:Coolpix P300 (PTP mode)", 0x04b0, 0x0221, 0}, /* Nikon Coolpix 2000 */ {"Nikon:Coolpix 2000 (PTP mode)", 0x04b0, 0x0302, 0}, /* From IRC reporter. */ @@ -810,6 +812,11 @@ /* IRC Reporter popolon */ {"Nikon:DSC D5100 (PTP mode)", 0x04b0, 0x0429, PTP_CAP|PTP_CAP_PREVIEW}, + + /* http://sourceforge.net/tracker/?func=detail&aid=3536904&group_id=8874&atid=108874 */ + {"Nikon:V1", 0x04b0, 0x0601, PTP_CAP}, + + #if 0 /* Thomas Luzat <[email protected]> */ /* this was reported as not working, mass storage only: @@ -1058,6 +1065,8 @@ /* Martin Lasarsch at SUSE. MTP_PROPLIST returns just 0 entries */ {"Canon:Digital IXUS 90 IS", 0x04a9, 0x3174, PTPBUG_DELETE_SENDS_EVENT}, + /* Daniel Moyne <[email protected]> */ + {"Canon:Powershot SD790 IS", 0x04a9, 0x3174, PTPBUG_DELETE_SENDS_EVENT}, /* https://sourceforge.net/tracker/?func=detail&aid=2722422&group_id=8874&atid=358874 */ {"Canon:Digital IXUS 85 IS", 0x04a9, 0x3174, PTPBUG_DELETE_SENDS_EVENT}, @@ -1289,6 +1298,9 @@ {"Apple:iPod Touch 3rd Gen (PTP mode)", 0x05ac, 0x1299, 0}, {"Apple:iPad (PTP mode)", 0x05ac, 0x129a, 0}, + /* Don Cohen <[email protected]> */ + {"Apple:iPhone 4S (PTP mode)", 0x05ac, 0x12a0, 0}, + /* https://sourceforge.net/tracker/index.php?func=detail&aid=1869653&group_id=158745&atid=809061 */ {"Pioneer:DVR-LX60D", 0x08e4, 0x0142, 0}, @@ -4555,12 +4567,14 @@ unsigned char *ximage = NULL; unsigned int xlen = 0; - /* If thumb size is 0 then there is no thumbnail at all... */ - if((size=oi->ThumbCompressedSize)==0) return (GP_ERROR_NOT_SUPPORTED); + size=oi->ThumbCompressedSize; + /* If thumb size is 0 and the OFC is not a image type (0x3800 / 0xb800)... */ + if ((size==0) && ((oi->ObjectFormat & 0x7800) != 0x3800)) + return GP_ERROR_NOT_SUPPORTED; CPR (context, ptp_getthumb(params, params->handles.Handler[object_id], &ximage, &xlen)); - if (xlen != size) + if (size && (xlen != size)) gp_log (GP_LOG_ERROR, "get_file_func/GP_FILE_TYPE_PREVIEW", "size mismatch %d vs %d", size, xlen); set_mimetype (camera, file, params->deviceinfo.VendorExtensionID, oi->ThumbFormat); CR (gp_file_set_data_and_size (file, (char*)ximage, xlen)); diff -ru ./libgphoto2_port/libusb1/libusb1.c /home/marcus/projects/libgphoto2-2_4/libgphoto2/libgphoto2_port/libusb1/libusb1.c --- libgphoto2_port/libusb1/libusb1.c 2012-03-26 21:34:10.000000000 +0200 +++ libgphoto2_port/libusb1/libusb1.c 2012-07-19 20:05:50.066206830 +0200 @@ -119,6 +119,7 @@ GPPortInfo info; int nrofdevices = 0; int d, i, i1, i2, unknownint; + libusb_context *ctx; /* generic matcher. This will catch passed XXX,YYY entries for instance. */ info.type = GP_PORT_USB; @@ -126,8 +127,8 @@ strcpy (info.path, "^usb:"); CHECK (gp_port_info_list_append (list, info)); - libusb_init (NULL); - gp_nrofdevs = load_devicelist (NULL); + libusb_init (&ctx); + gp_nrofdevs = load_devicelist (ctx); for (d = 0; d < gp_nrofdevs; d++) { /* Devices which are definitely not cameras. */ @@ -239,7 +240,9 @@ strcpy (info.path, "usb:"); CHECK (gp_port_info_list_append (list, info)); } - libusb_exit (NULL); + libusb_exit (ctx); + gp_nrofdevs = 0; + gp_devs = NULL; return (GP_OK); } ++++++ libgphoto2-4096files.patch ++++++ Index: libgphoto2-2.4.9/libgphoto2/gphoto2-list.c =================================================================== --- libgphoto2-2.4.9.orig/libgphoto2/gphoto2-list.c +++ libgphoto2-2.4.9/libgphoto2/gphoto2-list.c @@ -72,7 +72,7 @@ #ifdef CAMERALIST_STRUCT_COMPATIBILITY -#define MAX_ENTRIES 1024 +#define MAX_ENTRIES 4096 #define MAX_LIST_STRING_LENGTH 128 struct _CameraList { int count; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
