[arch-commits] Commit in cgminer/trunk (PKGBUILD)

[Felix Yan]

    Date: Saturday, August 31, 2013 @ 18:26:33
  Author: fyan
Revision: 96553

upgpkg: cgminer 3.4.1-1

Modified:
  cgminer/trunk/PKGBUILD

----------+
 PKGBUILD |   19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-31 16:05:52 UTC (rev 96552)
+++ PKGBUILD	2013-08-31 16:26:33 UTC (rev 96553)
@@ -5,7 +5,7 @@
 # Contributor: David Manouchehri <david at davidmanouchehri.com>
 
 pkgname=cgminer
-pkgver=3.4.0
+pkgver=3.4.1
 pkgrel=1
 pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins"
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
@@ -25,13 +25,22 @@
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # Use in-tree jansson since it is not compatible with jansson 2.0
-  #sed -e 's/^AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)$/request_jansson=true/' -i configure.ac
+  # We have latest jansson and libusb - just use them
+  sed "s|ac_subdirs_all='compat/libusb\-1.0'||" -i ./configure
+  sed 's|subdirs="$subdirs compat/libusb\-1.0"||' -i ./configure
+  sed 's|LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"|LIBUSB_LIBS=-lusb-1.0|' -i ./configure
+  sed 's|JANSSON_LIBS="compat/jansson/libjansson.a"|JANSSON_LIBS=-ljansson|' -i ./configure
+  sed 's|compat/Makefile compat/jansson/Makefile||' -i ./configure
 
+  sed 's|JANSSON_INCLUDES = -I$(top_srcdir)/compat/jansson||' -i ./Makefile.in
+  sed 's|USBUTILS_INCLUDES = -I$(top_srcdir)/compat/libusb\-1.0/libusb|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' -i ./Makefile.in
+  sed 's|SUBDIRS = lib compat ccan|SUBDIRS = lib ccan|' -i ./Makefile.in
+
+  rm -r compat
+
   # Here you may want to use custom CFLAGS
   #export CFLAGS="-O2 -march=native -mtune=native -msse2"
   
-  #./autogen.sh
   ./configure \
     --prefix=/usr \
     --enable-scrypt \
@@ -58,6 +67,6 @@
   install -Dm644 $pkgname.conf "$pkgdir"/etc/$pkgname.conf
 }
 
-sha512sums=('2f308c9285755b62608da4a6be3942d08b6cfff218238dbb4c15da7d02c8f2ac46cd7a9fbd69b7a46faa11962a937ba6327aa03852c291e69ff6158e50c1e5b6'
+sha512sums=('db648f18002ce558454fa0e4aa948146dcaeb473728c15503c8e908fc26507df25602edc5b8295cf578327bf43f99f9846d9580f9c3b4b08b03a0ca24da8f15c'
             '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
             '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')