mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2025-12-16 00:08:58 +03:00
fd8438899c
media-libs/mesa became incompatible with media-libs/mesa-amber. Rename mesa-amber libraries and install them alongside. Rename 50_amber.json to 55_amber.json so 50_mesa.json has higher priority. Without this change, xorg can crash. For Intel, Mesa provides crocus and iris, Mesa Amber provides the older i965. Tested with an Intel HD 4600. XOrg: - modesetting driver uses crocus and works - intel driver can use crocus and i965, works with both. Wayland: - i965 works, but lacks some features that crocus has. - crocus works great. For Radeon r200: Mesa alone has no driver for this, Mesa Amber has a driver for r200. XOrg: - r200 works, glxinfo shows some OpenGL. Wayland: - does not work. Even if the r200 driver works, it lacks a needed extension for wayland to start. With -r3 eglinfo does not crash (it did crash with -r2). Also we can run sway with pixman now, it was crashing with -r2. Bug: https://bugs.gentoo.org/945373 Signed-off-by: Viorel Munteanu <ceamac@gentoo.org>
38 lines
1.0 KiB
Diff
38 lines
1.0 KiB
Diff
https://bugs.gentoo.org/945373
|
|
|
|
media-libs/mesa became incompatible with media-libs/mesa-amber.
|
|
The best way to deal with this seems to be to rename mesa-amber
|
|
libraries and install them alongside.
|
|
|
|
This patch renames libgbm.so to libgbm-amber.so and libglapi.so to
|
|
libglapi-amber.so, so mesa-amber drivers can use their own libraries.
|
|
|
|
--- a/src/gbm/meson.build
|
|
+++ b/src/gbm/meson.build
|
|
@@ -45,8 +45,10 @@ if with_platform_wayland
|
|
incs_gbm += inc_wayland_drm
|
|
endif
|
|
|
|
+gbm_lib_name = 'gbm_@0@'.format(glvnd_vendor_name)
|
|
+
|
|
libgbm = shared_library(
|
|
- 'gbm',
|
|
+ gbm_lib_name,
|
|
files_gbm,
|
|
include_directories : incs_gbm,
|
|
c_args : [args_gbm],
|
|
--- a/src/mapi/shared-glapi/meson.build
|
|
+++ b/src/mapi/shared-glapi/meson.build
|
|
@@ -41,8 +41,10 @@ if with_platform_windows
|
|
_glapi_c_args += ['-D_GLAPI_DLL_EXPORTS']
|
|
endif
|
|
|
|
+glapi_lib_name = 'glapi_@0@'.format(glvnd_vendor_name)
|
|
+
|
|
libglapi = shared_library(
|
|
- 'glapi',
|
|
+ glapi_lib_name,
|
|
[files_mapi_glapi, files_mapi_util, shared_glapi_mapi_tmp_h],
|
|
c_args : [
|
|
_glapi_c_args,
|