Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

3 files changed, 40 insertions, 24 deletions

diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
index d3f056dbc..09608d1fa 100644
--- a/libre/cgminer-libre/PKGBUILD
+++ b/libre/cgminer-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 100433 2013-11-04 11:01:53Z fyan $
+# $Id: PKGBUILD 100525 2013-11-05 13:41:39Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: monson <holymonson@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -7,7 +7,7 @@
 
 _pkgname=cgminer
 pkgname=cgminer-libre
-pkgver=3.7.0
+pkgver=3.7.2
 #_pkgver=3.6.6
 _pkgver=$pkgver
 pkgrel=1
@@ -15,39 +15,55 @@ pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and deri
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
 license=('GPL3')
 arch=('i686' 'x86_64' 'mips64el')
+depends=('curl' 'mesa-libcl' 'libusbx' 'jansson')
+makedepends=('opencl-headers' 'git')
 replaces=$_pkgname
 conflicts=$_pkgname
 provides=$_pkgname=$pkgver
-depends=('curl' 'mesa-libcl' 'libusbx' 'jansson')
-makedepends=('opencl-headers')
-source=("http://ck.kolivas.org/apps/$_pkgname/$_pkgname-${_pkgver}.tar.bz2"
+source=("git+https://github.com/ckolivas/${_pkgname}.git#tag=v$_pkgver"
         "$_pkgname.conf.d"
         "$_pkgname.service")
 backup=("etc/conf.d/$_pkgname" "etc/$_pkgname.conf")
 
 [ "$CARCH" == "x86_64" ] && makedepends+=('yasm')
 
-build() {
-  cd "$srcdir/$_pkgname-$_pkgver"
-
+prepare() {
+  cd $_pkgname
   # We have latest jansson and libusb - just use them
-  sed "s|ac_subdirs_all='compat/libusb\-1.0\ncompat/jansson-2.5'||" -i ./configure
-  sed 's|subdirs="$subdirs compat/libusb\-1.0"||' -i ./configure
-  sed 's|subdirs="$subdirs compat/jansson\-2.5"||' -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-2.5/src/.libs/libjansson.a"|JANSSON_LIBS=-ljansson|' -i ./configure
-  sed 's|compat/Makefile ||' -i ./configure
 
-  sed 's|JANSSON_INCLUDES = .*||' -i ./Makefile.in
-  sed 's|USBUTILS_INCLUDES = .*|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' -i ./Makefile.in
-  sed 's|SUBDIRS = lib compat ccan|SUBDIRS = lib ccan|' -i ./Makefile.in
+  sed -e 's|^AC_CONFIG_SUBDIRS.*compat/jansson-2\.5.*||' \
+      -e 's|JANSSON_LIBS="compat/jansson-2\.5/src/\.libs/libjansson\.a"|JANSSON_LIBS=-ljansson|' \
+      -e 's|compat/Makefile||' \
+      -i ./configure.ac
+
+  sed -e 's|^JANSSON_INCLUDES= .*||' \
+      -e 's|^USBUTILS_INCLUDES = .*|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' \
+      -e 's|^SUBDIRS.*|SUBDIRS = lib ccan|' \
+      -i ./Makefile.am
+
+  #sed "s|ac_subdirs_all='compat/libusb\-1.0\ncompat/jansson-2.5'||" -i ./configure
+  #sed 's|subdirs="$subdirs compat/libusb\-1.0"||' -i ./configure
+  #sed 's|subdirs="$subdirs compat/jansson\-2.5"||' -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-2.5/src/.libs/libjansson.a"|JANSSON_LIBS=-ljansson|' -i ./configure
+  #sed 's|compat/Makefile ||' -i ./configure
+
+  #sed 's|JANSSON_INCLUDES = .*||' -i ./Makefile.in
+  #sed 's|USBUTILS_INCLUDES = .*|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
+}
 
+build() {
+  cd $_pkgname
+  
   # Here you may want to use custom CFLAGS
   #export CFLAGS="-O2 -march=native -mtune=native -msse2"
   
-  ./configure \
+  # ./configure \
+
+  ./autogen.sh \
     --prefix=/usr \
     --enable-scrypt \
     --enable-opencl \
@@ -67,7 +83,7 @@ build() {
 }
 
 package() {
-  cd "$srcdir/$_pkgname-$_pkgver"
+  cd $_pkgname
 
   make DESTDIR="$pkgdir" install
 
@@ -80,6 +96,6 @@ package() {
   install -Dm644 $_pkgname.conf "$pkgdir"/etc/$_pkgname.conf
 }
 
-sha512sums=('40abe81952a67b4143a5f51e52d3a7787832ba36723ddc8f926b8f0dd190c9a4d1118c120005160ad8d5326a4e0c77c4334a269827170000a96642780a0a54be'
+sha512sums=('SKIP'
             '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
             '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
diff --git a/libre/xbmc-libre/PKGBUILD b/libre/xbmc-libre/PKGBUILD
index cb48c5d90..23d389d52 100644
--- a/libre/xbmc-libre/PKGBUILD
+++ b/libre/xbmc-libre/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 94534 2013-07-26 12:25:32Z spupykin $
+# $Id: PKGBUILD 100487 2013-11-05 08:57:03Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -10,7 +10,7 @@ _prefix=/usr
 _pkgname=xbmc
 pkgname=xbmc-libre
 pkgver=12.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A software media player and entertainment hub for digital media, with libarchive recommendation"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
diff --git a/pcr/libquvi-scripts-current/PKGBUILD b/pcr/libquvi-scripts-current/PKGBUILD
index 2c480bd45..851470439 100644
--- a/pcr/libquvi-scripts-current/PKGBUILD
+++ b/pcr/libquvi-scripts-current/PKGBUILD
@@ -4,7 +4,7 @@
 pkgname=libquvi-scripts-current
 _pkgname=libquvi-scripts
 provides=(libquvi-scripts)
-pkgver=0.9.20131012
+pkgver=0.9.20131104
 pkgrel=1
 pkgdesc='Library for parsing video download links.'
 arch=('any')
@@ -24,5 +24,5 @@ package() {
   cd "${_pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('bd11a7946212b3e42f11c69afacc371a'
+md5sums=('0ddb9e392b46cee0e7a4af260bc1a1a3'
          'SKIP')