On 2025/05/08 19:20, Jonathan Gray wrote:
> On Thu, May 08, 2025 at 04:32:09AM +0200, Theo Buehler wrote:
> > On Wed, May 07, 2025 at 07:38:29PM -0400, Daniel Dickman wrote:
> > > numpy 1.x in the tree is a blocker for updating quite a few ports.
> > > 
> > > The main blocker for the update used to be boost. But now that we have 
> > > boost 1.87 I think it's a good time to update numpy to the 2.x series. The 
> > > diff below gets us to 2.0.2.
> > > 
> > > I have fixes for these which are all fairly straightforward and I can 
> > > commit once numpy is at the 2.x series:
> > >  astro/py-erfa (update 2.0.1.1 -> 2.0.1.3)
> > >  graphics/py-matplotlib (remove hardcoded upper bound on numpy < 2)
> > >  math/py-cvxpy (update 1.2.1 -> 1.6.2)
> > >  math/py-numexpr (update 2.8.4 -> 2.10.2)
> > >  math/py-scikit-learn (update 1.4.1post1 -> 1.5.2)
> > >  math/py-scs (update 2.1.1-2 -> 3.2.6)
> > >  math/py-tables (upstream wants numpy 2.x, but we patch it. undo our local patch)
> > 
> > Would you mind sharing a diff including these fixes? When running a bulk,
> > every build failure costs some time triaging, and while most of these are
> > nearly leaf ports, py-matplotlib has more than a dozen reverse deps.
> > 
> > Like for math/py-tables, landry had to relax a build requirement in
> > geo/py-rasterio (and maybe elsewhere?). This can also be removed.
> > 
> > > These I'd like to mark BROKEN until they can be fixed by someone with an 
> > > interest:
> > > - graphics/piglit (very old and stale)
> > > - x11/qt6/pyside/shiboken (core vs _core include path update is needed?)
> > 
> > While I'm fine with this, I know that jsg used to use piglit for drm
> > stress testing and jtt might want to look into pyside.
> 
> Yes, piglit continues to be useful for that.
> 
> The complication is they stopped the github mirror and don't do releases.
> 
> I'm not sure if gitlab has hash stable git archives.  The FDO instance
> also has Anubis in front of it.
> https://gitlab.freedesktop.org/mesa/piglit

Anubis only hits user-agents that look like browsers, ftp(1) gets through.

The git-archive download from fd.o gitlab matches the hash from github's,
we could switch upstream easily enough:

Index: infrastructure/db/dist-tuple.pattern
===================================================================
RCS file: /cvs/ports/infrastructure/db/dist-tuple.pattern,v
diff -u -p -r1.10 dist-tuple.pattern
--- infrastructure/db/dist-tuple.pattern	10 Nov 2023 19:55:14 -0000	1.10
+++ infrastructure/db/dist-tuple.pattern	8 May 2025 09:41:42 -0000
@@ -1,5 +1,6 @@
 # known SITES.x
 SITES.codeberg ?= https://codeberg.org/
+SITES.fdo ?=	https://gitlab.freedesktop.org/
 SITES.github ?=	https://github.com/
 SITES.gitlab ?=	https://gitlab.com/
 SITES.kde ?=	https://invent.kde.org/
@@ -16,6 +17,9 @@ TEMPLATE_EXTRACT_SUFX ?=	.tar.gz
 # - <subdir> - used automatically if <id> is in tag format
 TEMPLATE_DISTFILES.codeberg ?= \
 	<account>-<project>-{<account>/<project>/archive/}<id>${EXTRACT_SUFX.codeberg}
+
+TEMPLATE_DISTFILES.fdo ?= \
+	<account>-<project>-{<account>/<project>/-/archive/<id>/}<id>${EXTRACT_SUFX.fdo}
 
 TEMPLATE_DISTFILES.github ?= \
 	<account>-<project>-{<account>/<project>/archive/<subdir>}<id>${EXTRACT_SUFX.github}
Index: infrastructure/templates/Makefile.template
===================================================================
RCS file: /cvs/ports/infrastructure/templates/Makefile.template,v
diff -u -p -r1.103 Makefile.template
--- infrastructure/templates/Makefile.template	21 Dec 2024 11:40:34 -0000	1.103
+++ infrastructure/templates/Makefile.template	8 May 2025 09:41:42 -0000
@@ -45,7 +45,7 @@ DISTNAME =	???
 # /releases/ -> preferred. Use SITES and DISTNAME.
 # /archive/ -> use DIST_TUPLE (use only if there is no release version).
 #
-# platform: codeberg, github, gitlab, kde, srht, gnome
+# platform: codeberg, github, gitlab, kde, srht, gnome, fdo
 # account: usually the account or organisation name
 # project: the project or repository name
 # id: either a tag name or commit hash.
Index: graphics/piglit//Makefile
===================================================================
RCS file: /cvs/ports/graphics/piglit/Makefile,v
diff -u -p -r1.25 Makefile
--- graphics/piglit//Makefile	21 Dec 2024 11:38:16 -0000	1.25
+++ graphics/piglit//Makefile	8 May 2025 09:43:49 -0000
@@ -3,9 +3,7 @@ ONLY_FOR_ARCHS =	amd64 i386
 
 DISTNAME =	piglit-20210128
 
-GH_ACCOUNT =	mesa3d
-GH_PROJECT =	piglit
-GH_COMMIT =	83173d9536c9f5e1571efe5933d210466ec255b8
+DIST_TUPLE =	fdo mesa piglit 83173d9536c9f5e1571efe5933d210466ec255b8 .
 REVISION =	9
 
 CATEGORIES =	graphics
Index: graphics/piglit//distinfo
===================================================================
RCS file: /cvs/ports/graphics/piglit/distinfo,v
diff -u -p -r1.3 distinfo
--- graphics/piglit//distinfo	31 Jan 2021 03:19:35 -0000	1.3
+++ graphics/piglit//distinfo	8 May 2025 09:43:49 -0000
@@ -1,2 +1,2 @@
-SHA256 (piglit-20210128-83173d95.tar.gz) = ZBMyCxuX7+bElStP4AfIzh6em/9Lceeqk/+f7Qq4PrY=
-SIZE (piglit-20210128-83173d95.tar.gz) = 24504653
+SHA256 (mesa-piglit-83173d9536c9f5e1571efe5933d210466ec255b8.tar.gz) = ZBMyCxuX7+bElStP4AfIzh6em/9Lceeqk/+f7Qq4PrY=
+SIZE (mesa-piglit-83173d9536c9f5e1571efe5933d210466ec255b8.tar.gz) = 24504653