Hello community, here is the log from the commit of package libgphoto2 for openSUSE:Factory checked in at 2012-02-21 07:32:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libgphoto2 (Old) and /work/SRC/openSUSE:Factory/.libgphoto2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libgphoto2", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/libgphoto2/libgphoto2.changes 2012-01-27 15:21:33.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libgphoto2.new/libgphoto2.changes 2012-02-21 07:32:09.000000000 +0100 @@ -1,0 +2,8 @@ +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. + +------------------------------------------------------------------- New: ---- libgphoto2-libusb.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libgphoto2.spec ++++++ --- /var/tmp/diff_new_pack.JgzWKy/_old 2012-02-21 07:32:11.000000000 +0100 +++ /var/tmp/diff_new_pack.JgzWKy/_new 2012-02-21 07:32:11.000000000 +0100 @@ -15,6 +15,7 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # + Name: libgphoto2 BuildRequires: doxygen BuildRequires: fdupes @@ -42,6 +43,8 @@ Source0: libgphoto2-%{version}.tar.bz2 Source1: baselibs.conf Patch1: libgphoto2-4096files.patch +# PATCH-FIX-UPSTREAM libgphoto2-libusb.patch [email protected] -- 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} @@ -76,6 +79,10 @@ %prep %setup -q %patch1 -p1 +( +cd libgphoto2_port/libusb1/ +%patch2 +) %build #AUTOPOINT=true autoreconf -fi ++++++ libgphoto2-libusb.patch ++++++ --- 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; -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
