rpms/libgphoto2
5
0
Fork 0
Code Issues Pull Requests Releases Activity

- update to 2.4.1 (#443515, #436138)

Browse Source
This commit is contained in:
Jindrich Novy 2008-06-02 09:20:38 +00:00
parent f5b85a1d41
commit 900c22647c
6 changed files with 31 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.cvsignore
View File

@ -1 +1,2 @@
libgphoto2-2.4.0.tar.bz2
libgphoto2-2.4.1.tar.bz2

29
gphoto2-data-phase.patch
View File

@ -1,29 +0,0 @@
diff -up gphoto2-2.4.0/libgphoto2-2.4.0/camlibs/ptp2/ptp.c.data-phase gphoto2-2.4.0/libgphoto2-2.4.0/camlibs/ptp2/ptp.c
--- libgphoto2-2.4.0/camlibs/ptp2/ptp.c.data-phase 2007-07-27 02:35:37.000000000 +0200
+++ libgphoto2-2.4.0/camlibs/ptp2/ptp.c 2008-04-17 06:19:34.000000000 +0200
@@ -2775,13 +2775,23 @@ ptp_mtp_getobjectreferences (PTPParams*
PTPContainer ptp;
uint16_t ret;
unsigned char* dpv=NULL;
+ unsigned int dpvlen = 0;
PTP_CNT_INIT(ptp);
ptp.Code=PTP_OC_MTP_GetObjectReferences;
ptp.Param1=handle;
ptp.Nparam=1;
- ret=ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &dpv, NULL);
- if (ret == PTP_RC_OK) *arraylen = ptp_unpack_uint32_t_array(params, dpv, 0, ohArray);
+ ret=ptp_transaction(params, &ptp, PTP_DP_GETDATA, 0, &dpv, &dpvlen);
+ if (ret == PTP_RC_OK) {
+ /* Sandisk Sansa skips the DATA phase, but returns OK as response.
+ * this will give us a NULL here. Handle it. -Marcus */
+ if ((dpv == NULL) || (dpvlen == 0)) {
+ *arraylen = 0;
+ *ohArray = NULL;
+ } else {
+ *arraylen = ptp_unpack_uint32_t_array(params, dpv, 0, ohArray);
+ }
+ }
free(dpv);
return ret;
}

16
gphoto2-pkgcfg.patch
View File

@ -1,5 +1,5 @@
--- libgphoto2-2.4.0/gphoto2-config.in.pkgcfg 2007-07-27 02:36:23.000000000 +0200
+++ libgphoto2-2.4.0/gphoto2-config.in 2007-07-31 12:21:14.000000000 +0200
--- libgphoto2-2.4.1/gphoto2-config.in.pkgcfg 2007-07-27 02:36:23.000000000 +0200
+++ libgphoto2-2.4.1/gphoto2-config.in 2007-07-31 12:21:14.000000000 +0200
@@ -1,11 +1,5 @@
#! /bin/sh
@ -26,17 +26,17 @@
--cflags)
- echo "-I@includedir@/gphoto2"
+ pkg-config --cflags gphoto2
+ pkg-config --cflags libgphoto2
;;
--libs)
- echo "-L@libdir@" -lgphoto2 -lgphoto2_port -lm
+ pkg-config --libs gphoto2
+ pkg-config --libs libgphoto2
;;
*)
--- libgphoto2-2.4.0/libgphoto2_port/gphoto2-port-config.in.pkgcfg 2007-07-27 02:36:16.000000000 +0200
+++ libgphoto2-2.4.0/libgphoto2_port/gphoto2-port-config.in 2007-07-31 12:21:14.000000000 +0200
--- libgphoto2-2.4.1/libgphoto2_port/gphoto2-port-config.in.pkgcfg 2007-07-27 02:36:16.000000000 +0200
+++ libgphoto2-2.4.1/libgphoto2_port/gphoto2-port-config.in 2007-07-31 12:21:14.000000000 +0200
@@ -1,11 +1,5 @@
#! /bin/sh
@ -63,12 +63,12 @@
--cflags)
- echo "-I@includedir@/gphoto2"
+ pkg-config --cflags gphoto2-port
+ pkg-config --cflags libgphoto2-port
;;
--libs)
- echo "-L@libdir@" -lgphoto2_port
+ pkg-config --libs gphoto2-port
+ pkg-config --libs libgphoto2-port
;;
*)

21
gphoto2-storage.patch
View File

@ -1,15 +1,16 @@
--- libgphoto2-2.4.0/packaging/generic/print-camera-list.c.orig 2007-09-18 11:36:19.000000000 -0400
+++ libgphoto2-2.4.0/packaging/generic/print-camera-list.c 2007-09-18 11:52:42.000000000 -0400
@@ -799,6 +799,8 @@
diff -up libgphoto2-2.4.1/packaging/generic/print-camera-list.c.storage libgphoto2-2.4.1/packaging/generic/print-camera-list.c
--- libgphoto2-2.4.1/packaging/generic/print-camera-list.c.storage 2008-03-24 12:47:00.000000000 +0100
+++ libgphoto2-2.4.1/packaging/generic/print-camera-list.c 2008-06-02 10:44:29.000000000 +0200
@@ -793,6 +793,8 @@ fdi_begin_func (const func_params_t *par
printf("<deviceinfo version=\"0.2\">\n");
printf(" <device>\n");
printf(" <match key=\"info.bus\" string=\"usb\">\n");
printf(" <match key=\"info.subsystem\" string=\"usb\">\n");
+ printf(" <!-- skip USB Mass Storage Devices -->\n");
+ printf(" <match key=\"usb.interface.class\" compare_ne=\"8\">\n");
return 0;
}
@@ -838,52 +840,52 @@
@@ -832,52 +834,52 @@ fdi_camera_func (const func_params_t *pa
return 0;
}
if (a->usb_vendor) { /* usb product id might be 0! */
@ -87,7 +88,7 @@
}
} /* camera has USB connection */
return 0;
@@ -892,6 +894,7 @@
@@ -886,6 +888,7 @@ fdi_camera_func (const func_params_t *pa
static int
fdi_end_func (const func_params_t *params, void *data)
{
@ -95,16 +96,16 @@
printf(" </match>\n");
printf(" </device>\n");
printf("</deviceinfo>\n");
@@ -918,6 +921,8 @@
@@ -912,6 +915,8 @@ fdi_device_begin_func (const func_params
printf("<deviceinfo version=\"0.2\">\n");
printf(" <device>\n");
printf(" <match key=\"info.bus\" string=\"usb\">\n");
printf(" <match key=\"info.subsystem\" string=\"usb\">\n");
+ printf(" <!-- skip USB Mass Storage Devices -->\n");
+ printf(" <match key=\"usb.interface.class\" compare_ne=\"8\">\n");
return 0;
}
@@ -961,28 +966,28 @@
@@ -955,28 +960,28 @@ fdi_device_camera_func (const func_param
/* do not set category. We don't really know what this device really is.
* But we do now that is capable of being a camera, so add to capabilities
*/
@ -143,7 +144,7 @@
}
#endif
}
@@ -992,6 +997,7 @@
@@ -986,6 +991,7 @@ fdi_device_camera_func (const func_param
static int
fdi_device_end_func (const func_params_t *params, void *data)
{

15
libgphoto2.spec
View File

@ -1,7 +1,7 @@
Summary: Library for accessing digital cameras
Name: libgphoto2
Version: 2.4.0
Release: 3%{?dist}
Version: 2.4.1
Release: 1%{?dist}
# GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
License: GPLv2+ and GPLv2
Group: Development/Libraries
@ -10,7 +10,6 @@ Source0: http://downloads.sourceforge.net/gphoto/libgphoto2-%{version}.tar.bz2
Patch1: gphoto2-pkgcfg.patch
Patch2: gphoto2-storage.patch
Patch3: gphoto2-ixany.patch
Patch5: gphoto2-data-phase.patch
Patch6: gphoto2-libusb-fix-build.patch
Url: http://www.gphoto.org/
Requires: lockdev
@ -22,6 +21,8 @@ BuildRequires: pkgconfig, sharutils
BuildRequires: libtool-ltdl-devel, popt-devel
# we run autoreconf:
BuildRequires: autoconf, automake, libtool, gettext-devel
Obsoletes: gphoto2 <= 2.4.0-10
Obsoletes: gphoto2-devel <= 2.4.0-10
%description
libgphoto2 is a library that can be used by applications to access
@ -34,6 +35,8 @@ Summary: Headers and links to compile against the libgphoto2 library
Group: Development/Libraries
Requires: %{name} = %{version}
Requires: pkgconfig
Obsoletes: gphoto2-devel <= 2.4.0-10
Provides: gphoto2-devel = %{version}-%{release}
%description devel
libgphoto2 is a library that can be used by applications to access
@ -49,7 +52,6 @@ use libgphoto2.
%patch1 -p1 -b .pkgcfg
%patch2 -p1 -b .storage
%patch3 -p1 -b .ixany
%patch5 -p1 -b .data-phase
%patch6 -p1 -b .libusb-build
cat > gphoto2.pc.in << \EOF
@ -74,7 +76,7 @@ sed 's/Name: gphoto2/Name: gphoto2-port/' < gphoto2.pc.in > gphoto2-port.pc.in
# But fix a typo first:
sed -i 's/\(AC_SUBST([^,]*\)}/\1/' {m4m,libgphoto2_port/m4}/gp-documentation.m4
sed -i 's/\(m4_pattern_\)disallow/\1forbid/g' {m4m,libgphoto2_port/m4}/gp-check-library.m4
autoreconf -i
autoreconf -i --force
export CFLAGS=$RPM_OPT_FLAGS
%configure \
--with-drivers=all \
@ -147,6 +149,9 @@ rm -rf "${RPM_BUILD_ROOT}"
%{_mandir}/man3/*
%changelog
* Mon Jun 02 2008 Jindrich Novy <jnovy@redhat.com> 2.4.1-1
- update to 2.4.1 (#443515, #436138)
* Thu May 29 2008 Stepan Kasal <skasal@redhat.com> 2.4.0-3
- drop gphoto2-norpath.patch
- use quoted here-document in %%prep

1
sources
View File

@ -1 +1,2 @@
a60154772635b693ff08b4f34dea7f61 libgphoto2-2.4.0.tar.bz2
70c7d2c3e84997f29b4e988e56bd02aa libgphoto2-2.4.1.tar.bz2