Hello community, here is the log from the commit of package libgphoto2.2460 for openSUSE:13.1:Update checked in at 2014-01-10 13:29:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:13.1:Update/libgphoto2.2460 (Old) and /work/SRC/openSUSE:13.1:Update/.libgphoto2.2460.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgphoto2.2460" Changes: -------- New Changes file: --- /dev/null 2013-11-25 01:44:08.036031256 +0100 +++ /work/SRC/openSUSE:13.1:Update/.libgphoto2.2460.new/libgphoto2.changes 2014-01-10 13:29:12.000000000 +0100 @@ -0,0 +1,1169 @@ +------------------------------------------------------------------- +Wed Jan 8 10:53:18 UTC 2014 - [email protected] + +- libgphoto2-fix-ptp-matcher.patch: The generic PTP matcher was fixed + to use USB Interface matching instead of the incorrect USB Device + matching. (bnc#852551) Also do not generate the hwdb twice. + +------------------------------------------------------------------- +Fri Dec 27 10:12:42 UTC 2013 - [email protected] + +- fix-canon-s100.patch: Canon PowerShot S100 had a duplicated name + between the canon and the ptp2 driver, causing problems. bnc#856828 + +------------------------------------------------------------------- +Mon Sep 30 12:22:48 UTC 2013 - [email protected] + +- Replace udev rules with udev hwdb for openSUSE 13.1 or later + (more efficient). +- Fix udev hwdb installation and ensure udev hwdb is updated when + package is installed / updated / uninstalled. + +------------------------------------------------------------------- +Mon Aug 19 14:57:20 UTC 2013 - [email protected] + +- updated to 2.5.2.1 temporary snapshot + - new udev hwdb + - new Nikon capture functions for newer Nikons + - Olympus 3030 fixed + - several new USB ids + - translation updates + - lots of other bugfixes +- disabled gpg key checking for snapshot + +------------------------------------------------------------------- +Mon May 6 08:24:24 UTC 2013 - [email protected] + +- buildrequire libxml2-devel for olympus e-series. + +------------------------------------------------------------------- +Sun May 5 20:54:22 UTC 2013 - [email protected] + +- Updated to 2.5.2 + ptp2: + * Fixed Raspberry Pi and USB 3.0 "connect only once" problem. + * Experimental Olympus E-series (not Pen) remote control support. Try in "Control" mode. + * Nikon DSLR: real movie capture! (use --set-config movie=1/0 and --wait-event) + * New ids: + Sony: DSC-A900, SLT-A350, DSC-RX1, HX300, NEX-3N + Nikon Coolpix: P80, L820, S9500, S620, P520, S2500, S2600 + Nikon Coolpix A + Nikon DSLR: D2Xs, D4, D7100 + Nikon J2 + Canon Powershot: S100, A1300IS, A2300IS, + Canon EOS: 700D, 100D + Fuji FinePix: H20EXR, X20 + Samsung: NX1000, EK-GC100 + Also various MTP device ids merged from libmtp. + * ptpip: major/minor number was switched in init packet. + * Nikon DSLR: out of focus during capture fixed, various bugfixes + * Nikon "controlmode" config for unlocking the camera. + * Canon DSLR: "keepdeviceon" pinging in get_config, liveview + * Canon thumbnail retrieval fixed. + * Lots of work on getting Olympus E-series DSLRs in Control mode + to run. + + canon: + * wait-for-event: handle when camera goes offline during waiting. + * fixed mtime 0 (Jan 1 1970) issue when downloading files and using --filename + + sierra: + * Fixed the Nikon Coolpix 4300 and 2500 USB over SCSI capture mode. + * Ignore register 4 read errors after capture as Nikon does not supply them. + * added commented code on how to switch the Coolpix 2500 to RAW DIAG mode. + + libgphoto2_port: + * gp_port_reset functionality to do a port reset. + + libgphoto2_port/usbscsi: + * Use timeout supplied by driver, not hardcoded 1.5 seconds (fixes Nikon sierra capture). + + translations: + * updated ukrainian, finish, dutch, polish, russian, french, vietnamese, german + + build: + * specify lots of _BSD_SOURCE et.al. to make the strict MacOS ports + build happier. Might break non Linux platforms, please report this. + * libxml2 needed for Olympus E series capture support. + * cleaned up AM_CPPFLAGS/CPPFLAGS usage, do not use both of them together. + +------------------------------------------------------------------- +Mon Apr 15 09:27:50 UTC 2013 - [email protected] + +- Added url as source. + Please see http://en.opensuse.org/SourceUrls + +------------------------------------------------------------------- +Tue Jan 29 09:40:26 UTC 2013 - [email protected] + +- updated to 2.5.1.1 bugfix version + - ptp2: fixed 32bit platforms + - ax301: fixed buffer overread + +------------------------------------------------------------------- +Sun Jan 27 21:26:56 UTC 2013 - [email protected] + +- updated to 2.5.1 final version + - more fixes in the wait-event, capture preview and + regular capture code for Canon and Nikon. + - some new camera ids added + +------------------------------------------------------------------- +Wed Jan 9 14:07:32 UTC 2013 - [email protected] + +- updated to 2.5.0.2 temp snapshot + - various new ids + - various bugfixes + - Canon driver fixes + - PTP driver fixes: Canon EOS thumbnail fixes + - translation updates + +------------------------------------------------------------------- +Wed Oct 17 12:44:36 UTC 2012 - [email protected] + +- fix build with new udev rules location + +------------------------------------------------------------------- +Wed Oct 3 16:23:37 UTC 2012 - [email protected] + +- fix previous change + +------------------------------------------------------------------- +Sat Sep 22 16:54:39 UTC 2012 - [email protected] + +- split to libgphoto2-6 to allow parallel installation + with old libgphoto2 (2.4) and to follow shared lib convention. + +------------------------------------------------------------------- +Fri Sep 21 18:18:24 UTC 2012 - [email protected] + +- Parallel build with %_smp_mflags +- .la files for plugins are useless - remove them + +------------------------------------------------------------------- +Thu Sep 13 08:45:14 UTC 2012 - [email protected] + +- Updated to major release 2.5.0 + - more dynamic lists (no more fixed limits) + - libgphoto2 api adjustments to make it more sane, + binary incompatible + - new .so version 6 + +------------------------------------------------------------------- +Wed Aug 1 12:31:43 UTC 2012 - [email protected] + +- fixed one missed gp_devs = NULL which led to more crashes + bnc#771743 + +------------------------------------------------------------------- +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. ++++ 972 more lines (skipped) ++++ between /dev/null ++++ and /work/SRC/openSUSE:13.1:Update/.libgphoto2.2460.new/libgphoto2.changes New: ---- baselibs.conf fix-canon-s100.patch libgphoto2-2.5.2.1.tar.bz2 libgphoto2-fix-ptp-matcher.patch libgphoto2.changes libgphoto2.keyring libgphoto2.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgphoto2.spec ++++++ # # spec file for package libgphoto2 # # Copyright (c) 2014 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/ # %if %( echo `rpm -q --queryformat %%{version} udev` ) > 190 %define _udevrulesdir /usr/lib/udev/rules.d %else %define _udevrulesdir /lib/udev/rules.d %endif %define major 6 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: libusb-devel BuildRequires: libxml2-devel BuildRequires: lockdev-devel BuildRequires: pkg-config BuildRequires: udev %if 0%{?suse_version} > 1230 BuildRequires: systemd-rpm-macros %endif 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.5.2.1 Release: 0 Source0: %{name}-%{version}.tar.bz2 #Source1: http://downloads.sourceforge.net/project/gphoto/libgphoto/%{version}/%{name}-%{version}.tar.bz2.asc Source2: %name.keyring Source3: baselibs.conf Patch0: fix-canon-s100.patch Patch1: libgphoto2-fix-ptp-matcher.patch %if 0%{?suse_version} > 1220 BuildRequires: gpg-offline %endif BuildRoot: %{_tmppath}/%{name}-%{version}-build Recommends: %{name}-%{major}-lang = %{version} %package -n libgphoto2-%{major} Summary: A Digital Camera Library Group: Hardware/Camera Recommends: %{name}-%{major}-lang = %{version} %package devel Summary: Development headers for libgphoto2 Group: Hardware/Camera Requires: libexif-devel Requires: libgphoto2-%{major} = %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 1700 cameras, listed on: http://gphoto.org/proj/libgphoto2/support.php or by running gphoto2 --list-cameras %description -n libgphoto2-%{major} 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 as those can be mounted by Linux directly. As of this time, gPhoto supports around 1700 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 -n libgphoto2-%{major} %prep #if 0%{?suse_version} > 1220 #gpg_verify %{S:1} #endif %setup -q %patch0 -p1 %patch1 -p1 %build #AUTOPOINT=true autoreconf -fi PATH="/usr/X11R6/bin:$PATH" \ %configure \ --with-doc-dir=%{_defaultdocdir}/%{name} \ --without-hal \ --with-drivers=all make %{?_smp_mflags} %check make check %install # skip-check-libtool-deps export LIBRARY_PATH=$RPM_BUILD_ROOT%{_libdir} %makeinstall %{find_lang} libgphoto2-%{major} %{find_lang} libgphoto2_port-10 cat libgphoto2-%{major}.lang libgphoto2_port-10.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 %{_udevrulesdir} ] ; then echo "*** The udev rules file location has changed. Fix the build." exit 1 fi %if 0%{?suse_version} > 1230 install -m 0755 -d $RPM_BUILD_ROOT/%{_udevhwdbdir} ./print-camera-list hwdb > $RPM_BUILD_ROOT/%{_udevhwdbdir}/20-gphoto.hwdb %else install -m 0755 -d $RPM_BUILD_ROOT%{_udevrulesdir} ./print-camera-list udev-rules version 175 > $RPM_BUILD_ROOT%{_udevrulesdir}/40-libgphoto2.rules %endif 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 find "%buildroot/%_libdir" -type f -name "*.la" -delete %fdupes $RPM_BUILD_ROOT %files -n libgphoto2-%{major} %defattr(-,root,root) %{_libdir}/libgphoto2 %{_libdir}/libgphoto2_port %dir %{_defaultdocdir}/%{name} %{_defaultdocdir}/%{name}/* %{prefix}/share/%{name} %{_libdir}/libgphoto2.so.* %{_libdir}/libgphoto2_port.so.* %{_mandir}/man3/libgphoto2.3* %{_mandir}/man3/libgphoto2_port.3* %if 0%{?suse_version} > 1230 %{_udevhwdbdir}/20-gphoto.hwdb %else %{_udevrulesdir}/40-libgphoto2.rules %endif %files -n libgphoto2-%{major}-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 -n %name-%major /sbin/ldconfig %if 0%{?suse_version} > 1230 %udev_hwdb_update %else udevadm control --reload 2>&1 > /dev/null || : %endif %postun -n %name-%major /sbin/ldconfig if [ $1 -eq 0 ]; then %if 0%{?suse_version} > 1230 %udev_hwdb_update %udev_rules_update %else udevadm control --reload 2>&1 > /dev/null || : %endif fi %{nil} %changelog ++++++ baselibs.conf ++++++ libgphoto2-6 ++++++ fix-canon-s100.patch ++++++ Index: libgphoto2-2.5.2.1/camlibs/ptp2/library.c =================================================================== --- libgphoto2-2.5.2.1.orig/camlibs/ptp2/library.c +++ libgphoto2-2.5.2.1/camlibs/ptp2/library.c @@ -1403,7 +1403,7 @@ static struct { /* "T. Ludewig" <[email protected]> */ {"Canon:PowerShot G1 X", 0x04a9, 0x3233, PTPBUG_DELETE_SENDS_EVENT}, /* IRC reporter */ - {"Canon:PowerShot S100", 0x04a9, 0x3236, PTPBUG_DELETE_SENDS_EVENT}, + {"Canon:PowerShot S100 (PTP Mode)", 0x04a9, 0x3236, PTPBUG_DELETE_SENDS_EVENT}, /* "T. Ludewig" <[email protected]> */ {"Canon:PowerShot SX40HS", 0x04a9, 0x3238, PTPBUG_DELETE_SENDS_EVENT}, /* Axel Waggershauser <[email protected]> */ ++++++ libgphoto2-fix-ptp-matcher.patch ++++++ Index: print-camera-list.c =================================================================== --- a/packaging/generic/print-camera-list.c (Revision 14679) +++ b/packaging/generic/print-camera-list.c (Arbeitskopie) @@ -779,7 +779,10 @@ if (flags & GP_USB_HOTPLUG_MATCH_INT_CLASS) { if ((flags & (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) == (GP_USB_HOTPLUG_MATCH_INT_CLASS|GP_USB_HOTPLUG_MATCH_INT_SUBCLASS|GP_USB_HOTPLUG_MATCH_INT_PROTOCOL)) { - printf("usb:v*p*d*dc%02ddsc%02dp%02d*\"\n GPHOTO2_DRIVER=PTP\n", class, subclass, proto); + /* device class matcher ... */ + /*printf("usb:v*p*d*dc%02ddsc%02dp%02d*\"\n GPHOTO2_DRIVER=PTP\n", class, subclass, proto);*/ + /* but we need an interface class matcher, ptp is a interface */ + printf("usb:v*p*d*ic%02disc%02ip%02d*\n GPHOTO2_DRIVER=PTP\n", class, subclass, proto); has_valid_rule = 1; } else { if (class == 666) { @@ -790,7 +793,10 @@ } } else { if (flags & GP_USB_HOTPLUG_MATCH_VENDOR_ID) { - printf ("usb:v%04Xp%04X*\n GPHOTO2_DRIVER=proprietary\n", usb_vendor, usb_product); + if (strstr(a->library, "ptp")) + printf ("usb:v%04Xp%04X*\n GPHOTO2_DRIVER=PTP\n", usb_vendor, usb_product); + else + printf ("usb:v%04Xp%04X*\n GPHOTO2_DRIVER=proprietary\n", usb_vendor, usb_product); has_valid_rule = 1; } else { fprintf (stderr, "Error: Trying to output device %d/%d with incorrect match flags.\n", @@ -1570,7 +1576,7 @@ hwdb_begin_func, hwdb_camera_func, NULL, - hwdb_camera_func, + NULL, empty_end_func }, {"html", -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
