[Pkg-bitcoin-commits] [cgminer] 01/01: New upstream release. system_libusb.patch added to use system libjansson and libusb

[Scott Sheridan Howard]

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

showard pushed a commit to branch master
in repository cgminer.

commit db6d9fc32e76184c9bff681f50ea302e399dc2a5
Author: Scott Howard <showard314 at gmail.com>
Date:   Tue Sep 10 14:59:40 2013 -0400

    New upstream release. system_libusb.patch added to use system libjansson and libusb
---
 debian/changelog                   |    7 +++++
 debian/patches/path_to_cl.patch    |   10 +++----
 debian/patches/series              |    1 +
 debian/patches/system_libusb.patch |   53 ++++++++++++++++++++++++++++++++++++
 4 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1a475ee..fd65de7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+cgminer (3.4.2-1) unstable; urgency=low
+
+  * New upstream release.
+  * system_libusb.patch added to use system libjansson and libusb
+
+ -- Scott Howard <showard at debian.org>  Tue, 10 Sep 2013 13:22:49 -0400
+
 cgminer (3.3.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/path_to_cl.patch b/debian/patches/path_to_cl.patch
index 9810768..32a2a79 100644
--- a/debian/patches/path_to_cl.patch
+++ b/debian/patches/path_to_cl.patch
@@ -3,10 +3,11 @@ Author: Dmitry Smirnov <onlyjob at member.fsf.org>
 Forwarded: not-needed
 Description: don't install non-executable files to /usr/bin
 
---- a/configure.ac
-+++ b/configure.ac
-@@ -403,9 +403,9 @@
- if test "x$prefix" = xNONE; then
+Index: cgminer-3.4.2/configure.ac
+===================================================================
+--- cgminer-3.4.2.orig/configure.ac	2013-09-10 14:41:07.781861664 -0400
++++ cgminer-3.4.2/configure.ac	2013-09-10 14:41:07.773861664 -0400
+@@ -400,7 +400,7 @@
  	prefix=/usr/local
  fi
  
@@ -15,4 +16,3 @@ Description: don't install non-executable files to /usr/bin
  
  AC_DEFINE_UNQUOTED([PHATK_KERNNAME], ["phatk121016"], [Filename for phatk kernel])
  AC_DEFINE_UNQUOTED([POCLBM_KERNNAME], ["poclbm130302"], [Filename for poclbm kernel])
- AC_DEFINE_UNQUOTED([DIAKGCN_KERNNAME], ["diakgcn121016"], [Filename for diakgcn kernel])
diff --git a/debian/patches/series b/debian/patches/series
index f3f5c7e..7a7654a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+system_libusb.patch
 path_to_cl.patch
diff --git a/debian/patches/system_libusb.patch b/debian/patches/system_libusb.patch
new file mode 100644
index 0000000..3ae5e04
--- /dev/null
+++ b/debian/patches/system_libusb.patch
@@ -0,0 +1,53 @@
+Description: use system jansson and usb libraries
+Author: Scott Howard <showard at debian.org>
+Index: cgminer-3.4.2/configure.ac
+===================================================================
+--- cgminer-3.4.2.orig/configure.ac	2013-09-10 14:52:55.245878478 -0400
++++ cgminer-3.4.2/configure.ac	2013-09-10 14:53:22.381879123 -0400
+@@ -320,10 +320,9 @@
+ AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])
+ AM_CONDITIONAL([HAVE_x86_64], [test x$have_x86_64 = xtrue])
+ 
+-AC_CONFIG_SUBDIRS([compat/libusb-1.0])
+ if test "x$want_usbutils" != xfalse; then
+ 	AC_DEFINE([USE_USBUTILS], [1], [Defined to 1 if usbutils support required])
+-	LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"
++	LIBUSB_LIBS="-lusb-1.0"
+ 	if test "x$have_linux" = "xtrue"; then
+ 		PKG_CHECK_MODULES([UDEV], [libudev], LIBUSB_LIBS+=" -ludev", [AC_MSG_ERROR([Missing required libudev dev])])
+ 	fi
+@@ -331,7 +330,7 @@
+ 	LIBUSB_LIBS=""
+ fi
+ 
+-JANSSON_LIBS="compat/jansson/libjansson.a"
++JANSSON_LIBS="-ljansson"
+ 
+ PKG_PROG_PKG_CONFIG()
+ 
+Index: cgminer-3.4.2/Makefile.am
+===================================================================
+--- cgminer-3.4.2.orig/Makefile.am	2013-09-10 14:52:55.245878478 -0400
++++ cgminer-3.4.2/Makefile.am	2013-09-10 14:52:55.237878478 -0400
+@@ -1,10 +1,10 @@
+ 
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-JANSSON_INCLUDES= -I$(top_srcdir)/compat/jansson
++JANSSON_INCLUDES= -I/usr/include
+ 
+ if WANT_USBUTILS
+-USBUTILS_INCLUDES = -I$(top_srcdir)/compat/libusb-1.0/libusb
++USBUTILS_INCLUDES = -I/usr/include/libusb-1.0
+ else
+ USBUTILS_INCLUDES =
+ endif
+@@ -16,7 +16,7 @@
+ 		  bitforce-firmware-flash.c hexdump.c ASIC-README \
+ 		  01-cgminer.rules GPU-README
+ 
+-SUBDIRS		= lib compat ccan
++SUBDIRS		= lib ccan
+ 
+ INCLUDES	= $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES) $(USBUTILS_INCLUDES)
+ 

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