Re: libgphoto2 and sane-backends FTBFS with libusb2-dev
On 07/25/2013 12:08 PM, Guillem Jover wrote: Petr, if you could commit the patch (so that authorship is preserved), I'll do an upload today (otherwise I'll commit myself, although I prefer to have proper attributtions on the VCS). Ok, that would be awesome. I have already set up a kfreebsd virtual machine with a pbuilder and everything to prepare an NMU of the package, but I'd rather prefer if any of the BSD guys goes ahead and makes the upload. If possible, could you guys let us know as soon as the package has been upload so we can go ahead and take care of libgphoto2, then initiate a rebuild of sane-backends on kfreebsd*? Cheers, Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer - glaub...@debian.org `. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de `-GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913 -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/51f0f9e5.5090...@physik.fu-berlin.de
Re: libgphoto2 and sane-backends FTBFS with libusb2-dev
On Thu, 2013-07-25 at 07:29:53 +0200, Petr Salinger wrote: Do we have other options except waiting for a new release of libusb2-dev and removing the outdated kfreebsd packages from testing to make libgphoto2 and sane-backends swiftly migrate to testing? Anyways, what keeps us from just integrating a patch in the libusb2-dev Debian package and do a quick upload. Be it a normal upload or an NMU. I am member of maintainer group, but not a DD. I cannot upload myself. Feel free to use attached patch to debian packaging, alter debian/changelog as needed and do an upload of freebsd-libs. Petr, if you could commit the patch (so that authorship is preserved), I'll do an upload today (otherwise I'll commit myself, although I prefer to have proper attributtions on the VCS). Thanks, Guillem -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20130725100858.ga6...@gaara.hadrons.org
Re: libgphoto2 and sane-backends FTBFS with libusb2-dev
On Thu, 2013-07-25 at 12:21:37 +0200, Petr Salinger wrote: Petr, if you could commit the patch (so that authorship is preserved), I'll do an upload today (otherwise I'll commit myself, although I prefer to have proper attributtions on the VCS). It just remains to do upload, it is in our glibc-bsd SVN since Tuesday: http://lists.alioth.debian.org/pipermail/glibc-bsd-commits/2013-July/003446.html http://lists.alioth.debian.org/pipermail/glibc-bsd-commits/2013-July/003447.html Ah, ok sorry, should have checked, I assumed they had not been comitted due to the attached patch on the list. I'm preparing the upload right now. Thanks, Guillem -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20130725105539.ga7...@gaara.hadrons.org
Re: libgphoto2 and sane-backends FTBFS with libusb2-dev
On Thu, 2013-07-25 at 14:16:57 +0200, John Paul Adrian Glaubitz wrote: On 07/25/2013 12:55 PM, Guillem Jover wrote: I'm preparing the upload right now. I'm ready and waiting with an updated libgphoto2 here. Just ping me once you have uploaded freebsd-libs and I'll be pushing libgphoto2 afterwards. It's now uploaded, it might take some time to get built on kfreebsd-i386 though. Regards, Guillem -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20130725152731.ga17...@gaara.hadrons.org
Re: libgphoto2 and sane-backends FTBFS with libusb2-dev
On 07/25/2013 05:27 PM, Guillem Jover wrote: On Thu, 2013-07-25 at 14:16:57 +0200, John Paul Adrian Glaubitz wrote: On 07/25/2013 12:55 PM, Guillem Jover wrote: I'm preparing the upload right now. I'm ready and waiting with an updated libgphoto2 here. Just ping me once you have uploaded freebsd-libs and I'll be pushing libgphoto2 afterwards. It's now uploaded, it might take some time to get built on kfreebsd-i386 though. Awesome, thanks a lot! I'll check the buildds from time to time and once it's built, I'll push Markus' libgphoto2 as well :). Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer - glaub...@debian.org `. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de `-GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913 -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/51f14440.1090...@physik.fu-berlin.de
Re: libgphoto2 and sane-backends FTBFS with libusb2-dev
On 07/23/2013 06:27 PM, Petr Salinger wrote: It tries to autodetect, but then fails in a later step: checking for libusb-1.0 to use... autodetect checking for LIBUSB1... yes checking libusb.h usability... no checking libusb.h presence... yes The attached patch may help with this. (I applied it directly to my system libusb.h). After this I got a successful build on kfreebsd-amd64 Independently prepared in our SVN as r4796 :-) Any chances this is going to be pushed to unstable soon so it's part of an updated libusb2-dev package? Please just fix ENODATA occurence, with updated libusb2-dev it suffices to build libgphoto2. Hmm, Steven claimed it would work with just the patched libusb.h. However, we'll just wait until libusb2-dev has been updated, then we'lll give it another shot and apply the ENODATA fix if necessary. Cheers, Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer - glaub...@debian.org `. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de `-GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913 -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/51ef9373.3030...@physik.fu-berlin.de
Re: libgphoto2 and sane-backends FTBFS with libusb2-dev
On 24/07/13 09:42, John Paul Adrian Glaubitz wrote: On 07/23/2013 06:27 PM, Petr Salinger wrote: Please just fix ENODATA occurence, with updated libusb2-dev it suffices to build libgphoto2. Hmm, Steven claimed it would work with just the patched libusb.h. Sorry if I said/implied that; but I had applied Markus' ENODATA fix before testing for the other issue. So yes, both libusb2-dev and libphoto2 need fixes (in that order). Regards, -- Steven Chamberlain ste...@pyro.eu.org -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/51ef9fe2.8000...@pyro.eu.org
Re: libgphoto2 and sane-backends FTBFS with libusb2-dev
Please just fix ENODATA occurence, with updated libusb2-dev it suffices to build libgphoto2. Hmm, Steven claimed it would work with just the patched libusb.h. Sorry if I said/implied that; but I had applied Markus' ENODATA fix before testing for the other issue. So yes, both libusb2-dev and libphoto2 need fixes (in that order). Exact order of fixing is not necessary. It is possible give-back libgphoto2 when fixed libusb2-dev will be in unstable. The ENODATA occurence have to be fixed. Petr -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/alpine.lnx.2.00.1307241248250.10...@contest.felk.cvut.cz
Re: libgphoto2 and sane-backends FTBFS with libusb2-dev
On 07/24/2013 12:51 PM, Petr Salinger wrote: It is possible give-back libgphoto2 when fixed libusb2-dev will be in unstable. When is that going to happen? ;) The ENODATA occurence have to be fixed. Sure, we'll do that. We just want to make sure the package actually builds fine on the kfreebsd porterbox before uploading the package. We want to avoid uploading packages which FTBFS anyway. Adrian -- .''`. John Paul Adrian Glaubitz : :' : Debian Developer - glaub...@debian.org `. `' Freie Universitaet Berlin - glaub...@physik.fu-berlin.de `-GPG: 62FF 8A75 84E0 2956 9546 0006 7426 3B37 F5B5 F913 -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/51efb47a.4060...@physik.fu-berlin.de
Re: libgphoto2 and sane-backends FTBFS with libusb2-dev
On 24.07.2013 12:51, Petr Salinger wrote: Please just fix ENODATA occurence, with updated libusb2-dev it suffices to build libgphoto2. Hmm, Steven claimed it would work with just the patched libusb.h. Sorry if I said/implied that; but I had applied Markus' ENODATA fix before testing for the other issue. So yes, both libusb2-dev and libphoto2 need fixes (in that order). Exact order of fixing is not necessary. It is possible give-back libgphoto2 when fixed libusb2-dev will be in unstable. The ENODATA occurence have to be fixed. Steven, Petr, first of all many thanks for your quick response and your patches! Right now I could successfully build libgphoto2 on kfreebsd-i386 with the ENODATA and libusb.h patch. I will forward the former upstream. Although I do agree with Petr that requesting a give-back would be an easy solution, I'm more concerned about the other libgphoto2 and sane-backends packages on non-kfreebsd architectures which can't migrate to testing at the moment. Do we have other options except waiting for a new release of libusb2-dev and removing the outdated kfreebsd packages from testing to make libgphoto2 and sane-backends swiftly migrate to testing? Regards, Markus signature.asc Description: OpenPGP digital signature
Re: libgphoto2 and sane-backends FTBFS with libusb2-dev
Sorry for the bad formatting, sending from mobile. Anyways, what keeps us from just integrating a patch in the libusb2-dev Debian package and do a quick upload. Be it a normal upload or an NMU. Adrian On Jul 24, 2013, at 11:47 PM, Markus Koschany a...@gambaru.de wrote: On 24.07.2013 12:51, Petr Salinger wrote: Please just fix ENODATA occurence, with updated libusb2-dev it suffices to build libgphoto2. Hmm, Steven claimed it would work with just the patched libusb.h. Sorry if I said/implied that; but I had applied Markus' ENODATA fix before testing for the other issue. So yes, both libusb2-dev and libphoto2 need fixes (in that order). Exact order of fixing is not necessary. It is possible give-back libgphoto2 when fixed libusb2-dev will be in unstable. The ENODATA occurence have to be fixed. Steven, Petr, first of all many thanks for your quick response and your patches! Right now I could successfully build libgphoto2 on kfreebsd-i386 with the ENODATA and libusb.h patch. I will forward the former upstream. Although I do agree with Petr that requesting a give-back would be an easy solution, I'm more concerned about the other libgphoto2 and sane-backends packages on non-kfreebsd architectures which can't migrate to testing at the moment. Do we have other options except waiting for a new release of libusb2-dev and removing the outdated kfreebsd packages from testing to make libgphoto2 and sane-backends swiftly migrate to testing? Regards, Markus -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/fe7718f6-a5fc-4d03-b8ef-891a37b5d...@physik.fu-berlin.de
Re: libgphoto2 and sane-backends FTBFS with libusb2-dev
Hi.
Do we have other options except waiting for a new release of libusb2-dev
and removing the outdated kfreebsd packages from testing to make
libgphoto2 and sane-backends swiftly migrate to testing?
Anyways, what keeps us from just integrating
a patch in the libusb2-dev Debian package and do a quick upload. Be it
a normal upload or an NMU.
I am member of maintainer group, but not a DD. I cannot upload myself.
Feel free to use attached patch to debian packaging, alter
debian/changelog as needed and do an upload of freebsd-libs.
PetrIndex: debian/libusb.pc
===
--- debian/libusb.pc(revision 4785)
+++ debian/libusb.pc(working copy)
@@ -7,4 +7,5 @@
Description: USB access library
Version: 0.1.12
Libs: -L${libdir} -lusb
+Libs.private: -lbsd
Cflags: -I${includedir}
Index: debian/patches/cdefs_macros.diff
===
--- debian/patches/cdefs_macros.diff(revision 4785)
+++ debian/patches/cdefs_macros.diff(working copy)
@@ -53,6 +53,15 @@
typedef struct libusb_ss_endpoint_companion_descriptor {
uint8_t bLength;
+@@ -250,7 +250,7 @@
+ uint8_t bMaxBurst;
+ uint8_t bmAttributes;
+ uint16_t wBytesPerInterval;
+-} libusb_ss_endpoint_companion_descriptor __aligned(sizeof(void *));
++} libusb_ss_endpoint_companion_descriptor
__attribute__((__aligned__(sizeof(void *;
+
+ typedef struct libusb_interface_descriptor {
+ uint8_t bLength;
@@ -265,12 +265,12 @@
struct libusb_endpoint_descriptor *endpoint;
uint8_t *extra;
@@ -77,6 +86,33 @@
typedef struct libusb_usb_2_0_device_capability_descriptor {
uint8_t bLength;
+@@ -292,7 +292,7 @@
+ uint8_t bDevCapabilityType;
+ uint32_t bmAttributes;
+ #define LIBUSB_USB_2_0_CAPABILITY_LPM_SUPPORT (1 1)
+-} libusb_usb_2_0_device_capability_descriptor __aligned(sizeof(void *));
++} libusb_usb_2_0_device_capability_descriptor
__attribute__((__aligned__(sizeof(void *;
+
+ typedef struct libusb_ss_usb_device_capability_descriptor {
+ uint8_t bLength;
+@@ -308,7 +308,7 @@
+ uint8_t bFunctionalitySupport;
+ uint8_t bU1DevExitLat;
+ uint16_t wU2DevExitLat;
+-} libusb_ss_usb_device_capability_descriptor __aligned(sizeof(void *));
++} libusb_ss_usb_device_capability_descriptor
__attribute__((__aligned__(sizeof(void *;
+
+ typedef struct libusb_bos_descriptor {
+ uint8_t bLength;
+@@ -317,7 +317,7 @@
+ uint8_t bNumDeviceCapabilities;
+ struct libusb_usb_2_0_device_capability_descriptor *usb_2_0_ext_cap;
+ struct libusb_ss_usb_device_capability_descriptor *ss_usb_cap;
+-} libusb_bos_descriptor __aligned(sizeof(void *));
++} libusb_bos_descriptor __attribute__((__aligned__(sizeof(void *;
+
+ typedef struct libusb_control_setup {
+ uint8_t bmRequestType;
@@ -333,7 +333,7 @@
uint32_t length;
uint32_t actual_length;
Index: debian/patches/12_usb.diff
===
--- debian/patches/12_usb.diff (revision 4785)
+++ debian/patches/12_usb.diff (working copy)
@@ -11,13 +11,14 @@
--- a/lib/libusb/Makefile
+++ b/lib/libusb/Makefile
-@@ -15,6 +15,7 @@
- MAN= libusb.3 libusb20.3
- MKLINT= no
- NOGCCERROR=
+@@ -19,7 +19,7 @@
+ WARNS?= 2
+
+ DPADD=${LIBPTHREAD}
+-LDADD=-lpthread
+LDADD+= -lpthread -lrt -lbsd
- WARNS?= 2
+ MLINKS+= libusb.3 usb.3
--- a/lib/libusb/libusb.h
+++ b/lib/libusb/libusb.h
Index: debian/libusb-1.0.pc
===
--- debian/libusb-1.0.pc(revision 4785)
+++ debian/libusb-1.0.pc(working copy)
@@ -7,4 +7,5 @@
Description: C API for USB device access from FreeBSD userspace
Version: 1.0.6
Libs: -L${libdir} -lusb
+Libs.private: -lbsd
Cflags: -I${includedir}
Index: debian/changelog
===
--- debian/changelog(revision 4785)
+++ debian/changelog(working copy)
@@ -1,3 +1,11 @@
+freebsd-libs (9.1+ds1-3) UNRELEASED; urgency=low
+
+ [ Petr Salinger ]
+ * extend cdefs_macros.diff in libusb.h part
+ * libusb really needs libbsd
+
+ -- Robert Millan r...@debian.org Tue, 16 Jul 2013 15:24:27 +0200
+
freebsd-libs (9.1+ds1-2) unstable; urgency=low
* Bump freebsd-glue B-D (for roundup2).
Re: libgphoto2 and sane-backends FTBFS with libusb2-dev
Hi Markus!
On 23/07/13 16:08, Markus Koschany wrote:
[...] on kFreeBSD-amd64 libusb-1.0 is not autodetected and libgphoto2
fails with another error.
It tries to autodetect, but then fails in a later step:
checking for libusb-1.0 to use... autodetect
checking for LIBUSB1... yes
checking libusb.h usability... no
checking libusb.h presence... yes
This is explained in libgphoto2_port/config.log:
configure:15332: checking libusb.h usability
configure:15332: gcc -c -g -O2 -fstack-protector --param=ssp-buffer-size=4
-Wformat -Werror=format-security conftest.c 5
In file included from conftest.c:102:0:
/usr/include/libusb.h:254:43: error: expected '=', ',', ';', 'asm' or
'__attribute__' before '__aligned'
} libusb_ss_endpoint_companion_descriptor __aligned(sizeof(void *));
There seems to be some GNU/kFreeBSD portability issue in libusb.h - the
same issue that causes a build failure in libghoto2 later.
The attached patch may help with this. (I applied it directly to my
system libusb.h). After this I got a successful build on kfreebsd-amd64
Regards,
--
Steven Chamberlain
ste...@pyro.eu.org
--- /usr/include/libusb.h.orig 2013-07-22 18:12:54.0 +
+++ /usr/include/libusb.h 2013-07-23 16:04:05.712464237 +
@@ -251,7 +251,7 @@
uint8_t bMaxBurst;
uint8_t bmAttributes;
uint16_t wBytesPerInterval;
-} libusb_ss_endpoint_companion_descriptor __aligned(sizeof(void *));
+} libusb_ss_endpoint_companion_descriptor __attribute__((__aligned__(sizeof(void *;
typedef struct libusb_interface_descriptor {
uint8_t bLength;
@@ -293,7 +293,7 @@
uint8_t bDevCapabilityType;
uint32_t bmAttributes;
#define LIBUSB_USB_2_0_CAPABILITY_LPM_SUPPORT (1 1)
-} libusb_usb_2_0_device_capability_descriptor __aligned(sizeof(void *));
+} libusb_usb_2_0_device_capability_descriptor __attribute__((__aligned(sizeof(void *;
typedef struct libusb_ss_usb_device_capability_descriptor {
uint8_t bLength;
@@ -309,7 +309,7 @@
uint8_t bFunctionalitySupport;
uint8_t bU1DevExitLat;
uint16_t wU2DevExitLat;
-} libusb_ss_usb_device_capability_descriptor __aligned(sizeof(void *));
+} libusb_ss_usb_device_capability_descriptor __attribute__((__aligned(sizeof(void *;
typedef struct libusb_bos_descriptor {
uint8_t bLength;
@@ -318,7 +318,7 @@
uint8_t bNumDeviceCapabilities;
struct libusb_usb_2_0_device_capability_descriptor *usb_2_0_ext_cap;
struct libusb_ss_usb_device_capability_descriptor *ss_usb_cap;
-} libusb_bos_descriptor __aligned(sizeof(void *));
+} libusb_bos_descriptor __attribute__((aligned(sizeof(void *;
typedef struct libusb_control_setup {
uint8_t bmRequestType;
Re: libgphoto2 and sane-backends FTBFS with libusb2-dev
It tries to autodetect, but then fails in a later step: checking for libusb-1.0 to use... autodetect checking for LIBUSB1... yes checking libusb.h usability... no checking libusb.h presence... yes The attached patch may help with this. (I applied it directly to my system libusb.h). After this I got a successful build on kfreebsd-amd64 Independently prepared in our SVN as r4796 :-) Please just fix ENODATA occurence, with updated libusb2-dev it suffices to build libgphoto2. checking for libusb to use... no checking for libusb-1.0 to use... autodetect checking for LIBUSB1... yes checking libusb.h usability... yes checking libusb.h presence... yes checking for libusb.h... yes checking for function libusb_init in libusb-1.0... no Petr -- To UNSUBSCRIBE, email to debian-bsd-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/alpine.lnx.2.00.1307231821290.14...@contest.felk.cvut.cz
