New upstream release bugfix 2.5.2
- Drop bugfix patches (merged upstream)
This commit is contained in:
parent
9f458992d1
commit
b8ff06210b
1
.gitignore
vendored
1
.gitignore
vendored
@ -1 +1,2 @@
|
|||||||
/libgphoto2-2.5.1.1.tar.bz2
|
/libgphoto2-2.5.1.1.tar.bz2
|
||||||
|
/libgphoto2-2.5.2.tar.bz2
|
||||||
|
@ -1,17 +0,0 @@
|
|||||||
http://sourceforge.net/p/gphoto/bugs/945/
|
|
||||||
|
|
||||||
diff -up libgphoto2-2.5.1.1/camlibs/ptp2/ptp.c~ libgphoto2-2.5.1.1/camlibs/ptp2/ptp.c
|
|
||||||
--- libgphoto2-2.5.1.1/camlibs/ptp2/ptp.c~ 2013-01-27 19:17:03.000000000 +0100
|
|
||||||
+++ libgphoto2-2.5.1.1/camlibs/ptp2/ptp.c 2013-05-04 11:21:32.558255859 +0200
|
|
||||||
@@ -1877,6 +1877,11 @@ ptp_canon_eos_getobjectinfoex (
|
|
||||||
if (ret != PTP_RC_OK)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
+ if (!data) {
|
|
||||||
+ *nrofentries = 0;
|
|
||||||
+ return PTP_RC_OK;
|
|
||||||
+ }
|
|
||||||
+
|
|
||||||
*nrofentries = dtoh32a(data);
|
|
||||||
*entries = malloc(*nrofentries * sizeof(PTPCANONFolderEntry));
|
|
||||||
if (!*entries)
|
|
@ -1,19 +0,0 @@
|
|||||||
https://sourceforge.net/p/gphoto/code/14268/
|
|
||||||
|
|
||||||
disable the default clear halt condition code.
|
|
||||||
|
|
||||||
this does not work on some USB 3 controllers.
|
|
||||||
|
|
||||||
--- a/camlibs/ptp2/library.c
|
|
||||||
+++ b/camlibs/ptp2/library.c
|
|
||||||
@@ -1730,7 +1730,9 @@
|
|
||||||
params = NULL;
|
|
||||||
camera->pl = NULL;
|
|
||||||
}
|
|
||||||
- if ((camera->port!=NULL) && (camera->port->type == GP_PORT_USB)) {
|
|
||||||
+ /* This code hangs USB 3 devices after the first bulk image transmission.
|
|
||||||
+ * For some unknown reason. */
|
|
||||||
+ if (0 && (camera->port!=NULL) && (camera->port->type == GP_PORT_USB)) {
|
|
||||||
/* clear halt */
|
|
||||||
gp_port_usb_clear_halt
|
|
||||||
(camera->port, GP_PORT_USB_ENDPOINT_IN);
|
|
@ -1,8 +1,8 @@
|
|||||||
%global udevdir %(pkg-config --variable=udevdir udev)
|
%global udevdir %(pkg-config --variable=udevdir udev)
|
||||||
|
|
||||||
Name: libgphoto2
|
Name: libgphoto2
|
||||||
Version: 2.5.1.1
|
Version: 2.5.2
|
||||||
Release: 4%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: Library for accessing digital cameras
|
Summary: Library for accessing digital cameras
|
||||||
Group: Development/Libraries
|
Group: Development/Libraries
|
||||||
# GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
|
# GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
|
||||||
@ -13,8 +13,6 @@ Patch1: gphoto2-pkgcfg.patch
|
|||||||
Patch2: gphoto2-storage.patch
|
Patch2: gphoto2-storage.patch
|
||||||
Patch3: gphoto2-ixany.patch
|
Patch3: gphoto2-ixany.patch
|
||||||
Patch4: gphoto2-device-return.patch
|
Patch4: gphoto2-device-return.patch
|
||||||
Patch5: libgphoto2-ptp-usb3.patch
|
|
||||||
Patch6: libgphoto2-ptp-crash-on-no-card.patch
|
|
||||||
BuildRequires: libusb1-devel, libusb-devel >= 0.1.5
|
BuildRequires: libusb1-devel, libusb-devel >= 0.1.5
|
||||||
BuildRequires: lockdev-devel
|
BuildRequires: lockdev-devel
|
||||||
BuildRequires: libexif-devel
|
BuildRequires: libexif-devel
|
||||||
@ -57,8 +55,6 @@ use libgphoto2.
|
|||||||
%patch2 -p1 -b .storage
|
%patch2 -p1 -b .storage
|
||||||
%patch3 -p1 -b .ixany
|
%patch3 -p1 -b .ixany
|
||||||
%patch4 -p1 -b .device-return
|
%patch4 -p1 -b .device-return
|
||||||
%patch5 -p1
|
|
||||||
%patch6 -p1
|
|
||||||
|
|
||||||
for i in AUTHORS ChangeLog COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
|
for i in AUTHORS ChangeLog COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYING.LIB `find -name 'README.*'`; do
|
||||||
mv ${i} ${i}.old
|
mv ${i} ${i}.old
|
||||||
@ -67,23 +63,6 @@ for i in AUTHORS ChangeLog COPYING libgphoto2_port/AUTHORS libgphoto2_port/COPYI
|
|||||||
rm -f ${i}.old
|
rm -f ${i}.old
|
||||||
done
|
done
|
||||||
|
|
||||||
# FIXME: These .pc.in files aren't actually being installed?
|
|
||||||
cat > gphoto2.pc.in << \EOF
|
|
||||||
prefix=@prefix@
|
|
||||||
exec_prefix=@exec_prefix@
|
|
||||||
libdir=@libdir@
|
|
||||||
includedir=@includedir@
|
|
||||||
VERSION=@VERSION@
|
|
||||||
|
|
||||||
Name: gphoto2
|
|
||||||
Description: Library for easy access to digital cameras
|
|
||||||
Requires:
|
|
||||||
Version: @VERSION@
|
|
||||||
Libs: -L${libdir} -lgphoto2 -lgphoto2_port -lm
|
|
||||||
Cflags: -I${includedir} -I${includedir}/gphoto2
|
|
||||||
EOF
|
|
||||||
sed 's/Name: gphoto2/Name: gphoto2-port/' < gphoto2.pc.in > gphoto2-port.pc.in
|
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||||
@ -161,6 +140,10 @@ cat libgphoto2*.lang >> %{name}.lang
|
|||||||
%{_mandir}/man3/*
|
%{_mandir}/man3/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon May 6 2013 Hans de Goede <hdegoede@redhat.com> - 2.5.2-1
|
||||||
|
- New upstream release bugfix 2.5.2
|
||||||
|
- Drop bugfix patches (merged upstream)
|
||||||
|
|
||||||
* Sat May 4 2013 Hans de Goede <hdegoede@redhat.com> - 2.5.1.1-4
|
* Sat May 4 2013 Hans de Goede <hdegoede@redhat.com> - 2.5.1.1-4
|
||||||
- Fix crash when dealing with PTP devices without a memory card (rhbz#915688)
|
- Fix crash when dealing with PTP devices without a memory card (rhbz#915688)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user