[hamradio-commits] [limesuite] 05/06: Add patch fix-libusb-include

[Andreas E. Bombe]

This is an automated email from the git hooks/post-receive script.

aeb pushed a commit to branch master
in repository limesuite.

commit 301432a09182466ad7ca13c17a0f76bbf4e88f7a
Author: Andreas Bombe <aeb at debian.org>
Date:   Fri Jan 6 04:28:31 2017 +0100

    Add patch fix-libusb-include
---
 debian/changelog                  |  3 +++
 debian/patches/fix-libusb-include | 30 ++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9eea8c0..b0f47ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ limesuite (16.8.23.819+git20161221+dfsg-2) UNRELEASED; urgency=medium
     Multi-Arch: foreign
   * Make sure desktop files are installed on all architectures, not
     just Linux
+  * Add patch fix-libusb-include to fix sources including
+    <libusb-1.0/libusb.h> when <libusb.h> is sufficient and doesn't
+    break kfreebsd
 
  -- Andreas Bombe <aeb at debian.org>  Fri, 06 Jan 2017 02:03:29 +0100
 
diff --git a/debian/patches/fix-libusb-include b/debian/patches/fix-libusb-include
new file mode 100644
index 0000000..322c2b3
--- /dev/null
+++ b/debian/patches/fix-libusb-include
@@ -0,0 +1,30 @@
+Description: Fix libusb include
+ Two source files had include lines specifying libusb-1.0/libusb.h. Although
+ that is the location for the standard libusb-1.0, it isn't correct for
+ kfreebsd. Since configuring the package already sets up the include path for
+ the libusb directory, we can simply drop the path and include libusb.h.
+Author: Andreas Bombe <aeb at debian.org>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/ConnectionSTREAM/ConnectionSTREAM.h
++++ b/src/ConnectionSTREAM/ConnectionSTREAM.h
+@@ -20,7 +20,7 @@
+ #include "windows.h"
+ #include "CyAPI.h"
+ #else
+-#include <libusb-1.0/libusb.h>
++#include <libusb.h>
+ #include <mutex>
+ #include <condition_variable>
+ #include <chrono>
+--- a/src/Connection_uLimeSDR/Connection_uLimeSDR.h
++++ b/src/Connection_uLimeSDR/Connection_uLimeSDR.h
+@@ -19,7 +19,7 @@
+ #include "windows.h"
+ #include "FTD3XXLibrary/FTD3XX.h"
+ #else
+-#include <libusb-1.0/libusb.h>
++#include <libusb.h>
+ #include <mutex>
+ #include <condition_variable>
+ #include <chrono>
diff --git a/debian/patches/series b/debian/patches/series
index 3a4802f..f633518 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ version-string
 use-system-glew
 link-libatomic
 fix-icon-install
+fix-libusb-include

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/limesuite.git