From 888df552d59c9de07262dfcd04eb128a61e57618 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Fri, 25 Dec 2020 20:52:53 +0100
Subject: [PATCH 1/5] nextpnr: switch from gcc to clang

---
 mingw-w64-nextpnr/PKGBUILD | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-nextpnr/PKGBUILD b/mingw-w64-nextpnr/PKGBUILD
index 3e1ba2715a..fdde4b9e71 100644
--- a/mingw-w64-nextpnr/PKGBUILD
+++ b/mingw-w64-nextpnr/PKGBUILD
@@ -4,7 +4,7 @@ _realname=nextpnr
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.0.r3900.gfd2d4a8f
-pkgrel=1
+pkgrel=2
 pkgdesc="Portable FPGA place and route tool (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -19,8 +19,8 @@ depends=(
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-boost"
   "${MINGW_PACKAGE_PREFIX}-cmake"
+  "${MINGW_PACKAGE_PREFIX}-clang"
   "${MINGW_PACKAGE_PREFIX}-eigen3"
-  "${MINGW_PACKAGE_PREFIX}-gcc"
   "${MINGW_PACKAGE_PREFIX}-icestorm"
   "${MINGW_PACKAGE_PREFIX}-openmp"
   "${MINGW_PACKAGE_PREFIX}-python"
@@ -48,6 +48,8 @@ build() {
 
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" cmake \
     -G "MSYS Makefiles" \
+    -DCMAKE_C_COMPILER=clang \
+    -DCMAKE_CXX_COMPILER=clang++ \
     -DICESTORM_INSTALL_PREFIX="${MINGW_PREFIX}" \
     -DCMAKE_PREFIX_PATH=${MINGW_PREFIX} \
     -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \

From 12c82de3046a20b2d671e5159afb7be0e27082d3 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Wed, 8 Dec 2021 20:37:28 +0100
Subject: [PATCH 2/5] nextpnr: 0.1 was tagged

---
 mingw-w64-nextpnr/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mingw-w64-nextpnr/PKGBUILD b/mingw-w64-nextpnr/PKGBUILD
index fdde4b9e71..f645a439ee 100644
--- a/mingw-w64-nextpnr/PKGBUILD
+++ b/mingw-w64-nextpnr/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=nextpnr
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.0.r3900.gfd2d4a8f
-pkgrel=2
+pkgver=0.1.r3900.gfd2d4a8f
+pkgrel=1
 pkgdesc="Portable FPGA place and route tool (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -34,7 +34,7 @@ sha256sums=('SKIP')
 
 pkgver() {
   cd "${_realname}"
-  printf "0.0.r%s.g%s" "$(git rev-list --count ${_commit})" "$(git rev-parse --short=8 ${_commit})"
+  printf "0.1.r%s.g%s" "$(git rev-list --count ${_commit})" "$(git rev-parse --short=8 ${_commit})"
 }
 
 build() {

From 85990c552124671bdb9e428e09802b0e93ce8cda Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Wed, 1 Dec 2021 18:39:54 +0100
Subject: [PATCH 3/5] openFPGALoader: depends on zlib

---
 mingw-w64-openFPGALoader/PKGBUILD | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/mingw-w64-openFPGALoader/PKGBUILD b/mingw-w64-openFPGALoader/PKGBUILD
index 4e13aa7bfa..4b95b91c45 100644
--- a/mingw-w64-openFPGALoader/PKGBUILD
+++ b/mingw-w64-openFPGALoader/PKGBUILD
@@ -4,14 +4,17 @@ _realname=openFPGALoader
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="openFPGALoader: universal utility for programming FPGA (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
 url="https://github.com/trabucayre/openFPGALoader"
 license=('Apache-2.0')
 groups=("${MINGW_PACKAGE_PREFIX}-eda")
-depends=("${MINGW_PACKAGE_PREFIX}-libftdi")
+depends=(
+  "${MINGW_PACKAGE_PREFIX}-libftdi"
+  "${MINGW_PACKAGE_PREFIX}-zlib"
+)
 makedepends=(
   "${MINGW_PACKAGE_PREFIX}-gcc"
   "${MINGW_PACKAGE_PREFIX}-cmake"

From 384bca34850746f1d4e372aa1c9356a031348d39 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Mon, 6 Dec 2021 00:20:41 +0100
Subject: [PATCH 4/5] openFPGALoader: update to 0.6.1

---
 mingw-w64-openFPGALoader/PKGBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mingw-w64-openFPGALoader/PKGBUILD b/mingw-w64-openFPGALoader/PKGBUILD
index 4b95b91c45..551737d122 100644
--- a/mingw-w64-openFPGALoader/PKGBUILD
+++ b/mingw-w64-openFPGALoader/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=openFPGALoader
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=0.6.0
-pkgrel=2
+pkgver=0.6.1
+pkgrel=1
 pkgdesc="openFPGALoader: universal utility for programming FPGA (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -21,7 +21,7 @@ makedepends=(
 )
 
 source=("${_realname}::https://codeload.github.com/trabucayre/openFPGALoader/tar.gz/v${pkgver}")
-sha256sums=('0971db2302e704966d2e29b8d34e95f553cfd8f81e5ab70ec0533f03f219cf49')
+sha256sums=('a862a209d696becff915a77512e6a8c22f92d73480a45cc12273d9ad1db60d23')
 
 build() {
   cd "${srcdir}/${_realname}-${pkgver}"

From 4631ac18d6491ed45e33cc78cd3c176775eae2c9 Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Mon, 6 Dec 2021 03:39:49 +0100
Subject: [PATCH 5/5] verilator: update to 4.216

---
 .../0001-Fix-MSWIN-compile-error-2681.patch   | 29 +++++++++++++++++++
 mingw-w64-verilator/PKGBUILD                  |  9 ++++--
 2 files changed, 35 insertions(+), 3 deletions(-)
 create mode 100644 mingw-w64-verilator/0001-Fix-MSWIN-compile-error-2681.patch

diff --git a/mingw-w64-verilator/0001-Fix-MSWIN-compile-error-2681.patch b/mingw-w64-verilator/0001-Fix-MSWIN-compile-error-2681.patch
new file mode 100644
index 0000000000..0d2c37524d
--- /dev/null
+++ b/mingw-w64-verilator/0001-Fix-MSWIN-compile-error-2681.patch
@@ -0,0 +1,29 @@
+diff --git a/Changes b/Changes
+index 0cc1c41b..4f1a4c16 100644
+--- a/Changes
++++ b/Changes
+@@ -13,6 +13,8 @@ Verilator 4.217 devel
+
+ **Minor:**
+
++* Fix MSWIN compile error (#2681). [Unai Martinez-Corral]
++
+
+ Verilator 4.216 2021-12-05
+ ==========================
+diff --git a/src/V3File.cpp b/src/V3File.cpp
+index 47cc857d..19a777b2 100644
+--- a/src/V3File.cpp
++++ b/src/V3File.cpp
+@@ -335,7 +335,7 @@ class VInFilterImp final {
+ #ifdef INFILTER_PIPE
+     pid_t m_pid = 0;  // fork() process id
+ #else
+-    const int m_pid = 0;  // fork() process id - always zero as disabled
++    int m_pid = 0;  // fork() process id - always zero as disabled
+ #endif
+     bool m_pidExited = false;
+     int m_pidStatus = 0;
+--
+2.34.1
+
diff --git a/mingw-w64-verilator/PKGBUILD b/mingw-w64-verilator/PKGBUILD
index c9c10c8e06..c1ab3fe876 100644
--- a/mingw-w64-verilator/PKGBUILD
+++ b/mingw-w64-verilator/PKGBUILD
@@ -3,8 +3,8 @@
 _realname=verilator
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
-pkgver=4.214
-pkgrel=2
+pkgver=4.216
+pkgrel=1
 pkgdesc="The fastest free Verilog HDL simulator (mingw-w64)"
 arch=('any')
 mingw_arch=('mingw32' 'mingw64' 'ucrt64' 'clang64' 'clang32')
@@ -16,15 +16,18 @@ depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs")
 
 source=(
   "${_realname}::https://codeload.github.com/${_realname}/${_realname}/tar.gz/v${pkgver}"
+  '0001-Fix-MSWIN-compile-error-2681.patch'
 )
 sha256sums=(
-  'e14c7f6ffb00a6746ae2a8ea0424e90a1a30067e8ae4c96b8c42689ca1ca0b1f'
+  '64e5093b629a7e96178e3b2494f208955f218dfac6f310a91e4fc07d050c980b'
+  '9a38ccf4f492d804e49cf764e1ada9bbcceccfdba54161af2538ce5d856e6385'
 )
 
 prepare() {
   [[ -d "${srcdir}/build-${MINGW_CHOST}" ]] && rm -rf "${srcdir}/build-${MINGW_CHOST}"
   cp -rf "${srcdir}/${_realname}-${pkgver}" "${srcdir}/build-${MINGW_CHOST}"
   cd "${srcdir}/build-${MINGW_CHOST}"
+  patch -p1 -i "${srcdir}"/0001-Fix-MSWIN-compile-error-2681.patch
   sh autoconf
 }