pool/libgphoto2
SHA256
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 2.4.12.1 temp snapshot

Browse Source 
- various libusb 1.0 fixes (including last one merged)
  - EOS fast directory listing

OBS-URL: https://build.opensuse.org/package/show/graphics/libgphoto2?expand=0&rev=62
This commit is contained in:
Marcus Meissner 2012-02-22 10:10:30 +00:00 committed by Git OBS Bridge
parent 62bd861748
commit 62a4764299
5 changed files with 13 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libgphoto2-2.4.12.1.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5c81f3b880ba6111a928f484b8308c1b3ba706ad170cd966ac58627275c01457
size 5821852

3
libgphoto2-2.4.12.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:5b6c5d25e9f610e6b2d9e2b35ee77258b15f6ecb67de344395eddddc0345f322
size 4430444

47
libgphoto2-libusb.patch
View File

@ -1,47 +0,0 @@
--- libusb1.c.orig 2011-11-13 14:50:32.000000000 +0100
+++ libusb1.c 2012-02-18 23:44:37.034378810 +0100
@@ -85,7 +85,7 @@
static libusb_device **devs = NULL;
static ssize_t
-load_devicelist (void) {
+load_devicelist (libusb_context *ctx) {
time_t xtime;
time(&xtime);
@@ -96,7 +96,7 @@
devs = NULL;
}
if (!nrofdevs)
- nrofdevs = libusb_get_device_list (NULL, &devs);
+ nrofdevs = libusb_get_device_list (ctx, &devs);
return nrofdevs;
}
@@ -114,7 +114,7 @@
CHECK (gp_port_info_list_append (list, info));
libusb_init (NULL);
- nrofdevs = load_devicelist ();
+ nrofdevs = load_devicelist (NULL);
for (d = 0; d < nrofdevs; d++) {
struct libusb_device_descriptor desc;
@@ -766,7 +766,7 @@
return GP_ERROR_BAD_PARAMETERS;
}
- nrofdevs = load_devicelist ();
+ nrofdevs = load_devicelist (port->pl->ctx);
for (d = 0; d < nrofdevs; d++) {
struct libusb_device_descriptor desc;
@@ -1067,7 +1067,7 @@
if (!class)
return GP_ERROR_BAD_PARAMETERS;
- nrofdevs = load_devicelist ();
+ nrofdevs = load_devicelist (port->pl->ctx);
for (d = 0; d < nrofdevs; d++) {
struct libusb_device_descriptor desc;
struct libusb_config_descriptor *confdesc;

7
libgphoto2.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Tue Feb 21 18:03:48 CET 2012 - meissner@suse.de
- 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 - dimstar@opensuse.org

11
libgphoto2.spec
View File

@ -38,21 +38,20 @@ Obsoletes: libgphoto2-64bit
Summary: A Digital Camera Library
License: LGPL-2.1+
Group: Hardware/Camera
Version: 2.4.12
Version: 2.4.12.1
Release: 0
Source0: libgphoto2-%{version}.tar.bz2
Source1: baselibs.conf
Patch1: libgphoto2-4096files.patch
# PATCH-FIX-UPSTREAM libgphoto2-libusb.patch dimstar@opensuse.org -- Fix usage of libusb 1.0. Patch written by libusb maintainer Peter Stuge.
Patch2: libgphoto2-libusb.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Recommends: %{name}-lang = %{version}
%package devel
Summary: Development headers for libgphoto2
Group: Hardware/Camera
Requires: libgphoto2 = %version libusb-1_0-devel
Requires: libexif-devel
Requires: libgphoto2 = %version
Requires: libusb-1_0-devel
%description
gPhoto (GNU Photo) is a set of libraries for previewing, retrieving,
@ -79,10 +78,6 @@ These are its development libraries and headers.
%prep
%setup -q
%patch1 -p1
(
cd libgphoto2_port/libusb1/
%patch2
)
%build
#AUTOPOINT=true autoreconf -fi