upgpkg: mingw-w64-hidapi 0.9.0-1

upstream release

3 files changed, 25 insertions, 57 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 01bb081a1f21..665143d30455 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,19 @@
 pkgbase = mingw-w64-hidapi
 	pkgdesc = Simple library for communicating with USB and Bluetooth HID devices (mingw-w64)
-	pkgver = 0.8.0rc1
-	pkgrel = 2
-	url = http://www.signal11.us/oss/hidapi/
+	pkgver = 0.9.0
+	pkgrel = 1
+	url = https://github.com/libusb/hidapi
 	arch = any
 	license = GPL3
 	license = BSD
 	license = custom
-	makedepends = mingw-w64-gcc
+	makedepends = mingw-w64-configure
 	depends = mingw-w64-crt
-	options = staticlibs
-	options = !makeflags
 	options = !strip
 	options = !buildflags
-	source = https://github.com/signal11/hidapi/archive/hidapi-0.8.0-rc1.tar.gz
-	source = disable-hidtest.patch
-	md5sums = 069f9dd746edc37b6b6d0e3656f47199
-	md5sums = ba66138154dba31f7ed17eb17dbf0cc7
+	options = staticlibs
+	source = https://github.com/libusb/hidapi/archive/hidapi-0.9.0.tar.gz
+	sha256sums = 630ee1834bdd5c5761ab079fd04f463a89585df8fcae51a7bfe4229b1e02a652
 
 pkgname = mingw-w64-hidapi
 
diff --git a/PKGBUILD b/PKGBUILD
index c2270e0ed9bf..55e7d897ade0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,41 @@
 # Maintainer: Niels Martignène <niels.martignene@gmail.com>
 
 pkgname=mingw-w64-hidapi
-pkgver=0.8.0rc1
-_hidapiver=0.8.0-rc1
-pkgrel=2
+pkgver=0.9.0
+pkgrel=1
 pkgdesc="Simple library for communicating with USB and Bluetooth HID devices (mingw-w64)"
 arch=(any)
-url="http://www.signal11.us/oss/hidapi/"
+url="https://github.com/libusb/hidapi"
 license=('GPL3' 'BSD' 'custom')
 depends=('mingw-w64-crt')
-makedepends=('mingw-w64-gcc')
-options=('staticlibs' '!makeflags' '!strip' '!buildflags')
-source=("https://github.com/signal11/hidapi/archive/hidapi-$_hidapiver.tar.gz"
-        'disable-hidtest.patch')
-md5sums=('069f9dd746edc37b6b6d0e3656f47199'
-         'ba66138154dba31f7ed17eb17dbf0cc7')
+makedepends=('mingw-w64-configure')
+options=('!strip' '!buildflags' 'staticlibs')
+source=("https://github.com/libusb/hidapi/archive/hidapi-${pkgver}.tar.gz")
+sha256sums=('630ee1834bdd5c5761ab079fd04f463a89585df8fcae51a7bfe4229b1e02a652')
 
-_architectures=('i686-w64-mingw32' 'x86_64-w64-mingw32')
-
-prepare() {
-  cd "${srcdir}/hidapi-hidapi-${_hidapiver}"
-
-  patch -Np1 <"${srcdir}/disable-hidtest.patch"
-}
+_architectures="i686-w64-mingw32 x86_64-w64-mingw32"
 
 build() {
-  unset LDFLAGS
-  cd "${srcdir}/hidapi-hidapi-${_hidapiver}"
+  cd "${srcdir}/hidapi-hidapi-${pkgver}"
 
   ./bootstrap
-  for _arch in "${_architectures[@]}"; do
-    mkdir -p build-${_arch}
-    pushd build-${_arch}
-
-    ../configure --prefix=/usr/${_arch} --host=${_arch}
+  for _arch in ${_architectures}; do
+    mkdir -p build-${_arch} && pushd build-${_arch}
+    ${_arch}-configure ..
     make
-
     popd
   done
 }
 
 package () {
-  cd "${srcdir}/hidapi-hidapi-${_hidapiver}"
-
-  for _arch in "${_architectures[@]}"; do
-    pushd build-${_arch}
-
-    make install DESTDIR="${pkgdir}/"
-    rm -rf "${pkgdir}/usr/${_arch}/share"
-    ${_arch}-strip --strip-unneeded "${pkgdir}/usr/${_arch}/bin/"*.dll
-    ${_arch}-strip -g "${pkgdir}/usr/${_arch}/lib/"*.a
-
-    popd
+  for _arch in ${_architectures}; do
+    cd "${srcdir}/hidapi-hidapi-${pkgver}/build-${_arch}"
+    make DESTDIR="${pkgdir}" install
+    ${_arch}-strip --strip-unneeded "$pkgdir"/usr/${_arch}/bin/*.dll
+    ${_arch}-strip -g "$pkgdir"/usr/${_arch}/lib/*.a
   done
 
   mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}"
+  cd "${srcdir}/hidapi-hidapi-${pkgver}"
   install -m644 LICENSE.txt LICENSE-bsd.txt LICENSE-orig.txt "${pkgdir}/usr/share/licenses/${pkgname}/"
 }
diff --git a/disable-hidtest.patch b/disable-hidtest.patch
deleted file mode 100644
index 1fdf17826920..000000000000
--- a/disable-hidtest.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/Makefile.am	2013-10-07 00:43:37.000000000 +0200
-+++ b/Makefile.am	2014-01-12 16:45:43.463262352 +0100
-@@ -31,8 +31,6 @@
- SUBDIRS += windows
- endif
- 
--SUBDIRS += hidtest
--
- if BUILD_TESTGUI
- SUBDIRS += testgui
- endif