Bug#816333: libindi: FTBFS[kfreebsd]: libusb-1.0/libusb.h: No such file or directory
Package: libindi
Version: 1.1.0-1
Severity: important
Tags: patch
User: debian-bsd@lists.debian.org
Usertags: kfreebsd
Hi,
libindi built before on kfreebsd, but since then a new include was
added in libs/indibase/hid_libusb.c:
#include "libusb-1.0/libusb.h"
We prefer that it is just:
#include <libusb.h>
since cmake already sets the include path appropriately to find libusb.h
wherever it is located (/usr/include/libusb-1.0/ on linux, or just
/usr/include/ on kfreebsd).
While here, a symbols update was needed. I've attached a debdiff having
both of these changes. Thanks a lot.
p.s. there are some "warning: implicit declaration" happening on linux
and kfreebsd, which suggest maybe compiling with -D_GNU_SOURCE to get
both strptime and asprintf, or define that macro atop the affected
source files.
-- System Information:
Debian Release: stretch/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: kfreebsd-amd64 (x86_64)
Kernel: kFreeBSD 10.1-0-amd64
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru libindi-1.1.0/debian/libindidriver1.symbols libindi-1.1.0/debian/libindidriver1.symbols
--- libindi-1.1.0/debian/libindidriver1.symbols 2016-01-18 15:06:38.000000000 +0000
+++ libindi-1.1.0/debian/libindidriver1.symbols 2016-02-29 23:11:48.000000000 +0000
@@ -128,14 +128,14 @@
(arch=!kfreebsd-any)_ZN13V4L2_RecorderD0Ev@Base 1.0.0
(arch=!kfreebsd-any)_ZN13V4L2_RecorderD1Ev@Base 1.0.0
(arch=!kfreebsd-any)_ZN13V4L2_RecorderD2Ev@Base 1.0.0
- _ZN20V4L2_Builtin_Decoder10getLinearYEv@Base 1.1.0
- _ZN20V4L2_Builtin_Decoder11makeLinearYEv@Base 1.1.0
+ (arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder10getLinearYEv@Base 1.1.0
+ (arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder11makeLinearYEv@Base 1.1.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder11usesoftcropEb@Base 1.0.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder12allocBuffersEv@Base 1.0.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder12getRGBBufferEv@Base 1.0.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder14getColorBufferEv@Base 1.0.0
- _ZN20V4L2_Builtin_Decoder15setQuantizationEb@Base 1.1.0
- _ZN20V4L2_Builtin_Decoder16setLinearizationEb@Base 1.1.0
+ (arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder15setQuantizationEb@Base 1.1.0
+ (arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder16setLinearizationEb@Base 1.1.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder17issupportedformatEj@Base 1.0.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder19getsupportedformatsEv@Base 1.0.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder22init_supported_formatsEv@Base 1.0.0
@@ -143,12 +143,12 @@
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder4getVEv@Base 1.0.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder4getYEv@Base 1.0.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder4initEv@Base 1.0.0
- _ZN20V4L2_Builtin_Decoder5makeYEv@Base 1.1.0
+ (arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder5makeYEv@Base 1.1.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder6decodeEPhP11v4l2_buffer@Base 1.0.0
- _ZN20V4L2_Builtin_Decoder6getBppEv@Base 1.1.0
+ (arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder6getBppEv@Base 1.1.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder7setcropE9v4l2_crop@Base 1.0.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder9resetcropEv@Base 1.0.0
- _ZN20V4L2_Builtin_Decoder9setformatE11v4l2_formatb@Base 1.1.0
+ (arch=!kfreebsd-any)_ZN20V4L2_Builtin_Decoder9setformatE11v4l2_formatb@Base 1.1.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_DecoderC1Ev@Base 1.0.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_DecoderC2Ev@Base 1.0.0
(arch=!kfreebsd-any)_ZN20V4L2_Builtin_DecoderD0Ev@Base 1.0.0
@@ -335,7 +335,8 @@
_ZN4INDI16FocuserInterfaceD2Ev@Base 1.0.0
_ZN4INDI3CCD10GuideNorthEf@Base 1.0.0
_ZN4INDI3CCD10GuideSouthEf@Base 1.0.0
- (subst)_ZN4INDI3CCD10uploadFileEP7CCDChipPKv{size_t}bb@Base 1.0.0
+ (arch=kfreebsd-any)_ZN4INDI3CCD10uploadFileEP7CCDChipPKvmbb@Base 1.1.0-1
+ (arch=!kfreebsd-any)(subst)_ZN4INDI3CCD10uploadFileEP7CCDChipPKv{size_t}bb@Base 1.0.0
_ZN4INDI3CCD11ISNewNumberEPKcS2_PdPPci@Base 1.0.0
_ZN4INDI3CCD11ISNewSwitchEPKcS2_P7ISStatePPci@Base 1.0.0
_ZN4INDI3CCD12SetCCDParamsEiiiff@Base 1.0.0
@@ -584,7 +585,7 @@
(arch=!kfreebsd-any)_ZN9V4L2_Base10errno_exitEPKcPc@Base 1.0.0
(arch=!kfreebsd-any)_ZN9V4L2_Base10findMinMaxEv@Base 1.0.0
(arch=!kfreebsd-any)_ZN9V4L2_Base10getControlEjPdPc@Base 1.0.0
- _ZN9V4L2_Base10getLinearYEv@Base 1.1.0
+ (arch=!kfreebsd-any)_ZN9V4L2_Base10getLinearYEv@Base 1.1.0
(arch=!kfreebsd-any)_ZN9V4L2_Base10init_userpEj@Base 1.0.0
(arch=!kfreebsd-any)_ZN9V4L2_Base10query_ctrlEjRdS0_S0_S0_Pc@Base 1.0.0
(arch=!kfreebsd-any)_ZN9V4L2_Base10read_frameEPc@Base 1.0.0
@@ -621,11 +622,11 @@
(arch=!kfreebsd-any)_ZN9V4L2_Base16setcaptureformatEjPc@Base 1.0.0
(arch=!kfreebsd-any)_ZN9V4L2_Base17getcaptureformatsEP22_ISwitchVectorProperty@Base 1.0.0
(arch=!kfreebsd-any)_ZN9V4L2_Base18enumerate_ext_ctrlEv@Base 1.0.0
- _ZN9V4L2_Base18setColorProcessingEbbb@Base 1.1.0
+ (arch=!kfreebsd-any)_ZN9V4L2_Base18setColorProcessingEbbb@Base 1.1.0
(arch=!kfreebsd-any)_ZN9V4L2_Base4getUEv@Base 1.0.0
(arch=!kfreebsd-any)_ZN9V4L2_Base4getVEv@Base 1.0.0
(arch=!kfreebsd-any)_ZN9V4L2_Base4getYEv@Base 1.0.0
- _ZN9V4L2_Base6getBppEv@Base 1.1.0
+ (arch=!kfreebsd-any)_ZN9V4L2_Base6getBppEv@Base 1.1.0
(arch=!kfreebsd-any)_ZN9V4L2_Base6xioctlEiiPv@Base 1.0.0
(arch=!kfreebsd-any)_ZN9V4L2_Base7setSizeEii@Base 1.0.0
(arch=!kfreebsd-any)_ZN9V4L2_Base8doDecodeEb@Base 1.0.0
@@ -811,12 +812,12 @@
findXMLEle@Base 1.0.0
from64tobits@Base 1.0.0
fs_sexa@Base 1.0.0
- getColorSpaceName@Base 1.1.0
- getQuantization@Base 1.1.0
- getQuantizationName@Base 1.1.0
+ (arch=!kfreebsd-any)getColorSpaceName@Base 1.1.0
+ (arch=!kfreebsd-any)getQuantization@Base 1.1.0
+ (arch=!kfreebsd-any)getQuantizationName@Base 1.1.0
getSexComponents@Base 1.0.0
- getYCbCrEncoding@Base 1.1.0
- getYCbCrEncodingName@Base 1.1.0
+ (arch=!kfreebsd-any)getYCbCrEncoding@Base 1.1.0
+ (arch=!kfreebsd-any)getYCbCrEncodingName@Base 1.1.0
get_local_hour_angle@Base 1.1.0
get_local_sideral_time@Base 1.1.0
get_usb_code_for_current_locale@Base 1.1.0
@@ -838,18 +839,18 @@
hid_send_feature_report@Base 1.1.0
hid_set_nonblocking@Base 1.1.0
hid_write@Base 1.1.0
- initColorSpace@Base 1.1.0
+ (arch=!kfreebsd-any)initColorSpace@Base 1.1.0
isPropDefined@Base 1.0.0
lilxmlMalloc@Base 1.0.0
- linearize@Base 1.1.0
- lutrangecbcr10@Base 1.1.0
- lutrangecbcr12@Base 1.1.0
- lutrangecbcr16@Base 1.1.0
- lutrangecbcr8@Base 1.1.0
- lutrangey10@Base 1.1.0
- lutrangey12@Base 1.1.0
- lutrangey16@Base 1.1.0
- lutrangey8@Base 1.1.0
+ (arch=!kfreebsd-any)linearize@Base 1.1.0
+ (arch=!kfreebsd-any)lutrangecbcr10@Base 1.1.0
+ (arch=!kfreebsd-any)lutrangecbcr12@Base 1.1.0
+ (arch=!kfreebsd-any)lutrangecbcr16@Base 1.1.0
+ (arch=!kfreebsd-any)lutrangecbcr8@Base 1.1.0
+ (arch=!kfreebsd-any)lutrangey10@Base 1.1.0
+ (arch=!kfreebsd-any)lutrangey12@Base 1.1.0
+ (arch=!kfreebsd-any)lutrangey16@Base 1.1.0
+ (arch=!kfreebsd-any)lutrangey8@Base 1.1.0
main@Base 1.0.0
me@Base 1.0.0
(arch=!kfreebsd-any)mjpegtoyuv420p@Base 1.0.0
@@ -884,7 +885,7 @@
range360@Base 1.1.0
rangeDec@Base 1.1.0
rangeHA@Base 1.1.0
- rangeY8@Base 1.1.0
+ (arch=!kfreebsd-any)rangeY8@Base 1.1.0
readXMLEle@Base 1.0.0
readXMLFile@Base 1.0.0
rmCallback@Base 1.0.0
diff -Nru libindi-1.1.0/debian/patches/freebsd_support2 libindi-1.1.0/debian/patches/freebsd_support2
--- libindi-1.1.0/debian/patches/freebsd_support2 1970-01-01 00:00:00.000000000 +0000
+++ libindi-1.1.0/debian/patches/freebsd_support2 2016-02-29 23:05:50.000000000 +0000
@@ -0,0 +1,11 @@
+--- a/libs/indibase/hid_libusb.c
++++ b/libs/indibase/hid_libusb.c
+@@ -52,7 +52,7 @@
+ #include <wchar.h>
+
+ /* GNU / LibUSB */
+-#include "libusb-1.0/libusb.h"
++#include <libusb.h>
+ #include "iconv.h"
+
+ #include "hidapi.h"
diff -Nru libindi-1.1.0/debian/patches/series libindi-1.1.0/debian/patches/series
--- libindi-1.1.0/debian/patches/series 2016-01-18 15:06:38.000000000 +0000
+++ libindi-1.1.0/debian/patches/series 2016-02-29 23:05:50.000000000 +0000
@@ -1 +1,2 @@
freebsd_support
+freebsd_support2
Reply to: