internal/rosa: create metadata alongside artifact

This enables deferring evaluation of azalea-based packages and fixes the longstanding quirk of version being disjoint from other metadata.

Signed-off-by: Ophestra <cat@gensokyo.uk>

1 files changed, 4 insertions, 12 deletions

diff --git a/internal/rosa/mesa.go b/internal/rosa/mesa.go
index 58ca7c86..94cb120a 100644
--- a/internal/rosa/mesa.go
+++ b/internal/rosa/mesa.go
@@ -35,9 +35,7 @@ trap 'kill $XVFB_PID && wait $XVFB_PID' EXIT
 	), version
 }
 func init() {
-	native.MustRegister(&Artifact{
-		f: Toolchain.newLibglvnd,
-
+	native.mustRegister(Toolchain.newLibglvnd, &Metadata{
 		Name:        "libglvnd",
 		Description: "The GL Vendor-Neutral Dispatch library",
 		Website:     "https://gitlab.freedesktop.org/glvnd/libglvnd",
@@ -72,9 +70,7 @@ func (t Toolchain) newLibdrm() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	native.MustRegister(&Artifact{
-		f: Toolchain.newLibdrm,
-
+	native.mustRegister(Toolchain.newLibdrm, &Metadata{
 		Name:        "libdrm",
 		Description: "a userspace library for accessing the DRM",
 		Website:     "https://dri.freedesktop.org/",
@@ -111,9 +107,7 @@ func (t Toolchain) newLibva() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	native.MustRegister(&Artifact{
-		f: Toolchain.newLibva,
-
+	native.mustRegister(Toolchain.newLibva, &Metadata{
 		Name:        "libva",
 		Description: "an implementation for VA-API (Video Acceleration API)",
 		Website:     "https://01.org/vaapi",
@@ -238,9 +232,7 @@ func (t Toolchain) newMesa() (pkg.Artifact, string) {
 	), version
 }
 func init() {
-	native.MustRegister(&Artifact{
-		f: Toolchain.newMesa,
-
+	native.mustRegister(Toolchain.newMesa, &Metadata{
 		Name:        "mesa",
 		Description: "open source implementations of OpenGL, OpenGL ES, Vulkan, OpenCL, and more",
 		Website:     "https://mesa3d.org",