From 97ac52554e0f70dfab50e4d7a845a79b01cf338f 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/2] nextpnr: enable ARCH 'ecp5' (prjtrellis) on MINGW64

---
 mingw-w64-nextpnr/PKGBUILD | 38 ++++++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 14 deletions(-)

diff --git a/mingw-w64-nextpnr/PKGBUILD b/mingw-w64-nextpnr/PKGBUILD
index 8be3e77e2b..c18170df12 100644
--- a/mingw-w64-nextpnr/PKGBUILD
+++ b/mingw-w64-nextpnr/PKGBUILD
@@ -4,24 +4,29 @@ _realname=nextpnr
 pkgbase=mingw-w64-${_realname}
 pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 pkgver=0.0.r2859.5e53a182
-pkgrel=2
+pkgrel=3
 pkgdesc="Portable FPGA place and route tool (mingw-w64)"
 arch=('any')
 url="https://github.com/YosysHQ/nextpnr"
 license=('ISC')
 groups=("${MINGW_PACKAGE_PREFIX}-eda")
-depends=("${MINGW_PACKAGE_PREFIX}-boost"
-         "${MINGW_PACKAGE_PREFIX}-qt5"
-         "${MINGW_PACKAGE_PREFIX}-python")
-makedepends=("${MINGW_PACKAGE_PREFIX}-boost"
-             "${MINGW_PACKAGE_PREFIX}-cmake"
-             "${MINGW_PACKAGE_PREFIX}-eigen3"
-             "${MINGW_PACKAGE_PREFIX}-gcc"
-             "${MINGW_PACKAGE_PREFIX}-icestorm"
-             "${MINGW_PACKAGE_PREFIX}-openmp"
-             "${MINGW_PACKAGE_PREFIX}-python"
-             "${MINGW_PACKAGE_PREFIX}-qt5"
-             "git")
+depends=(
+  "${MINGW_PACKAGE_PREFIX}-boost"
+  "${MINGW_PACKAGE_PREFIX}-qt5"
+  "${MINGW_PACKAGE_PREFIX}-python"
+)
+makedepends=(
+  "${MINGW_PACKAGE_PREFIX}-boost"
+  "${MINGW_PACKAGE_PREFIX}-cmake"
+  "${MINGW_PACKAGE_PREFIX}-eigen3"
+  "${MINGW_PACKAGE_PREFIX}-gcc"
+  "${MINGW_PACKAGE_PREFIX}-icestorm"
+  "${MINGW_PACKAGE_PREFIX}-openmp"
+  "${MINGW_PACKAGE_PREFIX}-python"
+  "${MINGW_PACKAGE_PREFIX}-prjtrellis"
+  "${MINGW_PACKAGE_PREFIX}-qt5"
+  "git"
+)
 
 _commit="5e53a18"
 source=("${_realname}::git://github.com/YosysHQ/${_realname}.git#commit=${_commit}")
@@ -35,12 +40,17 @@ pkgver() {
 build() {
   cd "${srcdir}/${_realname}"
 
+  unset _extra-archs
+  if [ "$CARCH" = "x86_64" ]; then
+    _extra_archs=";ecp5"
+  fi
+
   MSYS2_ARG_CONV_EXCL="-DCMAKE_INSTALL_PREFIX=" cmake \
     -G "MSYS Makefiles" \
     -DICESTORM_INSTALL_PREFIX="${MINGW_PREFIX}" \
     -DCMAKE_PREFIX_PATH=${MINGW_PREFIX} \
     -DCMAKE_INSTALL_PREFIX="${MINGW_PREFIX}" \
-    -DARCH='generic;ice40' \
+    -DARCH="generic;ice40${_extra_archs}" \
     -DBUILD_HEAP=ON \
     -DUSE_OPENMP=ON \
     -DBUILD_PYTHON=ON \

From 94037ab64459e96d77f853324500661c7a29ba8f Mon Sep 17 00:00:00 2001
From: umarcor <unai.martinezcorral@ehu.eus>
Date: Tue, 23 Mar 2021 19:08:47 +0100
Subject: [PATCH 2/2] nextpnr: update to 0.0.r3229.326b3488

---
 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 c18170df12..c113164cee 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.r2859.5e53a182
-pkgrel=3
+pkgver=0.0.r3229.326b3488
+pkgrel=1
 pkgdesc="Portable FPGA place and route tool (mingw-w64)"
 arch=('any')
 url="https://github.com/YosysHQ/nextpnr"
@@ -28,7 +28,7 @@ makedepends=(
   "git"
 )
 
-_commit="5e53a18"
+_commit="326b3488"
 source=("${_realname}::git://github.com/YosysHQ/${_realname}.git#commit=${_commit}")
 sha256sums=('SKIP')