internal/rosa/meson: migrate to helper interface

This change also removes some unused options.

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

1 files changed, 23 insertions, 20 deletions

diff --git a/internal/rosa/wayland.go b/internal/rosa/wayland.go
index 063c71b0..00c5862d 100644
--- a/internal/rosa/wayland.go
+++ b/internal/rosa/wayland.go
@@ -7,30 +7,31 @@ func (t Toolchain) newWayland() pkg.Artifact {
 		version  = "1.24.0"
 		checksum = "JxgLiFRRGw2D3uhVw8ZeDbs3V7K_d4z_ypDog2LBqiA_5y2vVbUAk5NT6D5ozm0m"
 	)
-	return t.NewViaMeson("wayland", version, pkg.NewHTTPGetTar(
+	return t.NewPackage("wayland", version, pkg.NewHTTPGetTar(
 		nil, "https://gitlab.freedesktop.org/wayland/wayland/"+
 			"-/archive/"+version+"/wayland-"+version+".tar.bz2",
 		mustDecode(checksum),
 		pkg.TarBzip2,
-	), &MesonAttr{
+	), &PackageAttr{
 		Writable: true,
 		ScriptEarly: `
 cd /usr/src/wayland
 chmod +w tests tests/sanity-test.c
 echo 'int main(){}' > tests/sanity-test.c
 `,
-		Configure: [][2]string{
+	}, &MesonHelper{
+		Setup: [][2]string{
 			{"Ddefault_library", "both"},
 			{"Ddocumentation", "false"},
 			{"Dtests", "true"},
 		},
 	},
-		t.Load(Gawk),
-		t.Load(Diffutils),
+		Gawk,
+		Diffutils,
 
-		t.Load(Libffi),
-		t.Load(Libexpat),
-		t.Load(Libxml2),
+		Libffi,
+		Libexpat,
+		Libxml2,
 	)
 }
 func init() { artifactsF[Wayland] = Toolchain.newWayland }
@@ -40,13 +41,14 @@ func (t Toolchain) newWaylandProtocols() pkg.Artifact {
 		version  = "1.47"
 		checksum = "B_NodZ7AQfCstcx7kgbaVjpkYOzbAQq0a4NOk-SA8bQixAE20FY3p1-6gsbPgHn9"
 	)
-	return t.NewViaMeson("wayland-protocols", version, t.NewPatchedSource(
-		"wayland-protocols", version, pkg.NewHTTPGetTar(
-			nil, "https://gitlab.freedesktop.org/wayland/wayland-protocols/"+
-				"-/archive/"+version+"/wayland-protocols-"+version+".tar.bz2",
-			mustDecode(checksum),
-			pkg.TarBzip2,
-		), false, [2]string{"build-only", `From 8b4c76275fa1b6e0a99a53494151d9a2c907144d Mon Sep 17 00:00:00 2001
+	return t.NewPackage("wayland-protocols", version, pkg.NewHTTPGetTar(
+		nil, "https://gitlab.freedesktop.org/wayland/wayland-protocols/"+
+			"-/archive/"+version+"/wayland-protocols-"+version+".tar.bz2",
+		mustDecode(checksum),
+		pkg.TarBzip2,
+	), &PackageAttr{
+		Patches: [][2]string{
+			{"build-only", `From 8b4c76275fa1b6e0a99a53494151d9a2c907144d Mon Sep 17 00:00:00 2001
 From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
 Date: Fri, 8 Nov 2024 11:27:25 -0600
 Subject: [PATCH] tests: Make build-only tests actually build-only
@@ -97,11 +99,12 @@ index aa216ec2..5a93bb36 100644
 -- 
 GitLab
 `},
-	), nil,
-		t.Load(Wayland),
-		t.Load(Libffi),
-		t.Load(Libexpat),
-		t.Load(Libxml2),
+		},
+	}, (*MesonHelper)(nil),
+		Wayland,
+		Libffi,
+		Libexpat,
+		Libxml2,
 	)
 }
 func init() { artifactsF[WaylandProtocols] = Toolchain.newWaylandProtocols }