pcr: symbiflow: sync with Aur

After syncing with Aur, I also run makepkg to make makepkg update
the pkgver in the PKGBUILD. This should ensure that the PKGBUILD
doesn't need to be modified at build time by libremakepkg.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>

3 files changed, 9 insertions, 54 deletions

diff --git a/pcr/icestorm-git/PKGBUILD b/pcr/icestorm-git/PKGBUILD
index 7339c9c9d..318127631 100644
--- a/pcr/icestorm-git/PKGBUILD
+++ b/pcr/icestorm-git/PKGBUILD
@@ -3,7 +3,7 @@
 # parabola changes and rationale:
 # - Added armv7h and i686 architectures support
 pkgname=icestorm-git
-pkgver=r726.9594931
+pkgver=r774.7afc64b
 pkgrel=1
 pkgdesc="Lattice iCE40 FPGAs Bitstream Documentation (Reverse Engineered)"
 arch=('armv7h' 'i686' 'x86_64')
diff --git a/pcr/nextpnr-git/PKGBUILD b/pcr/nextpnr-git/PKGBUILD
index f2dd4563c..e2adf39b8 100644
--- a/pcr/nextpnr-git/PKGBUILD
+++ b/pcr/nextpnr-git/PKGBUILD
@@ -1,18 +1,17 @@
 # Maintainer(AUR): Graham Edgecombe <gpe@grahamedgecombe.com>
-# Maintainer: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
+
 # parabola changes and rationale:
-#  - Fixed "error while loading shared libraries: libboost_python37.so.1.69.0"
-#    by switching from boost-libs to boost1.69-libs
-#    TODO: see if this needs to be sent to the nextpnr-git AUR maintainer
+#  no changes.
 pkgname=nextpnr-git
-pkgver=r2284.08cf545
+pkgver=r2884.15b2852b
 pkgrel=1
 pkgdesc='Portable FPGA place and route tool'
 arch=('i686' 'x86_64')
 url='https://github.com/YosysHQ/nextpnr'
 license=('custom:ISC')
-depends=('boost1.69-libs' 'python' 'qt5-base')
-makedepends=('boost' 'cmake' 'eigen' 'git' 'icestorm' 'trellis')
+depends=('boost-libs' 'python' 'qt5-base')
+makedepends=('boost' 'cmake' 'eigen' 'git' 'icestorm' 'prjtrellis'
+             'prjtrellis-db')
 provides=('nextpnr')
 conflicts=('nextpnr')
 source=('nextpnr::git+https://github.com/YosysHQ/nextpnr.git')
@@ -32,11 +31,12 @@ build() {
   cmake \
     -DARCH=generic\;ice40\;ecp5 \
     -DICEBOX_ROOT=/usr/share/icebox \
-    -DTRELLIS_ROOT=/usr/share/trellis \
+    -DTRELLIS_INSTALL_PREFIX=/usr \
     -DBUILD_TESTS=ON \
     -DCMAKE_BUILD_TYPE=RelWithDebInfo \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DUSE_OPENMP=ON \
+    -DBUILD_GUI=ON \
     ..
   make
 }
diff --git a/pcr/trellis/PKGBUILD b/pcr/trellis/PKGBUILD
deleted file mode 100644
index 16eb6d30f..000000000
--- a/pcr/trellis/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer (AUR): Graham Edgecombe <gpe@grahamedgecombe.com>
-# Maintainer: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
-# parabola changes and rationale:
-#  no changes.
-
-pkgname=trellis
-pkgver=1.0
-_databasever=d0b219af41ae3da6150645fbc5cc5613b530603f
-pkgrel=1
-pkgdesc='Tools and scripts which allow you to document the bit-stream format of Lattice ECP5 series FPGAs'
-arch=('i686' 'x86_64')
-url='https://github.com/SymbiFlow/prjtrellis'
-license=('custom:ISC')
-depends=('boost-libs' 'python')
-makedepends=('cmake' 'rsync' 'boost')
-source=("https://github.com/SymbiFlow/prjtrellis/archive/$pkgver.tar.gz"
-        "https://github.com/SymbiFlow/prjtrellis-db/archive/$_databasever.tar.gz")
-sha256sums=('6cfa12b7bf1ad5aed2b711fdfdd5ade6a2047f4733a704cb0b04634d350a4e26'
-            '1f1b71741e8b70af777561a1422be8a01992ea46b363da24b7b97e41fa0fa5c5')
-
-prepare() {
-  cd "$srcdir/prjtrellis-$pkgver"
-  rsync -a --exclude='.*' "$srcdir/prjtrellis-db-$_databasever/" database/
-}
-
-build() {
-  cd "$srcdir/prjtrellis-$pkgver/libtrellis"
-  cmake -DCMAKE_INSTALL_PREFIX=/usr .
-  make
-}
-
-check() {
-  cd "$srcdir/prjtrellis-$pkgver/libtrellis/tests"
-  ./run_all.sh
-}
-
-package() {
-  cd "$srcdir/prjtrellis-$pkgver/libtrellis"
-  make DESTDIR="$pkgdir" install
-  mv "$pkgdir/usr/lib64" "$pkgdir/usr/lib"
-  install -Dm644 "$srcdir/prjtrellis-$pkgver/COPYING" "$pkgdir/usr/share/licenses/$pkgname/COPYING"
-
-  # used by the examples to convert the bitstreams to SVF files for programming
-  install -D "$srcdir/prjtrellis-$pkgver/tools/bit_to_svf.py" "$pkgdir/usr/share/trellis/tools/bit_to_svf.py"
-}