bump version to 1.0.24, also use mingw-w64-configure

2 files changed, 11 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 156e43a8d43d..f67b415a8cd2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,19 @@
 pkgbase = mingw-w64-libusb
 	pkgdesc = Library that provides generic access to USB devices (mingw-w64)
-	pkgver = 1.0.23
+	pkgver = 1.0.24
 	pkgrel = 1
 	url = http://libusb.info
 	arch = any
 	license = LGPL
-	makedepends = mingw-w64-gcc
+	makedepends = mingw-w64-configure
 	depends = mingw-w64-crt
 	conflicts = mingw-w64-libusbx
 	replaces = mingw-w64-libusbx
 	options = !strip
 	options = staticlibs
 	options = !buildflags
-	source = https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.tar.bz2
-	sha256sums = db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d
+	source = https://github.com/libusb/libusb/releases/download/v1.0.24/libusb-1.0.24.tar.bz2
+	sha256sums = 7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a
 
 pkgname = mingw-w64-libusb
 
diff --git a/PKGBUILD b/PKGBUILD
index e84caea78e8e..a21cf2e2b730 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,43 +2,37 @@
 # Contributor: xantares <xantares09 at hotmail dot com>
 
 pkgname=mingw-w64-libusb
-pkgver=1.0.23
+pkgver=1.0.24
 pkgrel=1
 pkgdesc="Library that provides generic access to USB devices (mingw-w64)"
 arch=(any)
 url="http://libusb.info"
 license=('LGPL')
 depends=('mingw-w64-crt')
-makedepends=('mingw-w64-gcc')
+makedepends=('mingw-w64-configure')
 conflicts=('mingw-w64-libusbx')
 replaces=('mingw-w64-libusbx')
 options=('!strip' 'staticlibs' '!buildflags')
 source=("https://github.com/libusb/libusb/releases/download/v${pkgver}/libusb-${pkgver}.tar.bz2")
-sha256sums=('db11c06e958a82dac52cf3c65cb4dd2c3f339c8a988665110e0d24d19312ad8d')
+sha256sums=('7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a')
 
 _architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
 
 build() {
-  unset LDFLAGS
-  cd "libusb-${pkgver}"
+  cd "${srcdir}/libusb-${pkgver}"
   for _arch in "${_architectures[@]}"; do
     mkdir -p build-${_arch} && pushd build-${_arch}
-    ../configure --prefix=/usr/${_arch} \
-                 --host=${_arch} \
-                 --enable-shared
-    # They broke parallel building in libusb 1.20
-    make -j1
+    ${_arch}-configure ..
+    make
     popd
   done
 }
 
 package () {
-  cd "libusb-${pkgver}"
   for _arch in "${_architectures[@]}"; do
-    pushd build-${_arch}
+    cd "${srcdir}/libusb-$pkgver/build-${_arch}"
     make install DESTDIR="${pkgdir}"
     ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll
     ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
-    popd
   done
 }