pkgsrc-Users archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Update nextpnr, nextpnr-ice40, icestorm



Hi, I'm adding support for gowin fpga boards to pkgsrc. The first
step should be updating these packages.

Could some dev take a look and import the changes?

nextpnr's old patches are removed, patch-CMakeLists.txt
is a new one I'm attaching directly.

PS. I don't have an ice40 board, please let me know if there is
any problem with this update.

adr

===================================================================
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nextpnr/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	20 Apr 2025 22:29:14 -0000	1.4
+++ distinfo	31 Aug 2025 18:38:55 -0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2025/04/20 22:29:14 js Exp $
+$NetBSD$

-BLAKE2s (nextpnr-0.7.tar.gz) = 27dfd76a6c8bc84b3178083a1b21bf4d542387a29ebaf533553121ac6c31a486
-SHA512 (nextpnr-0.7.tar.gz) = feb190d3a656c7bcdd2bcc1def9972e2c9bec7171a064308b16260240ce9f552eb03d907ef7d032a17ae7ef7e869950e7399c61df22ba36484a4cf2ef7ce7de2
-Size (nextpnr-0.7.tar.gz) = 4711765 bytes
-SHA1 (patch-3rdparty_json11_json11.cpp) = 64ace14d1cea195302debecc4a7824b6242a677e
-SHA1 (patch-bba_main.cc) = e3713835b14ac9155d0465d8102636ac02fa7c16
-SHA1 (patch-common_kernel_command.cc) = bbb8e02cf0d79092d4517bf492fc1d91ea7e3ad6
+BLAKE2s (nextpnr-0.8.tar.gz) = 67f2dee34a021bd76cc2ce630e9658a7e053a1b32a4b1d4329700d3e2ef04b1c
+SHA512 (nextpnr-0.8.tar.gz) = 6a05b6a8c8d378dc2309fbbaf96b49601472e8f56056774f936cbe353fa40c2a560642dbaff96af807469ff328f27d75630538f805a39122a94410405974fa48
+Size (nextpnr-0.8.tar.gz) = 4665005 bytes
+SHA1 (patch-CMakeLists.txt) = 0a6f86a0ab37de741c5498d8dfc5d381a501f917
Index: nextpnr.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nextpnr/nextpnr.mk,v
retrieving revision 1.6
diff -u -r1.6 nextpnr.mk
--- nextpnr.mk	14 Oct 2024 06:45:39 -0000	1.6
+++ nextpnr.mk	31 Aug 2025 18:38:55 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: nextpnr.mk,v 1.6 2024/10/14 06:45:39 wiz Exp $

-NEXTPNR_VERSION=0.7
+NEXTPNR_VERSION=0.8
 DISTNAME=	nextpnr-${NEXTPNR_VERSION}
 PKGNAME=	nextpnr-${NEXTPNR_TARGET}-${NEXTPNR_VERSION}
 CATEGORIES=	devel
@@ -9,8 +9,6 @@
 GITHUB_TAG=	${DISTNAME}
 WRKSRC=		${WRKDIR}/nextpnr-${DISTNAME}

-PKGREVISION?=	2
-
 MAINTAINER?=	thorpej%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/YosysHQ/nextpnr
 COMMENT?=	A portable FPGA place and route tool
@@ -20,7 +18,6 @@
 PATCHDIR?=	${.CURDIR}/../../devel/nextpnr/patches

 USE_LANGUAGES=	c c++
-USE_CMAKE=	yes

 CMAKE_CONFIGURE_ARGS+=	-DCURRENT_GIT_VERSION=${NEXTPNR_VERSION}
 CMAKE_CONFIGURE_ARGS+=	-DARCH=${NEXTPNR_TARGET}
@@ -28,6 +25,7 @@
 CMAKE_CONFIGURE_ARGS+=	${NEXTPNR_TARGET_ARGS}
 .endif

+.include "../../devel/cmake/build.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../math/eigen3/buildlink3.mk"
 .include "../../lang/python/application.mk"
========================================

devel/nextpnr/patches/patch_CMakeLists.txt:

========================================
$NetBSD$

the tests directory is empty in the realease.

--- CMakeLists.txt.orig	2025-08-31 16:09:11.547173344 +0000
+++ CMakeLists.txt
@@ -239,8 +239,6 @@ add_subdirectory(frontend)
 add_subdirectory(json)
 add_subdirectory(rust)

-add_subdirectory(tests/gui)
-
 add_custom_target(nextpnr-all-bba)

 function(add_nextpnr_architecture target)
@@ -368,6 +366,7 @@ function(add_nextpnr_architecture target

         target_link_libraries(nextpnr-${target}-test PRIVATE gtest_main nextpnr-${target}-core)
         if (BUILD_GUI)
+            add_subdirectory(tests/gui)
             target_link_libraries(nextpnr-${target}-test PRIVATE nextpnr-${target}-gui)
             target_link_libraries(nextpnr-${target}-test PRIVATE nextpnr_test_gui)
         endif()

===================================================================
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nextpnr-ice40/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	29 Dec 2024 15:09:45 -0000	1.3
+++ Makefile	31 Aug 2025 18:36:38 -0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2024/12/29 15:09:45 adam Exp $
+# $NetBSD$

-COMMENT=	A portable FPGA place and route tool for Lattice iCE40 devices
-PKGREVISION=	2
+COMMENT=	Portable FPGA place and route tool for Lattice iCE40 devices

 NEXTPNR_TARGET=		ice40
 NEXTPNR_TARGET_ARGS=	-DICESTORM_INSTALL_PREFIX=${PREFIX}

-DEPENDS+=		icestorm>=0.0.20240227:../../devel/icestorm
+DEPENDS+=		icestorm>=0.0.20250603:../../devel/icestorm

 .include "../../devel/nextpnr/nextpnr.mk"
========================================

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/icestorm/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	2 Mar 2024 23:07:59 -0000	1.3
+++ Makefile	31 Aug 2025 18:37:27 -0000
@@ -1,14 +1,12 @@
 # $NetBSD: Makefile,v 1.3 2024/03/02 23:07:59 thorpej Exp $

 # There are no release tags for icestorm
-ICESTORM_VERSION=0.0.20240227
+ICESTORM_VERSION=	0.0.20250603

 DISTNAME=	icestorm-${ICESTORM_VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=YosysHQ/}
-GITHUB_TAG=	1a40ae75d4eebee9cce73a2c4d634fd42ed0110f
-
-PKGREVISION=	1
+GITHUB_TAG=	f31c39cc2eadd0ab7f29f34becba1348ae9f8721

 MAINTAINER=	thorpej%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/YosysHQ/icestorm
@@ -26,7 +24,7 @@
 USE_TOOLS+=	gsed
 .endif

-REPLACE_PYTHON+= icebox/*.py
+REPLACE_PYTHON+=	icebox/*.py

 INSTALLATION_DIRS=	bin share

Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/icestorm/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	2 Mar 2024 23:07:59 -0000	1.3
+++ distinfo	31 Aug 2025 18:37:27 -0000
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.3 2024/03/02 23:07:59 thorpej Exp $

-BLAKE2s (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = 511978571885ce362c39616dfb1fcccd5a1df31562b8cbb925547f15d5853cce
-SHA512 (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = f0bfbc0af651a5d1cc45ecc4ce6cb9f6a8fdf4797f17b2af7e70278f0786b8d063503606cbf624aee558a3e32a3dc7c595694ac335ce7b52bfece9b18b5543da
-Size (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = 948430 bytes
+BLAKE2s (icestorm-0.0.20250603-f31c39cc2eadd0ab7f29f34becba1348ae9f8721.tar.gz) = 4172e2f5ead590d262e699dce2372aba8454f9dddef6c762422f0302def221d9
+SHA512 (icestorm-0.0.20250603-f31c39cc2eadd0ab7f29f34becba1348ae9f8721.tar.gz) = 6c7d5f2a4b1f0f24dd97a0ad2f1a6b06431ed449258077f6ce376dd614340a07dce5b100a40611bd38cb91981f5046f38dccafed1999e93e3a02d3200cc39296
+Size (icestorm-0.0.20250603-f31c39cc2eadd0ab7f29f34becba1348ae9f8721.tar.gz) = 3975359 bytes
 SHA1 (patch-icebox_Makefile) = 2b99d8c0e780c3b22a0697bfbd9e5b0259e0839d
-SHA1 (patch-icetime_iceutil.cc) = 2391375f35fba6056e09a9f3a89afe5abbebc800
===================================================================
? patches
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nextpnr/distinfo,v
retrieving revision 1.4
diff -u -r1.4 distinfo
--- distinfo	20 Apr 2025 22:29:14 -0000	1.4
+++ distinfo	31 Aug 2025 18:38:55 -0000
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.4 2025/04/20 22:29:14 js Exp $
+$NetBSD$
 
-BLAKE2s (nextpnr-0.7.tar.gz) = 27dfd76a6c8bc84b3178083a1b21bf4d542387a29ebaf533553121ac6c31a486
-SHA512 (nextpnr-0.7.tar.gz) = feb190d3a656c7bcdd2bcc1def9972e2c9bec7171a064308b16260240ce9f552eb03d907ef7d032a17ae7ef7e869950e7399c61df22ba36484a4cf2ef7ce7de2
-Size (nextpnr-0.7.tar.gz) = 4711765 bytes
-SHA1 (patch-3rdparty_json11_json11.cpp) = 64ace14d1cea195302debecc4a7824b6242a677e
-SHA1 (patch-bba_main.cc) = e3713835b14ac9155d0465d8102636ac02fa7c16
-SHA1 (patch-common_kernel_command.cc) = bbb8e02cf0d79092d4517bf492fc1d91ea7e3ad6
+BLAKE2s (nextpnr-0.8.tar.gz) = 67f2dee34a021bd76cc2ce630e9658a7e053a1b32a4b1d4329700d3e2ef04b1c
+SHA512 (nextpnr-0.8.tar.gz) = 6a05b6a8c8d378dc2309fbbaf96b49601472e8f56056774f936cbe353fa40c2a560642dbaff96af807469ff328f27d75630538f805a39122a94410405974fa48
+Size (nextpnr-0.8.tar.gz) = 4665005 bytes
+SHA1 (patch-CMakeLists.txt) = 0a6f86a0ab37de741c5498d8dfc5d381a501f917
Index: nextpnr.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nextpnr/nextpnr.mk,v
retrieving revision 1.6
diff -u -r1.6 nextpnr.mk
--- nextpnr.mk	14 Oct 2024 06:45:39 -0000	1.6
+++ nextpnr.mk	31 Aug 2025 18:38:55 -0000
@@ -1,6 +1,6 @@
 # $NetBSD: nextpnr.mk,v 1.6 2024/10/14 06:45:39 wiz Exp $
 
-NEXTPNR_VERSION=0.7
+NEXTPNR_VERSION=0.8
 DISTNAME=	nextpnr-${NEXTPNR_VERSION}
 PKGNAME=	nextpnr-${NEXTPNR_TARGET}-${NEXTPNR_VERSION}
 CATEGORIES=	devel
@@ -9,8 +9,6 @@
 GITHUB_TAG=	${DISTNAME}
 WRKSRC=		${WRKDIR}/nextpnr-${DISTNAME}
 
-PKGREVISION?=	2
-
 MAINTAINER?=	thorpej%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/YosysHQ/nextpnr
 COMMENT?=	A portable FPGA place and route tool
@@ -20,7 +18,6 @@
 PATCHDIR?=	${.CURDIR}/../../devel/nextpnr/patches
 
 USE_LANGUAGES=	c c++
-USE_CMAKE=	yes
 
 CMAKE_CONFIGURE_ARGS+=	-DCURRENT_GIT_VERSION=${NEXTPNR_VERSION}
 CMAKE_CONFIGURE_ARGS+=	-DARCH=${NEXTPNR_TARGET}
@@ -28,6 +25,7 @@
 CMAKE_CONFIGURE_ARGS+=	${NEXTPNR_TARGET_ARGS}
 .endif
 
+.include "../../devel/cmake/build.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
 .include "../../math/eigen3/buildlink3.mk"
 .include "../../lang/python/application.mk"
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/nextpnr-ice40/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	29 Dec 2024 15:09:45 -0000	1.3
+++ Makefile	31 Aug 2025 18:36:38 -0000
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2024/12/29 15:09:45 adam Exp $
+# $NetBSD$
 
-COMMENT=	A portable FPGA place and route tool for Lattice iCE40 devices
-PKGREVISION=	2
+COMMENT=	Portable FPGA place and route tool for Lattice iCE40 devices
 
 NEXTPNR_TARGET=		ice40
 NEXTPNR_TARGET_ARGS=	-DICESTORM_INSTALL_PREFIX=${PREFIX}
 
-DEPENDS+=		icestorm>=0.0.20240227:../../devel/icestorm
+DEPENDS+=		icestorm>=0.0.20250603:../../devel/icestorm
 
 .include "../../devel/nextpnr/nextpnr.mk"
Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/icestorm/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile	2 Mar 2024 23:07:59 -0000	1.3
+++ Makefile	31 Aug 2025 18:37:27 -0000
@@ -1,14 +1,12 @@
 # $NetBSD: Makefile,v 1.3 2024/03/02 23:07:59 thorpej Exp $
 
 # There are no release tags for icestorm
-ICESTORM_VERSION=0.0.20240227
+ICESTORM_VERSION=	0.0.20250603
 
 DISTNAME=	icestorm-${ICESTORM_VERSION}
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GITHUB:=YosysHQ/}
-GITHUB_TAG=	1a40ae75d4eebee9cce73a2c4d634fd42ed0110f
-
-PKGREVISION=	1
+GITHUB_TAG=	f31c39cc2eadd0ab7f29f34becba1348ae9f8721
 
 MAINTAINER=	thorpej%NetBSD.org@localhost
 HOMEPAGE=	https://github.com/YosysHQ/icestorm
@@ -26,7 +24,7 @@
 USE_TOOLS+=	gsed
 .endif
 
-REPLACE_PYTHON+= icebox/*.py
+REPLACE_PYTHON+=	icebox/*.py
 
 INSTALLATION_DIRS=	bin share
 
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/icestorm/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo	2 Mar 2024 23:07:59 -0000	1.3
+++ distinfo	31 Aug 2025 18:37:27 -0000
@@ -1,7 +1,6 @@
 $NetBSD: distinfo,v 1.3 2024/03/02 23:07:59 thorpej Exp $
 
-BLAKE2s (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = 511978571885ce362c39616dfb1fcccd5a1df31562b8cbb925547f15d5853cce
-SHA512 (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = f0bfbc0af651a5d1cc45ecc4ce6cb9f6a8fdf4797f17b2af7e70278f0786b8d063503606cbf624aee558a3e32a3dc7c595694ac335ce7b52bfece9b18b5543da
-Size (icestorm-0.0.20240227-1a40ae75d4eebee9cce73a2c4d634fd42ed0110f.tar.gz) = 948430 bytes
+BLAKE2s (icestorm-0.0.20250603-f31c39cc2eadd0ab7f29f34becba1348ae9f8721.tar.gz) = 4172e2f5ead590d262e699dce2372aba8454f9dddef6c762422f0302def221d9
+SHA512 (icestorm-0.0.20250603-f31c39cc2eadd0ab7f29f34becba1348ae9f8721.tar.gz) = 6c7d5f2a4b1f0f24dd97a0ad2f1a6b06431ed449258077f6ce376dd614340a07dce5b100a40611bd38cb91981f5046f38dccafed1999e93e3a02d3200cc39296
+Size (icestorm-0.0.20250603-f31c39cc2eadd0ab7f29f34becba1348ae9f8721.tar.gz) = 3975359 bytes
 SHA1 (patch-icebox_Makefile) = 2b99d8c0e780c3b22a0697bfbd9e5b0259e0839d
-SHA1 (patch-icetime_iceutil.cc) = 2391375f35fba6056e09a9f3a89afe5abbebc800
$NetBSD$

the tests directory is empty in the realease.

--- CMakeLists.txt.orig	2025-08-31 16:09:11.547173344 +0000
+++ CMakeLists.txt
@@ -239,8 +239,6 @@ add_subdirectory(frontend)
 add_subdirectory(json)
 add_subdirectory(rust)
 
-add_subdirectory(tests/gui)
-
 add_custom_target(nextpnr-all-bba)
 
 function(add_nextpnr_architecture target)
@@ -368,6 +366,7 @@ function(add_nextpnr_architecture target
 
         target_link_libraries(nextpnr-${target}-test PRIVATE gtest_main nextpnr-${target}-core)
         if (BUILD_GUI)
+            add_subdirectory(tests/gui)
             target_link_libraries(nextpnr-${target}-test PRIVATE nextpnr-${target}-gui)
             target_link_libraries(nextpnr-${target}-test PRIVATE nextpnr_test_gui)
         endif()


Home | Main Index | Thread Index | Old Index