diff options
Diffstat (limited to 'graphics/mesa-devel/files/patch-suffix')
| -rw-r--r-- | graphics/mesa-devel/files/patch-suffix | 179 |
1 files changed, 179 insertions, 0 deletions
diff --git a/graphics/mesa-devel/files/patch-suffix b/graphics/mesa-devel/files/patch-suffix new file mode 100644 index 000000000000..61d00a719e70 --- /dev/null +++ b/graphics/mesa-devel/files/patch-suffix @@ -0,0 +1,179 @@ +Add library suffix to avoid conflict with mesa-libs + mesa-dri. +Library selection is handled by libglvnd and/or libmap.conf. + +--- meson.build.orig 2020-05-30 21:28:01 UTC ++++ meson.build +@@ -79,7 +79,7 @@ with_imgui = with_intel_tools or with_vulkan_overlay_l + + dri_drivers_path = get_option('dri-drivers-path') + if dri_drivers_path == '' +- dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri') ++ dri_drivers_path = join_paths(get_option('prefix'), get_option('libdir'), 'dri' + get_option('egl-lib-suffix')) + endif + dri_search_path = get_option('dri-search-path') + if dri_search_path == '' +@@ -427,9 +427,6 @@ if with_glvnd + elif with_glx == 'disabled' and not with_egl + error('glvnd requires DRI based GLX and/or EGL') + endif +- if get_option('egl-lib-suffix') != '' +- error('''EGL lib suffix can't be used with libglvnd''') +- endif + endif + + if with_vulkan_icd_dir == '' +@@ -491,7 +488,7 @@ if with_gallium_vdpau + endif + vdpau_drivers_path = get_option('vdpau-libs-path') + if vdpau_drivers_path == '' +- vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau') ++ vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau' + get_option('egl-lib-suffix')) + endif + + if with_gallium_zink +@@ -638,7 +635,7 @@ endif + + va_drivers_path = get_option('va-libs-path') + if va_drivers_path == '' +- va_drivers_path = join_paths(get_option('libdir'), 'dri') ++ va_drivers_path = join_paths(get_option('libdir'), 'dri' + get_option('egl-lib-suffix')) + endif + + _xa = get_option('gallium-xa') +--- src/amd/vulkan/meson.build.orig 2020-05-30 21:28:01 UTC ++++ src/amd/vulkan/meson.build +@@ -158,7 +158,7 @@ if with_platform_android + endif + + libvulkan_radeon = shared_library( +- 'vulkan_radeon', ++ 'vulkan_radeon' + get_option('egl-lib-suffix'), + [libradv_files, radv_entrypoints, radv_extensions_c, amd_vk_format_table_c, sha1_h, radv_gfx10_format_table_h], + include_directories : [ + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util, inc_vulkan_wsi, +--- src/egl/main/50_mesa.json.orig 2020-05-30 21:28:01 UTC ++++ src/egl/main/50_mesa.json +@@ -1,6 +1,6 @@ + { + "file_format_version" : "1.0.0", + "ICD" : { +- "library_path" : "libEGL_mesa.so.0" ++ "library_path" : "libEGL_mesa@0@.so.0".format(get_option('egl-lib-suffix')) + } + } +--- src/egl/meson.build.orig 2020-05-30 21:28:01 UTC ++++ src/egl/meson.build +@@ -147,13 +147,13 @@ if not with_glvnd + egl_lib_name = 'EGL' + get_option('egl-lib-suffix') + egl_lib_version = '1.0.0' + else +- egl_lib_name = 'EGL_mesa' ++ egl_lib_name = 'EGL_mesa' + get_option('egl-lib-suffix') + egl_lib_version = '0.0.0' + deps_for_egl += dep_glvnd + files_egl += [g_egldispatchstubs_h, g_egldispatchstubs_c] + files_egl += files('main/eglglvnd.c', 'main/egldispatchstubs.c') + install_data( +- 'main/50_mesa.json', ++ 'main/50_mesa@0@.json'.format(get_option('egl-lib-suffix')), + install_dir : join_paths(get_option('datadir'), 'glvnd', 'egl_vendor.d') + ) + endif +--- src/gbm/backends/dri/gbm_dri.c.orig 2020-05-30 21:28:01 UTC ++++ src/gbm/backends/dri/gbm_dri.c +@@ -307,14 +307,6 @@ dri_bind_extensions(struct gbm_dri_device *dri, + static const __DRIextension ** + dri_open_driver(struct gbm_dri_device *dri) + { +- /* Temporarily work around dri driver libs that need symbols in libglapi +- * but don't automatically link it in. +- */ +- /* XXX: Library name differs on per platforms basis. Update this as +- * osx/cygwin/windows/bsd gets support for GBM.. +- */ +- dlopen("libglapi.so.0", RTLD_LAZY | RTLD_GLOBAL); +- + static const char *search_path_vars[] = { + /* Read GBM_DRIVERS_PATH first for compatibility, but LIBGL_DRIVERS_PATH + * is recommended over GBM_DRIVERS_PATH. +--- src/gbm/meson.build.orig 2020-05-30 21:28:01 UTC ++++ src/gbm/meson.build +@@ -44,7 +44,7 @@ if with_platform_wayland + endif + + libgbm = shared_library( +- 'gbm', ++ 'gbm' + get_option('egl-lib-suffix'), + files_gbm, + include_directories : incs_gbm, + c_args : [c_vis_args, args_gbm], +--- src/glx/meson.build.orig 2020-05-30 21:28:01 UTC ++++ src/glx/meson.build +@@ -113,10 +113,10 @@ elif with_dri_platform == 'windows' + endif + + if not with_glvnd +- gl_lib_name = 'GL' ++ gl_lib_name = 'GL' + get_option('egl-lib-suffix') + gl_lib_version = '1.2.0' + else +- gl_lib_name = 'GLX_mesa' ++ gl_lib_name = 'GLX_mesa' + get_option('egl-lib-suffix') + gl_lib_version = '0.0.0' + files_libglx += files( + 'g_glxglvnddispatchfuncs.c', +--- src/intel/vulkan/meson.build.orig 2020-05-30 21:28:01 UTC ++++ src/intel/vulkan/meson.build +@@ -188,7 +188,7 @@ libanv_common = static_library( + ) + + libvulkan_intel = shared_library( +- 'vulkan_intel', ++ 'vulkan_intel' + get_option('egl-lib-suffix'), + [files('anv_gem.c'), anv_entrypoints[0], anv_extensions_h], + include_directories : [ + inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_intel, inc_compiler, inc_vulkan_wsi, +--- src/mapi/es1api/meson.build.orig 2020-05-30 21:28:01 UTC ++++ src/mapi/es1api/meson.build +@@ -33,7 +33,7 @@ if with_platform_windows + endif + + libglesv1_cm = shared_library( +- 'GLESv1_CM' + get_option('gles-lib-suffix'), ++ 'GLESv1_CM' + get_option('egl-lib-suffix') + get_option('gles-lib-suffix'), + ['../entry.c', es1_glapi_mapi_tmp_h], + c_args : [ + c_msvc_compat_args, +--- src/mapi/es2api/meson.build.orig 2020-05-30 21:28:01 UTC ++++ src/mapi/es2api/meson.build +@@ -33,7 +33,7 @@ if with_platform_windows + endif + + libgles2 = shared_library( +- 'GLESv2' + get_option('gles-lib-suffix'), ++ 'GLESv2' + get_option('egl-lib-suffix') + get_option('gles-lib-suffix'), + ['../entry.c', es2_glapi_mapi_tmp_h], + c_args : [ + c_msvc_compat_args, +--- src/mapi/shared-glapi/meson.build.orig 2020-05-30 21:28:01 UTC ++++ src/mapi/shared-glapi/meson.build +@@ -42,7 +42,7 @@ if with_platform_windows + endif + + libglapi = shared_library( +- 'glapi', ++ 'glapi' + get_option('egl-lib-suffix'), + [files_mapi_glapi, files_mapi_util, shared_glapi_mapi_tmp_h], + c_args : [ + _glapi_c_args, +--- src/util/meson.build.orig 2020-05-30 21:28:01 UTC ++++ src/util/meson.build +@@ -122,7 +122,7 @@ files_mesa_util = files( + 'xxhash.h', + ) + +-files_drirc = files('00-mesa-defaults.conf') ++files_drirc = files('00-mesa@0@-defaults.conf'.format(get_option('egl-lib-suffix'))) + + install_data(files_drirc, install_dir : join_paths(get_option('datadir'), 'drirc.d')) + |