diff --git a/repos/gems/run/mixer_gui_qt_test.run b/repos/gems/run/mixer_gui_qt_test.run index cd5e7b3b6e..313cb7d10d 100644 --- a/repos/gems/run/mixer_gui_qt_test.run +++ b/repos/gems/run/mixer_gui_qt_test.run @@ -74,7 +74,7 @@ append config { - + diff --git a/repos/gems/run/tiled_wm.run b/repos/gems/run/tiled_wm.run index 79f2c2ceb6..c57f740e83 100644 --- a/repos/gems/run/tiled_wm.run +++ b/repos/gems/run/tiled_wm.run @@ -118,7 +118,7 @@ append config { - + @@ -144,7 +144,7 @@ append config { - + @@ -167,7 +167,7 @@ append config { - + @@ -190,7 +190,7 @@ append config { - + @@ -212,7 +212,7 @@ append config { - + diff --git a/repos/libports/lib/mk/egl_etnaviv.mk b/repos/libports/lib/mk/mesa_gpu-etnaviv.mk similarity index 100% rename from repos/libports/lib/mk/egl_etnaviv.mk rename to repos/libports/lib/mk/mesa_gpu-etnaviv.mk diff --git a/repos/libports/lib/mk/egl_swrast.mk b/repos/libports/lib/mk/mesa_gpu-softpipe.mk similarity index 100% rename from repos/libports/lib/mk/egl_swrast.mk rename to repos/libports/lib/mk/mesa_gpu-softpipe.mk diff --git a/repos/libports/lib/mk/spec/x86/egl_iris.mk b/repos/libports/lib/mk/spec/x86/mesa_gpu-iris.mk similarity index 100% rename from repos/libports/lib/mk/spec/x86/egl_iris.mk rename to repos/libports/lib/mk/spec/x86/mesa_gpu-iris.mk diff --git a/repos/libports/ports/mesa.hash b/repos/libports/ports/mesa.hash index 4dffb698d3..a9fd1ba455 100644 --- a/repos/libports/ports/mesa.hash +++ b/repos/libports/ports/mesa.hash @@ -1 +1 @@ -d94cb280e69b2663c9405efbd4117f04f2d9c563 +c964a648360166b72246613a7be71bbfa6475d88 diff --git a/repos/libports/recipes/pkg/mesa_gears/runtime b/repos/libports/recipes/pkg/mesa_gears/runtime index 4a4138ad53..843a701025 100644 --- a/repos/libports/recipes/pkg/mesa_gears/runtime +++ b/repos/libports/recipes/pkg/mesa_gears/runtime @@ -1,4 +1,4 @@ - + @@ -24,34 +24,12 @@ - - - - - - - - - - - - - - - - - - 2000-01-01 00:00 - - - - - - - - - - + + + + 2000-01-01 00:00 + + diff --git a/repos/libports/recipes/pkg/mesa_gpu-cpu/README b/repos/libports/recipes/pkg/mesa_gpu-cpu/README index 999573064c..5b0c80f03f 100644 --- a/repos/libports/recipes/pkg/mesa_gpu-cpu/README +++ b/repos/libports/recipes/pkg/mesa_gpu-cpu/README @@ -1 +1 @@ -SWRAST Gallium driver of MESA using solely the CPU +Softpipe Gallium driver of MESA using solely the CPU diff --git a/repos/libports/recipes/pkg/mesa_gpu-cpu/runtime b/repos/libports/recipes/pkg/mesa_gpu-cpu/runtime index cf3bdf7b41..f86207d993 100644 --- a/repos/libports/recipes/pkg/mesa_gpu-cpu/runtime +++ b/repos/libports/recipes/pkg/mesa_gpu-cpu/runtime @@ -5,7 +5,7 @@ - + @@ -15,7 +15,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/repos/libports/recipes/pkg/mesa_gpu-intel/runtime b/repos/libports/recipes/pkg/mesa_gpu-intel/runtime index 9e5cce20c4..d3015d9f56 100644 --- a/repos/libports/recipes/pkg/mesa_gpu-intel/runtime +++ b/repos/libports/recipes/pkg/mesa_gpu-intel/runtime @@ -5,7 +5,7 @@ - + @@ -15,7 +15,7 @@ - + @@ -33,7 +33,7 @@ - + diff --git a/repos/libports/recipes/src/mesa/content.mk b/repos/libports/recipes/src/mesa/content.mk index 281c34c5d5..cffce61c6b 100644 --- a/repos/libports/recipes/src/mesa/content.mk +++ b/repos/libports/recipes/src/mesa/content.mk @@ -1,7 +1,7 @@ MIRROR_FROM_REP_DIR := \ lib/mk/egl.mk \ - lib/mk/egl_etnaviv.mk \ - lib/mk/egl_swrast.mk \ + lib/mk/mesa_gpu-etnaviv.mk \ + lib/mk/mesa_gpu-softpipe.mk \ lib/mk/etnaviv.mk \ lib/mk/iris_gen.inc \ lib/mk/isl_gen.inc \ @@ -11,7 +11,7 @@ MIRROR_FROM_REP_DIR := \ lib/mk/mesa-common.inc \ lib/mk/softpipe.mk \ lib/mk/spec/arm_v8/mesa.mk \ - lib/mk/spec/x86/egl_iris.mk \ + lib/mk/spec/x86/mesa_gpu-iris.mk \ lib/mk/spec/x86/iris.mk \ lib/mk/spec/x86/iris_gen110.mk \ lib/mk/spec/x86/iris_gen120.mk \ diff --git a/repos/libports/run/mesa.inc b/repos/libports/run/mesa.inc index 002d7bc6a6..3eea52dc1c 100644 --- a/repos/libports/run/mesa.inc +++ b/repos/libports/run/mesa.inc @@ -100,9 +100,9 @@ set config { } -set backend_library egl_swrast.lib.so -if {$use_iris} { set backend_library egl_iris.lib.so } -if {$use_etnaviv} { set backend_library egl_etnaviv.lib.so } +set backend_library mesa_gpu-softpipe.lib.so +if {$use_iris} { set backend_library mesa_gpu-iris.lib.so } +if {$use_etnaviv} { set backend_library mesa_gpu-etnaviv.lib.so } append config " @@ -112,7 +112,7 @@ append config $demo_config append config " - + " append config { @@ -156,17 +156,17 @@ set boot_modules { libc.lib.so vfs.lib.so libm.lib.so egl.lib.so mesa.lib.so stdcxx.lib.so expat.lib.so glapi.lib.so zlib.lib.so - core init ld.lib.so timer egl_swrast.lib.so + core init ld.lib.so timer mesa_gpu-softpipe.lib.so libdrm.lib.so } append_if $use_iris boot_modules { - egl_iris.lib.so libdrm.lib.so + mesa_gpu-iris.lib.so libdrm.lib.so intel_gpu_drv } append_if $use_etnaviv boot_modules { - egl_etnaviv.lib.so libdrm.lib.so + mesa_gpu-etnaviv.lib.so libdrm.lib.so imx8q_gpu_drv } diff --git a/repos/libports/run/qt5.run b/repos/libports/run/qt5.run index c7eff40514..b0d7998c16 100644 --- a/repos/libports/run/qt5.run +++ b/repos/libports/run/qt5.run @@ -76,7 +76,7 @@ append config { - + diff --git a/repos/libports/run/qt5_calculatorform.run b/repos/libports/run/qt5_calculatorform.run index f88be6666e..74c96cdac3 100644 --- a/repos/libports/run/qt5_calculatorform.run +++ b/repos/libports/run/qt5_calculatorform.run @@ -40,7 +40,9 @@ append config { - + + + diff --git a/repos/libports/run/qt5_openglwindow.run b/repos/libports/run/qt5_openglwindow.run index 63dd2ec148..54ae7d3aed 100644 --- a/repos/libports/run/qt5_openglwindow.run +++ b/repos/libports/run/qt5_openglwindow.run @@ -28,7 +28,9 @@ append config { - + + + diff --git a/repos/libports/run/qt5_qpluginwidget.run b/repos/libports/run/qt5_qpluginwidget.run index d004ae7fa7..2c92281446 100644 --- a/repos/libports/run/qt5_qpluginwidget.run +++ b/repos/libports/run/qt5_qpluginwidget.run @@ -78,7 +78,9 @@ append config { - + + + diff --git a/repos/libports/run/qt5_quicktest.run b/repos/libports/run/qt5_quicktest.run index 127a95f643..503a13c79b 100644 --- a/repos/libports/run/qt5_quicktest.run +++ b/repos/libports/run/qt5_quicktest.run @@ -42,7 +42,9 @@ append config { - + + + diff --git a/repos/libports/run/qt5_samegame.run b/repos/libports/run/qt5_samegame.run index b043614a52..a26569b1d3 100644 --- a/repos/libports/run/qt5_samegame.run +++ b/repos/libports/run/qt5_samegame.run @@ -45,7 +45,9 @@ append config { - + + + diff --git a/repos/libports/run/qt5_testqstring.run b/repos/libports/run/qt5_testqstring.run index 2ad531eef8..445659988a 100644 --- a/repos/libports/run/qt5_testqstring.run +++ b/repos/libports/run/qt5_testqstring.run @@ -40,7 +40,9 @@ append config { - + + + diff --git a/repos/libports/run/qt5_tetrix.run b/repos/libports/run/qt5_tetrix.run index b06303d296..e778a5887b 100644 --- a/repos/libports/run/qt5_tetrix.run +++ b/repos/libports/run/qt5_tetrix.run @@ -40,7 +40,9 @@ append config { - + + + diff --git a/repos/libports/run/qt5_textedit.run b/repos/libports/run/qt5_textedit.run index 81b56778cf..2f56e7d096 100644 --- a/repos/libports/run/qt5_textedit.run +++ b/repos/libports/run/qt5_textedit.run @@ -55,7 +55,9 @@ append config { - + + + @@ -78,7 +80,9 @@ append config { - + + + diff --git a/repos/libports/run/qt5_virtualkeyboard.run b/repos/libports/run/qt5_virtualkeyboard.run index 17c9bc3d4c..85f846b842 100644 --- a/repos/libports/run/qt5_virtualkeyboard.run +++ b/repos/libports/run/qt5_virtualkeyboard.run @@ -49,7 +49,9 @@ append config { - + + + diff --git a/repos/libports/src/lib/mesa/egl/platform.c b/repos/libports/src/lib/mesa/egl/platform.c index 5e73242785..26fa5e1569 100644 --- a/repos/libports/src/lib/mesa/egl/platform.c +++ b/repos/libports/src/lib/mesa/egl/platform.c @@ -162,8 +162,8 @@ EGLBoolean dri2_initialize_genode(_EGLDisplay *disp) { void *handle; - if (!(handle = dlopen("egl_drv.lib.so", 0))) { - printf("Error: could not open EGL back end driver ('egl_drv.lib.so')\n"); + if (!(handle = dlopen("mesa_gpu_drv.lib.so", 0))) { + printf("Error: could not open EGL back end driver ('mesa_gpu_drv.lib.so')\n"); return EGL_FALSE; } diff --git a/repos/libports/src/lib/mesa/etnaviv/target.mk b/repos/libports/src/lib/mesa/etnaviv/target.mk index e86029de93..0037f20053 100644 --- a/repos/libports/src/lib/mesa/etnaviv/target.mk +++ b/repos/libports/src/lib/mesa/etnaviv/target.mk @@ -1 +1 @@ -LIBS = egl_etnaviv +LIBS := mesa_gpu-etnaviv diff --git a/repos/libports/src/lib/mesa/iris/target.mk b/repos/libports/src/lib/mesa/iris/target.mk index 44a2e973c6..c103ff56f7 100644 --- a/repos/libports/src/lib/mesa/iris/target.mk +++ b/repos/libports/src/lib/mesa/iris/target.mk @@ -1,2 +1,2 @@ -TARGET = dummy-egl_iris -LIBS = egl_iris +TARGET = dummy-mesa_gpu-iris +LIBS = mesa_gpu-iris diff --git a/repos/libports/src/lib/mesa/patches/mesa.patch b/repos/libports/src/lib/mesa/patches/mesa.patch index ecd2cebdba..a7f7253f39 100644 --- a/repos/libports/src/lib/mesa/patches/mesa.patch +++ b/repos/libports/src/lib/mesa/patches/mesa.patch @@ -85,7 +85,7 @@ index d64bc7c..9a25398 100644 #endif if (driver == NULL) { - snprintf(path, sizeof(path), "%.*s/%s_dri.so", len, p, driver_name); -+ snprintf(path, sizeof(path), "%.*s/egl_drv.lib.so", len, p); ++ snprintf(path, sizeof(path), "%.*s/mesa_gpu_drv.lib.so", len, p); driver = dlopen(path, RTLD_NOW | RTLD_GLOBAL); if (driver == NULL) { dl_error = dlerror(); diff --git a/repos/libports/src/lib/mesa/softpipe/target.mk b/repos/libports/src/lib/mesa/softpipe/target.mk index 1e0d87d214..682115dbee 100644 --- a/repos/libports/src/lib/mesa/softpipe/target.mk +++ b/repos/libports/src/lib/mesa/softpipe/target.mk @@ -1 +1 @@ -LIBS = egl_swrast +LIBS := mesa_gpu-softpipe