libusb: update to 1.0.27

2024-02-08 06:54:08 +00:00 · 2024-02-08 06:54:08 +00:00 · db6517eb5a
commit db6517eb5a
parent 82e4316b30
34 changed files with 81 additions and 140 deletions
--- a/mingw-w64-aravis/PKGBUILD
+++ b/mingw-w64-aravis/PKGBUILD
@ -9,7 +9,7 @@ pkgname=(
 pkgver=0.8.30
 pkgrel=1
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 msys2_references=(
  'aur: aravis'
 )
--- a/mingw-w64-avrdude/PKGBUILD
+++ b/mingw-w64-avrdude/PKGBUILD
@ -7,7 +7,7 @@ pkgver=7.0
 pkgrel=1
 pkgdesc='Software for programming Atmel AVR Microcontrollers (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.nongnu.org/avrdude/"
 license=('GPL')
 makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
--- a/mingw-w64-bscan-spi-bitstreams/PKGBUILD
+++ b/mingw-w64-bscan-spi-bitstreams/PKGBUILD
@ -5,11 +5,11 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=1.0
 pkgrel=1
-pkgdesc="JTAG-SPI proxy bitstreams to be used with the OpenOCD jtagspi flash driver"
+pkgdesc="JTAG-SPI proxy bitstreams to be used with the OpenOCD jtagspi flash driver (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url="https://github.com/quartiq/bscan_spi_bitstreams"
-license=('MIT')
+license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-openocd")
 source=("${_realname}.zip::https://github.com/quartiq/bscan_spi_bitstreams/archive/bee624dda0b8b44a31a527be14bc9a0c65d589a4.zip")
 sha256sums=('8cdbf549adee9766c591b6fee258a41a93cc2378579e9b3b71073c2a2c3c614f')
--- a/mingw-w64-dfu-programmer/PKGBUILD
+++ b/mingw-w64-dfu-programmer/PKGBUILD
@ -7,7 +7,7 @@ pkgver=1.1.0
 pkgrel=1
 pkgdesc='Device firmware update based USB programmer for Atmel chips (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 license=('spdx:GPL-2.0-or-later')
 url='https://github.com/dfu-programmer/dfu-programmer'
 depends=("${MINGW_PACKAGE_PREFIX}-libusb")
--- a/mingw-w64-dfu-util/PKGBUILD
+++ b/mingw-w64-dfu-util/PKGBUILD
@ -7,7 +7,7 @@ pkgver=0.11
 pkgrel=1
 pkgdesc='Device firmware upgrade utilities (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 license=('GPL2')
 groups=("${MINGW_PACKAGE_PREFIX}-eda")
 url='https://dfu-util.sourceforge.io/'
--- a/mingw-w64-flashrom/PKGBUILD
+++ b/mingw-w64-flashrom/PKGBUILD
@ -7,7 +7,7 @@ pkgver=1.2
 pkgrel=3
 pkgdesc='Utility for detecting, reading, writing, verifying and erasing flash chips (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url='https://www.flashrom.org/Flashrom'
 license=('GPL2')
 depends=("${MINGW_PACKAGE_PREFIX}-libftdi"
--- a/mingw-w64-gphoto2/PKGBUILD
+++ b/mingw-w64-gphoto2/PKGBUILD
@ -7,9 +7,10 @@ pkgver=2.5.28
 pkgrel=1
 pkgdesc="The gphoto2 commandline tool for accessing and controlling digital cameras (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='http://www.gphoto.org/'
-license=('GNU')
+msys2_repository_url="https://github.com/gphoto/gphoto2"
+license=('spdx:GPL-2.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-libgphoto2"
         "${MINGW_PACKAGE_PREFIX}-libiconv"
         "${MINGW_PACKAGE_PREFIX}-libltdl"
--- a/mingw-w64-heimdall/PKGBUILD
+++ b/mingw-w64-heimdall/PKGBUILD
@ -10,9 +10,9 @@ pkgrel=2
 _commit='3997d5cc607e6c603c6e7c0d07e42e9868c62af2'
 pkgdesc="Heimdall is a cross-platform open-source tool suite used to flash firmware (aka ROMs) onto Samsung mobile devices."
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://glassechidna.com.au/heimdall/"
-license=('MIT')
+license=('spdx:MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
          "${MINGW_PACKAGE_PREFIX}-libusb"
          "${MINGW_PACKAGE_PREFIX}-qt5-base")
--- a/mingw-w64-hid-bootloader-cli/PKGBUILD
+++ b/mingw-w64-hid-bootloader-cli/PKGBUILD
@ -7,7 +7,7 @@ pkgver=210130
 pkgrel=1
 pkgdesc='LUFA HID Bootloader CLI (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 license=('GPL3')
 url='https://github.com/abcminiuser/lufa'
 depends=("${MINGW_PACKAGE_PREFIX}-libusb-compat")
--- a/mingw-w64-icesprog/PKGBUILD
+++ b/mingw-w64-icesprog/PKGBUILD
@ -7,7 +7,7 @@ pkgver=1.1.1
 pkgrel=2
 pkgdesc="iCESugar FPGA Board programming tool (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/wuxx/icesugar/tree/master/tools/"
 license=('GPLv2+')
 groups=("${MINGW_PACKAGE_PREFIX}-eda")
--- a/mingw-w64-libftdi/PKGBUILD
+++ b/mingw-w64-libftdi/PKGBUILD
@ -7,7 +7,7 @@ pkgver=1.5
 pkgrel=7
 pkgdesc='Library to talk to FTDI chips, with Python 3 bindings (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://www.intra2net.com/en/developer/libftdi/"
 license=('LGPL', 'GPL')
 makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
--- a/mingw-w64-libgphoto2/PKGBUILD
+++ b/mingw-w64-libgphoto2/PKGBUILD
@ -7,7 +7,7 @@ pkgver=2.5.31
 pkgrel=2
 pkgdesc="The libgphoto2 camera access and control library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="http://gphoto.org/proj/libgphoto2/"
 license=("spdx:LGPL-2.1-or-later")
 depends=("${MINGW_PACKAGE_PREFIX}-libsystre"
@ -19,8 +19,8 @@ depends=("${MINGW_PACKAGE_PREFIX}-libsystre"
         "${MINGW_PACKAGE_PREFIX}-libiconv"
         "${MINGW_PACKAGE_PREFIX}-curl"
         "${MINGW_PACKAGE_PREFIX}-libltdl")
-makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-cc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools"
             "${MINGW_PACKAGE_PREFIX}-doxygen")
 source=("https://github.com/gphoto/libgphoto2/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.xz"{,.asc}
        "libgphoto2-gp_system_filename-fix.patch"
--- a/mingw-w64-libgusb/PKGBUILD
+++ b/mingw-w64-libgusb/PKGBUILD
@ -7,29 +7,25 @@ pkgver=0.4.8
 pkgrel=1
 pkgdesc="GLib wrapper around libusb1 (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://github.com/hughsie/libgusb"
 msys2_references=(
  'archlinux: libgusb'
 )
-url="https://github.com/hughsie/libgusb"
 license=('spdx:LGPL-2.1-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-libusb"
         "${MINGW_PACKAGE_PREFIX}-json-glib"
         "${MINGW_PACKAGE_PREFIX}-glib2")
-makedepends=("${MINGW_PACKAGE_PREFIX}-pkgconf"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-meson"
+             "${MINGW_PACKAGE_PREFIX}-pkgconf"
             "${MINGW_PACKAGE_PREFIX}-python-setuptools"
             "${MINGW_PACKAGE_PREFIX}-vala"
             "${MINGW_PACKAGE_PREFIX}-gtk-doc"
-             "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-source=(${_realname}-${pkgver}.tar.gz::"https://github.com/hughsie/${_realname}/archive/${pkgver}.tar.gz")
+             "${MINGW_PACKAGE_PREFIX}-gobject-introspection")
+source=("https://github.com/hughsie/${_realname}/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('9a1fb0d46e4b1ca7ee777ed8177b344e50a849594cd98b51a38a512bef4b3342')

-prepare() {
-  cd "${_realname}-${pkgver}"
-}
-
 build() {
  mkdir -p build-${MSYSTEM} && cd build-${MSYSTEM}

--- a/mingw-w64-libjaylink-git/PKGBUILD
+++ b/mingw-w64-libjaylink-git/PKGBUILD
@ -9,14 +9,13 @@ pkgver=r175.cfccbc9
 pkgrel=2
 pkgdesc="Shared library written in C to access SEGGER J-Link and compatible devices (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://gitlab.zapb.de/libjaylink/libjaylink"
 license=("GPLv2+")
 depends=("${MINGW_PACKAGE_PREFIX}-libusb")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-autotools"
             "git")
-options=('staticlibs' 'strip')
 _commit="cfccbc9d6763733f1d14dff3c2dc5b75aaef136b"
 source=("git+https://gitlab.zapb.de/libjaylink/libjaylink.git#commit=${_commit}"
        "010-socket.patch")
--- a/mingw-w64-libsidplayfp/PKGBUILD
+++ b/mingw-w64-libsidplayfp/PKGBUILD
@ -7,7 +7,7 @@ pkgver=2.6.0
 pkgrel=1
 pkgdesc="A library to play Commodore 64 music (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/libsidplayfp/libsidplayfp"
 license=('spdx:GPL-2.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-libftdi"
--- a/mingw-w64-libusb-compat-git/PKGBUILD
+++ b/mingw-w64-libusb-compat-git/PKGBUILD
@ -10,14 +10,15 @@ pkgver=r76.b5db9d0
 pkgrel=2
 pkgdesc="Allows applications written for libusb-0.1 to work with libusb-1.0 (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://libusb.info/"
+msys2_repository_url="https://github.com/libusb/libusb-compat-0.1"
 license=('spdx:LGPL-2.1-or-later')
 depends=(${MINGW_PACKAGE_PREFIX}-libusb)
 options=('staticlibs')
-makedepends=("git"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+             "git")
 _commit="b5db9d0"
 source=("${_realname}::git+https://github.com/libusb/libusb-compat-0.1.git#commit=${_commit}")
 sha256sums=('SKIP')
@ -34,8 +35,7 @@ prepare() {
 }

 build() {
-  [[ -d ${srcdir}/build-${CARCH} ]] && rm -rf ${srcdir}/build-${CARCH}
-  mkdir -p ${srcdir}/build-${CARCH} && cd ${srcdir}/build-${CARCH}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}

  ../${_realname}/configure \
      --prefix=${MINGW_PREFIX} \
@ -49,6 +49,6 @@ build() {
 }

 package() {
-  cd "${srcdir}/build-${CARCH}"
+  cd "${srcdir}/build-${MSYSTEM}"
  make DESTDIR="${pkgdir}" install
 }
--- a/mingw-w64-libusb/010-cdecl.patch
+++ b/mingw-w64-libusb/010-cdecl.patch
@ -1,22 +0,0 @@
--- a/libusb/core.c
-+++ b/libusb/core.c
-@@ -2181,7 +2181,7 @@ void API_EXPORTED libusb_set_log_cb(libusb_context *ctx, libusb_log_cb cb,
-  * on this platform
-  * \returns LIBUSB_ERROR_NOT_FOUND if LIBUSB_OPTION_USE_USBDK is valid on this platform but UsbDk is not available
-  */
-int API_EXPORTED libusb_set_option(libusb_context *ctx,
-+int _cdecl libusb_set_option(libusb_context *ctx,
- 	enum libusb_option option, ...)
- {
- 	int arg = 0, r = LIBUSB_SUCCESS;
--- a/libusb/libusb.h
-+++ b/libusb/libusb.h
-@@ -2126,7 +2126,7 @@ enum libusb_option {
- 	LIBUSB_OPTION_MAX = 3
- };
- 
-int LIBUSB_CALL libusb_set_option(libusb_context *ctx, enum libusb_option option, ...);
-+int __cdecl libusb_set_option(libusb_context *ctx, enum libusb_option option, ...);
- 
- #if defined(__cplusplus)
- }
--- a/mingw-w64-libusb/PKGBUILD
+++ b/mingw-w64-libusb/PKGBUILD
@ -3,37 +3,25 @@
 _realname=libusb
 pkgbase=mingw-w64-${_realname}
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-pkgver=1.0.26
+pkgver=1.0.27
 pkgrel=1
 pkgdesc="Library that provides generic access to USB devices (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://libusb.info/"
+msys2_repository_url="https://github.com/libusb/libusb"
 license=("spdx:LGPL-2.1")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc" "${MINGW_PACKAGE_PREFIX}-autotools")
-options=('staticlibs' 'strip')
-source=("https://github.com/libusb/libusb/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.bz2"
-        "fix-dll-exports.patch"
-        "010-cdecl.patch")
-sha256sums=('12ce7a61fc9854d1d2a1ffe095f7b5fac19ddba095c259e6067a46500381b5a5'
-            'e25a317610623df4c020ff904661f52b1de6c9f95f3966aef52cf34886c768b3'
-            '89f47f73705c231eb766ae2ba7357c7569b8b6ff5881e274a4c0ed02c877833b')
+source=("https://github.com/libusb/libusb/releases/download/v${pkgver}/${_realname}-${pkgver}.tar.bz2")
+sha256sums=('ffaa41d741a8a3bee244ac8e54a72ea05bf2879663c098c82fc5757853441575')

 prepare() {
  cd "${srcdir}/${_realname}-${pkgver}"

-  if [[ ${MINGW_PACKAGE_PREFIX} == *-clang-* ]]; then
-    sed -e "s/-mwin32//g" -e "s/-Wl,--add-stdcall-alias//g" -i configure.ac
-  fi
-
-  patch -Nbp1 -i "${srcdir}/fix-dll-exports.patch"
-  patch -Nbp1 -i "${srcdir}/010-cdecl.patch"
-
  autoreconf -fiv
 }

 build() {
-  [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
  mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"

  ../${_realname}-${pkgver}/configure \
--- a/mingw-w64-libusb/fix-dll-exports.patch
+++ b/mingw-w64-libusb/fix-dll-exports.patch
@ -1,10 +0,0 @@
--- a/libusb/Makefile.am	2020-11-07 20:14:02.000000000 -0800
-+++ b/libusb/Makefile.am	2021-10-03 23:25:49.208154100 -0700
-@@ -66,6 +66,7 @@
- 
- if OS_WINDOWS
- OS_SRC = $(OS_WINDOWS_SRC)
-+LT_LDFLAGS+= -export-symbols $(srcdir)/libusb-1.0.def
- 
- include Makefile.am.extra
- 
--- a/mingw-w64-openFPGALoader/PKGBUILD
+++ b/mingw-w64-openFPGALoader/PKGBUILD
@ -7,7 +7,7 @@ pkgver=0.11.0
 pkgrel=1
 pkgdesc="openFPGALoader: universal utility for programming FPGA (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/trabucayre/openFPGALoader"
 license=('spdx:Apache-2.0')
 groups=("${MINGW_PACKAGE_PREFIX}-eda")
@ -18,10 +18,9 @@ depends=(
 makedepends=(
  "${MINGW_PACKAGE_PREFIX}-cc"
  "${MINGW_PACKAGE_PREFIX}-cmake"
-  "${MINGW_PACKAGE_PREFIX}-cc"
 )

-source=("${_realname}::https://codeload.github.com/trabucayre/openFPGALoader/tar.gz/v${pkgver}")
+source=("https://github.com/trabucayre/openFPGALoader/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('a463690358d2510919472c2f460039a304d016a08a45970821e667eea1c48cc8')

 build() {
--- a/mingw-w64-openocd/PKGBUILD
+++ b/mingw-w64-openocd/PKGBUILD
@ -9,7 +9,7 @@ pkgver=0.12.0
 pkgrel=2
 pkgdesc="OpenOCD - Open On-Chip Debugger (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url="https://openocd.org/"
 license=("GPLv2")
 options=('!ccache')
--- a/mingw-w64-python-pyusb/PKGBUILD
+++ b/mingw-w64-python-pyusb/PKGBUILD
@ -7,11 +7,11 @@ pkgver=1.2.1
 pkgrel=3
 pkgdesc="USB access on Python (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url='https://github.com/pyusb/pyusb'
 msys2_references=(
  'pypi: pyusb'
 )
-url='https://github.com/pyusb/pyusb'
 license=('BSD')
 depends=("${MINGW_PACKAGE_PREFIX}-libusb"
         "${MINGW_PACKAGE_PREFIX}-python")
--- a/mingw-w64-rkdeveloptool/PKGBUILD
+++ b/mingw-w64-rkdeveloptool/PKGBUILD
@ -8,11 +8,11 @@ pkgrel=1
 _commit='21b25fd4a70331819b557fe93015b635b9594543'
 pkgdesc="rkdeveloptool is a tool from Rockchip to communicate with Rockusb devices (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='http://opensource.rock-chips.com/wiki_Rkdeveloptool'
 license=('spdx:GPL-2.0-or-later')
-makedepends=("${MINGW_PACKAGE_PREFIX}-autotools"
-             "${MINGW_PACKAGE_PREFIX}-cc"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-autotools"
             git)
 depends=(${MINGW_PACKAGE_PREFIX}-'libusb')
 source=("rkdeveloptool"::"git+https://github.com/rockchip-linux/rkdeveloptool.git#commit=$_commit")
--- a/mingw-w64-rtl-sdr/PKGBUILD
+++ b/mingw-w64-rtl-sdr/PKGBUILD
@ -5,15 +5,15 @@ pkgver=2.0.1
 pkgrel=1
 pkgdesc="Driver for Realtek RTL2832U, allowing general purpose software defined radio (SDR) (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://osmocom.org/projects/rtl-sdr/wiki"
 license=('GPL')
 depends=("${MINGW_PACKAGE_PREFIX}-libusb>=1.0"
         "${MINGW_PACKAGE_PREFIX}-gcc-libs"
         "${MINGW_PACKAGE_PREFIX}-libwinpthread")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
 source=("rtl-sdr.$pkgver.tgz::https://gitea.osmocom.org/sdr/rtl-sdr/archive/v$pkgver.tar.gz")
 sha512sums=('ae481780ed6d084c8fa367c19c1d87007e4d4bf91f183e8e243924aa0369b386f7628f806af74f048978591549c7aeb40e6a5036840ddf52d7008f69edce9271')

--- a/mingw-w64-sidplayfp/PKGBUILD
+++ b/mingw-w64-sidplayfp/PKGBUILD
@ -7,7 +7,7 @@ pkgver=2.6.2
 pkgrel=1
 pkgdesc="Console SID player (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url="https://github.com/libsidplayfp/sidplayfp"
 license=('spdx:GPL-2.0-or-later')
 depends=("${MINGW_PACKAGE_PREFIX}-libsidplayfp")
--- a/mingw-w64-soapyrtlsdr/PKGBUILD
+++ b/mingw-w64-soapyrtlsdr/PKGBUILD
@ -7,7 +7,7 @@ _gitver=soapy-rtl-sdr-$pkgver
 pkgrel=1
 pkgdesc='Soapy SDR plugin for RTL-SDR devices (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 url='https://github.com/pothosware/SoapyRTLSDR'
 license=('MIT')
 depends=("${MINGW_PACKAGE_PREFIX}-soapysdr"
--- a/mingw-w64-spice-gtk/PKGBUILD
+++ b/mingw-w64-spice-gtk/PKGBUILD
@ -5,9 +5,11 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.42
 pkgrel=2
-arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="GTK3 widget for SPICE clients (mingw-w64)"
+arch=('any')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://www.spice-space.org/"
+license=("GPL2")
 depends=("${MINGW_PACKAGE_PREFIX}-cyrus-sasl"
         "${MINGW_PACKAGE_PREFIX}-dbus-glib"
         "${MINGW_PACKAGE_PREFIX}-gobject-introspection"
@ -30,8 +32,6 @@ makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-ninja"
             "${MINGW_PACKAGE_PREFIX}-python-pyparsing"
             "${MINGW_PACKAGE_PREFIX}-python-six")
-license=("GPL2")
-url="https://www.spice-space.org/"
 source=(https://www.spice-space.org/download/gtk/${_realname}-${pkgver}.tar.xz{,.sig}
        002-export-symbols.patch
        003-add-stdcall-attribute.patch)
--- a/mingw-w64-stlink/PKGBUILD
+++ b/mingw-w64-stlink/PKGBUILD
@ -7,14 +7,14 @@ pkgver=1.7.0
 pkgrel=2
 pkgdesc='Firmware programmer for STM32 STLINK v1/v2 protocol'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/stlink-org/stlink'
 license=(BSD)
 depends=("${MINGW_PACKAGE_PREFIX}-libusb")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/stlink-org/stlink/archive/v${pkgver}.tar.gz"
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
+source=("https://github.com/stlink-org/stlink/archive/v${pkgver}/${_realname}-${pkgver}.tar.gz"
        "0001-cmake-find-libusb.patch")
 sha256sums=('57ec1214905aedf59bee7f70ddff02316f64fa9ba5a9b6a3a64952edc5b65855'
            '6b1f278eef5f496c7dfb958089cb65c793b80a52c16c36733803e94c05daa51f')
--- a/mingw-w64-teensy-loader-cli/PKGBUILD
+++ b/mingw-w64-teensy-loader-cli/PKGBUILD
@ -7,9 +7,9 @@ pkgver=2.2
 pkgrel=2
 pkgdesc='Command line loader for PJRC Teensy microcontrollers (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
-license=('GPL3')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://www.pjrc.com/teensy/loader_cli.html'
+license=('GPL3')
 depends=("${MINGW_PACKAGE_PREFIX}-libusb-compat")
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc")
 source=(
--- a/mingw-w64-usbredir/PKGBUILD
+++ b/mingw-w64-usbredir/PKGBUILD
@ -5,22 +5,21 @@ pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.13.0
 pkgrel=1
-arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32' 'clangarm64')
 pkgdesc="Parser for the usbredir protocol (mingw-w64)"
+arch=('any')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
+url="https://www.spice-space.org/"
+license=("spdx:GPL-2.0-or-later AND LGPL-2.1-or-later")
 depends=(
  "${MINGW_PACKAGE_PREFIX}-libusb"
  "${MINGW_PACKAGE_PREFIX}-glib2"
 )
 makedepends=(
+  "${MINGW_PACKAGE_PREFIX}-cc"
  "${MINGW_PACKAGE_PREFIX}-meson"
  "${MINGW_PACKAGE_PREFIX}-ninja"
-  "${MINGW_PACKAGE_PREFIX}-cc"
  "${MINGW_PACKAGE_PREFIX}-pkgconf"
 )
-options=('strip' 'staticlibs')
-license=("spdx:GPL-2.0-or-later AND LGPL-2.1-or-later")
-url="https://www.spice-space.org/"
 source=(https://www.spice-space.org/download/usbredir/${_realname}-${pkgver}.tar.xz
        "0001-fix-callback-call-conv.patch")
 sha256sums=('4ba6faa02c0ae6deeb4c53883d66ab54b3a5899bead42ce4ded9568b9a7dc46e'
--- a/mingw-w64-vrpn/PKGBUILD
+++ b/mingw-w64-vrpn/PKGBUILD
@ -8,7 +8,7 @@ _pkgver=0${pkgver}
 pkgrel=9
 pkgdesc="The Virtual-Reality Peripheral Network (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64')
 url="https://github.com/vrpn/vrpn/wiki"
 license=('spdx:BSL-1.0')
 depends=("${MINGW_PACKAGE_PREFIX}-hidapi"
@ -20,8 +20,7 @@ depends=("${MINGW_PACKAGE_PREFIX}-hidapi"
 makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
             "${MINGW_PACKAGE_PREFIX}-cmake"
             "${MINGW_PACKAGE_PREFIX}-ninja")
-options=('staticlibs' 'strip')
-source=("${_realname}-${pkgver}.tar.gz"::"https://github.com/${_realname}/${_realname}/archive/v${_pkgver}.tar.gz"
+source=("https://github.com/${_realname}/${_realname}/archive/v${_pkgver}/${_realname}-${pkgver}.tar.gz"
        "0002-fix-shared-build.patch"
        "0003-link-to-glut-libraries.patch")
 sha256sums=('45024722110afe4b0663b12b68ea46864e79197ea752bba90c599f87e4d51dbe'
@ -36,8 +35,7 @@ prepare() {
 }

 build() {
-  [[ -d ${srcdir}/build-${MSYSTEM} ]] && rm -rf ${srcdir}/build-${MSYSTEM}
-  mkdir ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}
+  mkdir -p ${srcdir}/build-${MSYSTEM} && cd ${srcdir}/build-${MSYSTEM}

  declare -a extra_config
  if check_option "debug" "n"; then
--- a/mingw-w64-wb32-dfu-updater_cli/PKGBUILD
+++ b/mingw-w64-wb32-dfu-updater_cli/PKGBUILD
@ -7,23 +7,18 @@ pkgver=1.0.0
 pkgrel=1
 pkgdesc='Device firmware upgrade utilities (mingw-w64)'
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 license=('spdx:Apache-2.0')
 groups=("${MINGW_PACKAGE_PREFIX}-eda")
 url='https://github.com/WestberryTech/wb32-dfu-updater/'
 depends=("${MINGW_PACKAGE_PREFIX}-libusb")
-makedepends=("${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-ninja"
-             "${MINGW_PACKAGE_PREFIX}-cc")
-source=("${_realname}-${pkgver}.tar.gz::https://github.com/WestberryTech/wb32-dfu-updater/archive/refs/tags/${pkgver}.tar.gz")
+makedepends=("${MINGW_PACKAGE_PREFIX}-cc"
+             "${MINGW_PACKAGE_PREFIX}-cmake"
+             "${MINGW_PACKAGE_PREFIX}-ninja")
+source=("https://github.com/WestberryTech/wb32-dfu-updater/archive/${pkgver}/${_realname}-${pkgver}.tar.gz")
 sha256sums=('2b1c5b5627723067168af9740cb25c5c179634e133e4ced06028462096de5699')

-prepare() {
-    cd "${srcdir}/${_realname}-${pkgver}"
-}
-
 build() {
-    [[ -d "${srcdir}/build-${MSYSTEM}" ]] && rm -rf "${srcdir}/build-${MSYSTEM}"
    mkdir -p "${srcdir}/build-${MSYSTEM}" && cd "${srcdir}/build-${MSYSTEM}"

    MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" \
--- a/mingw-w64-yubico-c/PKGBUILD
+++ b/mingw-w64-yubico-c/PKGBUILD
@ -6,7 +6,7 @@ pkgver=1.13
 pkgrel=1
 pkgdesc="Yubico YubiKey C library (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/Yubico/yubico-c'
 license=('BSD')
 depends=(
--- a/mingw-w64-yubikey-personalization/PKGBUILD
+++ b/mingw-w64-yubikey-personalization/PKGBUILD
@ -6,7 +6,7 @@ pkgver=1.20.0
 pkgrel=1
 pkgdesc="Yubico YubiKey Personalization library and tool (mingw-w64)"
 arch=('any')
-mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clangarm64' 'clang32')
+mingw_arch=('mingw64' 'ucrt64' 'clang64' 'clangarm64')
 url='https://github.com/Yubico/yubikey-personalization'
 license=('BSD')
 depends=(
@ -32,9 +32,7 @@ prepare() {
 }

 build() {
-  cd "${srcdir}"/${_shortname}-${pkgver}
-  [[ -d "${srcdir}"/build-${CARCH} ]] && rm -rf "${srcdir}"/build-${CARCH}
-  mkdir -p "${srcdir}"/build-${CARCH} && cd "${srcdir}"/build-${CARCH}
+  mkdir -p "${srcdir}"/build-${MSYSTEM} && cd "${srcdir}"/build-${MSYSTEM}

  export lt_cv_deplibs_check_method='pass_all'
  CFLAGS+=" -fcommon"
@ -51,13 +49,13 @@ build() {
 }

 check() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}

  make check
 }

 package() {
-  cd "${srcdir}"/build-${CARCH}
+  cd "${srcdir}"/build-${MSYSTEM}

  make install DESTDIR="${pkgdir}"