[Glibc-bsd-commits] r5491 - in trunk/freebsd-libs/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-07-13 20:58:56 +0000 (Sun, 13 Jul 2014)
New Revision: 5491

Added:
   trunk/freebsd-libs/debian/patches/empty_libusb_call_macro.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/patches/series
Log:
Add empty LIBUSB_CALL macro, to be compatible to the libusb 1.0-API


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2014-07-12 08:37:53 UTC (rev 5490)
+++ trunk/freebsd-libs/debian/changelog	2014-07-13 20:58:56 UTC (rev 5491)
@@ -1,3 +1,10 @@
+freebsd-libs (10.0-7) UNRELEASED; urgency=medium
+
+  * Add empty LIBUSB_CALL macro, to be compatible to the libusb 1.0-API
+    From upstream 10-STABLE.  Thanks, Scott Howard.  (Closes: #749157)
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Sun, 13 Jul 2014 21:47:01 +0100
+
 freebsd-libs (10.0-6) unstable; urgency=medium
 
   * Add <stdint.h> include to kvm.h to fix header buildability.

Added: trunk/freebsd-libs/debian/patches/empty_libusb_call_macro.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/empty_libusb_call_macro.diff	                        (rev 0)
+++ trunk/freebsd-libs/debian/patches/empty_libusb_call_macro.diff	2014-07-13 20:58:56 UTC (rev 5491)
@@ -0,0 +1,17 @@
+Description:
+ Add empty LIBUSB_CALL macro, to be compatible to the libusb 1.0-API
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/749157
+Applied-Upstream: http://svnweb.freebsd.org/base?view=revision&revision=267047
+
+--- freebsd-libs-10.0.orig/lib/libusb/libusb.h
++++ freebsd-libs-10.0/lib/libusb/libusb.h
+@@ -33,6 +33,8 @@
+ #include <sys/types.h>
+ #endif
+ 
++#define	LIBUSB_CALL
++
+ #ifdef __cplusplus
+ extern	"C" {
+ #endif

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2014-07-12 08:37:53 UTC (rev 5490)
+++ trunk/freebsd-libs/debian/patches/series	2014-07-13 20:58:56 UTC (rev 5491)
@@ -1,6 +1,7 @@
 # Patches from (or merged in) upstream
 svn_HEAD_Makefile.inc.diff
 libusb_handle_events_completed.diff
+empty_libusb_call_macro.diff
 
 # Patches that are in good shape for merging upstream