From: Gerhard Sittig <redacted>
Date: Wed, 23 Nov 2022 15:12:47 +0000 (+0100)
Subject: cross-compile/mingw: update sigrok specific libusb patch
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=177ed39a41dc16e470e08170e4255b37213aa9bf;p=sigrok-util.git

cross-compile/mingw: update sigrok specific libusb patch

Catch up with recent mainline MXE as of 2022-11-23. Unbreak the
autoreconf(1) invocation before the configure call. Don't force
a specific libusb version any longer (MXE ships 1.0.26 by now).
---

diff --git a/cross-compile/mingw/libusb1_upgrade.patch b/cross-compile/mingw/libusb1_upgrade.patch
index dd2d4af..8dc8646 100644
--- a/cross-compile/mingw/libusb1_upgrade.patch
+++ b/cross-compile/mingw/libusb1_upgrade.patch
@@ -24,27 +24,9 @@ index ab01bf69..53aed36e 100644
  define $(PKG)_BUILD
 -    cd '$(1)' && ./configure \
 +    cd '$(1)' && autoreconf -i && ./configure \
-         $(MXE_CONFIGURE_OPTS) \
-         CFLAGS=-D_WIN32_WINNT=0x0500
+         $(MXE_CONFIGURE_OPTS)
      $(MAKE) -C '$(1)' -j '$(JOBS)' install
-
-
-diff --git a/src/libusb1.mk b/src/libusb1.mk
-index ab01bf69..53aed36e 100644
---- a/src/libusb1.mk
-+++ b/src/libusb1.mk
-@@ -4,8 +4,8 @@ PKG             := libusb1
- $(PKG)_WEBSITE  := https://libusb.info/
- $(PKG)_DESCR    := LibUsb-1.0
- $(PKG)_IGNORE   :=
--$(PKG)_VERSION  := 1.0.24
--$(PKG)_CHECKSUM := 7efd2685f7b327326dcfb85cee426d9b871fd70e22caa15bb68d595ce2a2b12a
-+$(PKG)_VERSION  := 1.0.25
-+$(PKG)_CHECKSUM := 8a28ef197a797ebac2702f095e81975e2b02b2eeff2774fa909c78a74ef50849
- $(PKG)_SUBDIR   := libusb-$($(PKG)_VERSION)
- $(PKG)_FILE     := libusb-$($(PKG)_VERSION).tar.bz2
- $(PKG)_URL      := https://$(SOURCEFORGE_MIRROR)/project/libusb/libusb-1.0/libusb-$($(PKG)_VERSION)/$($(PKG)_FILE)
-
+ 
 
 diff --git a/src/libusb1-1-fixes.patch b/src/libusb1-1-fixes.patch
 new file mode 100644