From eb86eaf06e75f903830e8d732b338d059bf4447d Mon Sep 17 00:00:00 2001
From: "J. Peter Mugaas" <jpmugaas@suddenlink.net>
Date: Sun, 5 Feb 2017 13:18:54 -0500
Subject: [PATCH] =?UTF-8?q?Restore=20libusb-no=20since=20that=20Windows=20?=
 =?UTF-8?q?10=20only=20seems=20to=20work=20with=20that=20=E2=80=A6=20(#215?=
 =?UTF-8?q?4)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Restore libusb-no since that Windows 10 only seems to work with that flag.  Added note about this.

* formatting fixes.

* More formatting fixes.
---
 mingw-w64-libgphoto2/PKGBUILD | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/mingw-w64-libgphoto2/PKGBUILD b/mingw-w64-libgphoto2/PKGBUILD
index 0ef5051386..6f3e3f57da 100644
--- a/mingw-w64-libgphoto2/PKGBUILD
+++ b/mingw-w64-libgphoto2/PKGBUILD
@@ -4,7 +4,7 @@ _realname=libgphoto2
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=2.5.12
-pkgrel=1
+pkgrel=2
 pkgdesc="libgphoto2 is a free, redistributable, ready to use set of digital camera software applications for Unix-like system. (mingw-w64)"
 arch=('any')
 url="http://gphoto.org/proj/libgphoto2/"
@@ -17,17 +17,16 @@ depends=("${MINGW_PACKAGE_PREFIX}-libsystre"
          "${MINGW_PACKAGE_PREFIX}-libusb")
 makedepends=("${MINGW_PACKAGE_PREFIX}-gcc"
              "${MINGW_PACKAGE_PREFIX}-libtool")
-source=(#https://sourceforge.net/projects/gphoto/files/libgphoto/${pkgver}/${_realname}-${pkgver}.tar.gz{,.asc}
-        ${_realname}-${pkgver}.tar.gz::https://github.com/gphoto/libgphoto2/archive/${_realname}-${pkgver//./_}-release.tar.gz
+source=(https://sourceforge.net/projects/gphoto/files/libgphoto/${pkgver}/${_realname}-${pkgver}.tar.gz
         libgphoto2-gp_system_filename-fix.patch
         libgphoto2-use-pkg-config-for-gd.patch) 
-sha256sums=('82118e8abaf54100c6be1d41489f9a26d951c7a6194db6f11efa60274a6f53a7'
+sha256sums=('50afdb74016ef26bf8d3d87e708dc6ffe9bd76697eff417e3dd575e7d8558022'
             '27c558cdf88bee6ce1f3f564d6dfbc0b78809c33b98d20c9e58e40e335d7b0dd'
             '16036711f9c656e3988bc3c7b3e5209db3ad1163048cc7a0139e3e882d52f7c2')
 validpgpkeys=('7C4AFD61D8AAE7570796A5172209D6902F969C95') # Marcus Meissner 
 
 prepare() {
-  cd "${srcdir}/${_realname}-${_realname}-${pkgver//./_}-release"
+  cd "${srcdir}/${_realname}-${pkgver}"
   patch -Np1 -i "${srcdir}/libgphoto2-gp_system_filename-fix.patch"
   patch -Np1 -i "${srcdir}/libgphoto2-use-pkg-config-for-gd.patch"
   autoreconf -fiv
@@ -36,14 +35,21 @@ prepare() {
 build() {
   [[ -d ${srcdir}/build-${MINGW_CHOST} ]] && rm -rf ${srcdir}/build-${MINGW_CHOST}
   mkdir -p ${srcdir}/build-${MINGW_CHOST} && cd ${srcdir}/build-${MINGW_CHOST}
-  ../${_realname}-${_realname}-${pkgver//./_}-release/configure \
+  #Note: --with-libusb=no is required for Windows 10 to work.
+  ../${_realname}-${pkgver}/configure \
     --prefix="${MINGW_PREFIX}"      \
     --build=${MINGW_CHOST}          \
     --host=${MINGW_CHOST}           \
+    --with-libusb=no \
     --with-gdlib=auto
   make
 }
 
+check() {
+  cd "${srcdir}/build-${MINGW_CHOST}"
+  make check
+}
+
 package() {
   cd "${srcdir}/build-${MINGW_CHOST}"
   make DESTDIR=${pkgdir} install
@@ -57,7 +63,7 @@ package() {
   # install profile script
   mkdir -p "${pkgdir}${MINGW_PREFIX}"/etc/profile.d
 
-cat > ${pkgdir}${MINGW_PREFIX}/etc/profile.d/${_realname}.sh <<EOF
+  cat > ${pkgdir}${MINGW_PREFIX}/etc/profile.d/${_realname}.sh <<EOF
 export CAMLIBS=${MINGW_PREFIX}/lib/${_realname}/${pkgver}
 export IOLIBS=${MINGW_PREFIX}/lib/${_realname}_port/0.12.0
 EOF