From 6112c0df6d6520d02b04649b3b2adaebe78815d5 Mon Sep 17 00:00:00 2001
From: Alexander Boettcher <alexander.boettcher@genode-labs.com>
Date: Fri, 24 Sep 2021 12:02:16 +0200
Subject: [PATCH] mesa: rename gpu-* pkg to mesa_gpu-*

for easier linking by user with the Mesa client ROM requests, which will be
mesa_gpu-drv.lib.so. Adjust mesa-gears demo accordingly.

Issue #4263
---
 .../recipes/pkg/sculpt-installation/archives  |  4 +-
 repos/gems/run/sculpt/index                   |  4 +-
 repos/libports/recipes/pkg/gpu-iris/hash      |  1 -
 .../libports/recipes/pkg/mesa_gears/archives  |  1 +
 repos/libports/recipes/pkg/mesa_gears/runtime | 39 +++++++++++++++----
 .../pkg/{gpu-cpu => mesa_gpu-cpu}/README      |  0
 .../pkg/{gpu-cpu => mesa_gpu-cpu}/archives    |  0
 .../pkg/{gpu-cpu => mesa_gpu-cpu}/hash        |  0
 .../pkg/{gpu-cpu => mesa_gpu-cpu}/runtime     |  0
 .../pkg/{gpu-iris => mesa_gpu-intel}/README   |  0
 .../pkg/{gpu-iris => mesa_gpu-intel}/archives |  0
 .../libports/recipes/pkg/mesa_gpu-intel/hash  |  1 +
 .../pkg/{gpu-iris => mesa_gpu-intel}/runtime  |  0
 13 files changed, 37 insertions(+), 13 deletions(-)
 delete mode 100644 repos/libports/recipes/pkg/gpu-iris/hash
 rename repos/libports/recipes/pkg/{gpu-cpu => mesa_gpu-cpu}/README (100%)
 rename repos/libports/recipes/pkg/{gpu-cpu => mesa_gpu-cpu}/archives (100%)
 rename repos/libports/recipes/pkg/{gpu-cpu => mesa_gpu-cpu}/hash (100%)
 rename repos/libports/recipes/pkg/{gpu-cpu => mesa_gpu-cpu}/runtime (100%)
 rename repos/libports/recipes/pkg/{gpu-iris => mesa_gpu-intel}/README (100%)
 rename repos/libports/recipes/pkg/{gpu-iris => mesa_gpu-intel}/archives (100%)
 create mode 100644 repos/libports/recipes/pkg/mesa_gpu-intel/hash
 rename repos/libports/recipes/pkg/{gpu-iris => mesa_gpu-intel}/runtime (100%)

diff --git a/repos/gems/recipes/pkg/sculpt-installation/archives b/repos/gems/recipes/pkg/sculpt-installation/archives
index 1a4362820b..511fa7a6cb 100644
--- a/repos/gems/recipes/pkg/sculpt-installation/archives
+++ b/repos/gems/recipes/pkg/sculpt-installation/archives
@@ -22,5 +22,5 @@ _/pkg/report_dump
 _/pkg/acpica
 _/pkg/qt5_textedit
 _/pkg/system_clock
-_/pkg/gpu-cpu
-_/pkg/gpu-iris
+_/pkg/mesa_gpu-cpu
+_/pkg/mesa_gpu-intel
diff --git a/repos/gems/run/sculpt/index b/repos/gems/run/sculpt/index
index a04481b6bf..b00c3b11a6 100644
--- a/repos/gems/run/sculpt/index
+++ b/repos/gems/run/sculpt/index
@@ -11,8 +11,8 @@
   </index>
 
   <index name="Mesa 3D">
-    <pkg path="gpu-cpu" info="SWRAST Mesa driver"/>
-    <pkg path="gpu-iris" info="Intel IRIS Mesa driver"/>
+    <pkg path="mesa_gpu-cpu"   info="SWRAST Mesa driver"/>
+    <pkg path="mesa_gpu-intel" info="Intel IRIS Mesa driver"/>
   </index>
 
   <index name="Tools">
diff --git a/repos/libports/recipes/pkg/gpu-iris/hash b/repos/libports/recipes/pkg/gpu-iris/hash
deleted file mode 100644
index 11a3272b59..0000000000
--- a/repos/libports/recipes/pkg/gpu-iris/hash
+++ /dev/null
@@ -1 +0,0 @@
-2021-09-21-b ab93bfd5aca22aeb0895438faf53bad5d288b965
diff --git a/repos/libports/recipes/pkg/mesa_gears/archives b/repos/libports/recipes/pkg/mesa_gears/archives
index 18f4099ce6..3e304e9517 100644
--- a/repos/libports/recipes/pkg/mesa_gears/archives
+++ b/repos/libports/recipes/pkg/mesa_gears/archives
@@ -1,5 +1,6 @@
 _/src/mesa_gears
 _/src/mesa
+_/src/init
 _/src/libdrm
 _/src/libc
 _/src/vfs
diff --git a/repos/libports/recipes/pkg/mesa_gears/runtime b/repos/libports/recipes/pkg/mesa_gears/runtime
index 4963ad6064..4a4138ad53 100644
--- a/repos/libports/recipes/pkg/mesa_gears/runtime
+++ b/repos/libports/recipes/pkg/mesa_gears/runtime
@@ -1,10 +1,10 @@
-<runtime ram="32M" caps="300" binary="gears">
+<runtime ram="34M" caps="400" binary="init">
 
 	<requires>
 		<gui/>
 		<gpu/>
 		<timer/>
-		<rom label="egl_drv.lib.so"/>
+		<rom label="mesa_gpu_drv.lib.so"/>
 	</requires>
 
 	<content>
@@ -12,6 +12,7 @@
 		<rom label="expat.lib.so"/>
 		<rom label="gears"/>
 		<rom label="glapi.lib.so"/>
+		<rom label="init"/>
 		<rom label="ld.lib.so"/>
 		<rom label="libc.lib.so"/>
 		<rom label="libdrm.lib.so"/>
@@ -23,12 +24,34 @@
 	</content>
 
 	<config>
-		<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" />
-		<vfs>
-			<dir name="dev">
-				<log/> <inline name="rtc">2000-01-01 00:00</inline>
-			</dir>
-		</vfs>
+		<parent-provides>
+			<service name="ROM"/>
+			<service name="PD"/>
+			<service name="RM"/>
+			<service name="CPU"/>
+			<service name="LOG"/>
+			<service name="Timer"/>
+			<service name="Gpu"/>
+			<service name="Gui"/>
+		</parent-provides>
+
+		<start name="gears" caps="300">
+			<resource name="RAM" quantum="32M"/>
+			<config>
+				<libc stdout="/dev/log" stderr="/dev/log" rtc="/dev/rtc" />
+				<vfs>
+					<dir name="dev">
+						<log/> <inline name="rtc">2000-01-01 00:00</inline>
+					</dir>
+				</vfs>
+			</config>
+			<route>
+				<service name="ROM" label="egl_drv.lib.so">
+					<parent label="mesa_gpu_drv.lib.so"/>
+				</service>
+				<any-service> <parent/> </any-service>
+			</route>
+		</start>
 	</config>
 
 </runtime>
diff --git a/repos/libports/recipes/pkg/gpu-cpu/README b/repos/libports/recipes/pkg/mesa_gpu-cpu/README
similarity index 100%
rename from repos/libports/recipes/pkg/gpu-cpu/README
rename to repos/libports/recipes/pkg/mesa_gpu-cpu/README
diff --git a/repos/libports/recipes/pkg/gpu-cpu/archives b/repos/libports/recipes/pkg/mesa_gpu-cpu/archives
similarity index 100%
rename from repos/libports/recipes/pkg/gpu-cpu/archives
rename to repos/libports/recipes/pkg/mesa_gpu-cpu/archives
diff --git a/repos/libports/recipes/pkg/gpu-cpu/hash b/repos/libports/recipes/pkg/mesa_gpu-cpu/hash
similarity index 100%
rename from repos/libports/recipes/pkg/gpu-cpu/hash
rename to repos/libports/recipes/pkg/mesa_gpu-cpu/hash
diff --git a/repos/libports/recipes/pkg/gpu-cpu/runtime b/repos/libports/recipes/pkg/mesa_gpu-cpu/runtime
similarity index 100%
rename from repos/libports/recipes/pkg/gpu-cpu/runtime
rename to repos/libports/recipes/pkg/mesa_gpu-cpu/runtime
diff --git a/repos/libports/recipes/pkg/gpu-iris/README b/repos/libports/recipes/pkg/mesa_gpu-intel/README
similarity index 100%
rename from repos/libports/recipes/pkg/gpu-iris/README
rename to repos/libports/recipes/pkg/mesa_gpu-intel/README
diff --git a/repos/libports/recipes/pkg/gpu-iris/archives b/repos/libports/recipes/pkg/mesa_gpu-intel/archives
similarity index 100%
rename from repos/libports/recipes/pkg/gpu-iris/archives
rename to repos/libports/recipes/pkg/mesa_gpu-intel/archives
diff --git a/repos/libports/recipes/pkg/mesa_gpu-intel/hash b/repos/libports/recipes/pkg/mesa_gpu-intel/hash
new file mode 100644
index 0000000000..bd31c1b9d2
--- /dev/null
+++ b/repos/libports/recipes/pkg/mesa_gpu-intel/hash
@@ -0,0 +1 @@
+2021-09-24 ee4431ad3bc7b5401bcdd30816c17320cf111028
diff --git a/repos/libports/recipes/pkg/gpu-iris/runtime b/repos/libports/recipes/pkg/mesa_gpu-intel/runtime
similarity index 100%
rename from repos/libports/recipes/pkg/gpu-iris/runtime
rename to repos/libports/recipes/pkg/mesa_gpu-intel/runtime