[SCM] libindi packaging branch, master, updated. debian/0.9.8.1-4-8-g7621026

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/libindi.git;a=commitdiff;h=2623a8b

The following commit has been merged in the master branch:
commit 2623a8b2a05e9ac1a9dc40fcd840c36cc404b7b1
Author: Maximiliano Curia <maxy at debian.org>
Date:   Sat Aug 30 04:01:18 2014 +0200

    New patch: freebsd_support
---
 debian/changelog               |   1 +
 debian/patches/freebsd_support | 121 +++++++++++++++++++++++++++++++++++++++++
 debian/patches/series          |   1 +
 3 files changed, 123 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 70690ca..6d97fed 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 libindi (0.9.8.1-5) UNRELEASED; urgency=medium
 
   * Update symbols with the buildds logs and kfreebsd porter box log.
+  * New patch: freebsd_support
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 30 Aug 2014 02:50:51 +0200
 
diff --git a/debian/patches/freebsd_support b/debian/patches/freebsd_support
new file mode 100644
index 0000000..909a8c3
--- /dev/null
+++ b/debian/patches/freebsd_support
@@ -0,0 +1,121 @@
+Index: libindi/cmake_modules/FindUSB-1.cmake
+===================================================================
+--- libindi.orig/cmake_modules/FindUSB-1.cmake	2014-08-30 03:56:46.016848990 +0200
++++ libindi/cmake_modules/FindUSB-1.cmake	2014-08-30 04:13:30.331844482 +0200
+@@ -46,38 +46,47 @@
+   # in cache already
+   set(LIBUSB_FOUND TRUE)
+ else (LIBUSB_1_LIBRARIES AND LIBUSB_1_INCLUDE_DIRS)
+-  find_path(LIBUSB_1_INCLUDE_DIR
+-    NAMES
+-	libusb.h
+-    PATHS
+-      /usr/include
+-      /usr/local/include
+-      /opt/local/include
+-      /sw/include
+-	PATH_SUFFIXES
+-	  libusb-1.0
+-  )
+-
+-  find_library(LIBUSB_1_LIBRARY
+-    NAMES
+-      usb-1.0
+-    PATHS
+-      /usr/lib
+-      /usr/local/lib
+-      /opt/local/lib
+-      /sw/lib
+-  )
+-
+-  set(LIBUSB_1_INCLUDE_DIRS
+-    ${LIBUSB_1_INCLUDE_DIR}
+-  )
+-  set(LIBUSB_1_LIBRARIES
+-    ${LIBUSB_1_LIBRARY}
+-)
+-
+-  if (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
+-     set(LIBUSB_1_FOUND TRUE)
+-  endif (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
++
++  find_package(PkgConfig)
++  pkg_check_modules(LIBUSB_1 QUIET libusb-1.0)
++  set(LIBUSB_1_DEFINITIONS ${LIBUSB_1_CFLAGS} ${LIBUSB_1_CFLAGS_OTHER})
++
++  if (NOT LIBUSB_1_FOUND)
++
++    find_path(LIBUSB_1_INCLUDE_DIR
++      NAMES
++          libusb.h
++      PATHS
++        /usr/include
++        /usr/local/include
++        /opt/local/include
++        /sw/include
++          PATH_SUFFIXES
++            libusb-1.0
++    )
++
++    find_library(LIBUSB_1_LIBRARY
++      NAMES
++        usb-1.0
++      PATHS
++        /usr/lib
++        /usr/local/lib
++        /opt/local/lib
++        /sw/lib
++    )
++
++    set(LIBUSB_1_INCLUDE_DIRS
++      ${LIBUSB_1_INCLUDE_DIR}
++    )
++    set(LIBUSB_1_LIBRARIES
++      ${LIBUSB_1_LIBRARY}
++    )
++
++    if (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
++       set(LIBUSB_1_FOUND TRUE)
++    endif (LIBUSB_1_INCLUDE_DIRS AND LIBUSB_1_LIBRARIES)
++
++  endif (NOT LIBUSB_1_FOUND)
+ 
+   if (LIBUSB_1_FOUND)
+     if (NOT USB-1_FIND_QUIETLY)
+@@ -88,13 +97,13 @@
+     set(CMAKE_REQUIRED_INCLUDES ${LIBUSB_1_INCLUDE_DIRS})
+     set(CMAKE_REQUIRED_LIBRARIES ${LIBUSB_1_LIBRARIES})
+     include (CheckCXXSourceCompiles)
+-    check_cxx_source_compiles("#include <libusb-1.0/libusb.h> 
++    check_cxx_source_compiles("#include <libusb.h>
+       int main() { libusb_error_name(0); return 0; }" ERROR_NAME_COMPILE)
+     if (NOT ERROR_NAME_COMPILE)
+       add_definitions("-DNO_ERROR_NAME")
+       message(STATUS " - 1.0.8 or older")
+     endif (NOT ERROR_NAME_COMPILE)
+-    
++
+   else (LIBUSB_1_FOUND)
+     if (USB-1_FIND_REQUIRED)
+       message(FATAL_ERROR "Could not find libusb-1.0. Please install libusb-1.0 along with the development package.")
+Index: libindi/libs/indibase/indiusbdevice.h
+===================================================================
+--- libindi.orig/libs/indibase/indiusbdevice.h	2014-08-30 03:56:46.280838205 +0200
++++ libindi/libs/indibase/indiusbdevice.h	2014-08-30 04:00:32.951579737 +0200
+@@ -1,6 +1,6 @@
+ /*******************************************************************************
+  Copyright(c) 2011 Gerry Rozema. All rights reserved.
+- 
++
+  Upgrade to libusb 1.0 by CloudMakers, s. r. o.
+  Copyright(c) 2013 CloudMakers, s. r. o. All rights reserved.
+ 
+@@ -29,7 +29,7 @@
+ #include <unistd.h>
+ #include <errno.h>
+ 
+-#include <libusb-1.0/libusb.h>
++#include <libusb.h>
+ 
+ #include "indibase.h"
+ 
diff --git a/debian/patches/series b/debian/patches/series
index dac7986..f6169fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 abi.diff
 no-sys-io.patch
+freebsd_support

-- 
libindi packaging