Bug#749157: [Pkg-bitcoin-devel] Bug#754682: cgminer: FTBFS on kfreebsd-*: expected '=', ',', '; ', 'asm' or '__attribute__' before 'transfer_callback'
Hi Scott,
On 13/07/14 20:42, Scott Howard wrote:
> This is due to:
> https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=749157
>
> We can easily do a work around until the above patch is fixed
I agree we should fix this in freebsd-libs; no need to pollute your own
package with a workaround.
I've prepared a new upload freebsd-libs 10.0-7, having the attached
debdiff, and is committed to the packaging repository as of SVN r5492.
If any suitable person reading this could upload it unstable for me please?
Thanks,
Regards,
--
Steven Chamberlain
steven@pyro.eu.org
diff -Nru freebsd-libs-10.0/debian/changelog freebsd-libs-10.0/debian/changelog
--- freebsd-libs-10.0/debian/changelog 2014-05-22 22:38:04.000000000 +0100
+++ freebsd-libs-10.0/debian/changelog 2014-07-13 21:59:24.000000000 +0100
@@ -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@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.
diff -Nru freebsd-libs-10.0/debian/patches/12_usb.diff freebsd-libs-10.0/debian/patches/12_usb.diff
--- freebsd-libs-10.0/debian/patches/12_usb.diff 2014-01-15 15:27:35.000000000 +0000
+++ freebsd-libs-10.0/debian/patches/12_usb.diff 2014-07-13 22:24:51.000000000 +0100
@@ -17,7 +17,7 @@
+#include <stdint.h>
#endif
- #ifdef __cplusplus
+ #define LIBUSB_CALL
--- a/lib/libusb/libusb20_desc.h
+++ b/lib/libusb/libusb20_desc.h
@@ -49,6 +49,8 @@
diff -Nru freebsd-libs-10.0/debian/patches/empty_libusb_call_macro.diff freebsd-libs-10.0/debian/patches/empty_libusb_call_macro.diff
--- freebsd-libs-10.0/debian/patches/empty_libusb_call_macro.diff 1970-01-01 01:00:00.000000000 +0100
+++ freebsd-libs-10.0/debian/patches/empty_libusb_call_macro.diff 2014-07-13 21:57:23.000000000 +0100
@@ -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
diff -Nru freebsd-libs-10.0/debian/patches/series freebsd-libs-10.0/debian/patches/series
--- freebsd-libs-10.0/debian/patches/series 2014-03-22 19:38:58.000000000 +0000
+++ freebsd-libs-10.0/debian/patches/series 2014-07-13 21:53:46.000000000 +0100
@@ -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
Reply to: