summaryrefslogtreecommitdiff
path: root/graphics/mesa-devel/files/patch-suffix
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2020-12-05 04:30:15 +0000
committerJan Beich <jbeich@FreeBSD.org>2020-12-05 04:30:15 +0000
commit38c4d4626b7f8de483e4e0891bc14d7328d001c3 (patch)
tree7640871097ba9aadffdca21e65cc112fbaeeb70d /graphics/mesa-devel/files/patch-suffix
parentdevel/jna: fix packaging on powerpc64le (diff)
graphics/mesa-devel: update to 20.3.b.1120
Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/d3c67d7e7ec...ef9362acb81
Notes
Notes: svn path=/head/; revision=557039
Diffstat (limited to 'graphics/mesa-devel/files/patch-suffix')
-rw-r--r--graphics/mesa-devel/files/patch-suffix16
1 files changed, 8 insertions, 8 deletions
diff --git a/graphics/mesa-devel/files/patch-suffix b/graphics/mesa-devel/files/patch-suffix
index 116cff824df1..087c454c932e 100644
--- a/graphics/mesa-devel/files/patch-suffix
+++ b/graphics/mesa-devel/files/patch-suffix
@@ -51,14 +51,14 @@ Library selection is handled by libglvnd and/or libmap.conf.
[libradv_files, radv_entrypoints, radv_extensions_c, amd_vk_format_table_c, sha1_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/meson.build.orig 2020-05-30 21:28:01 UTC
+--- src/egl/meson.build.orig 2020-12-03 22:36:27 UTC
+++ src/egl/meson.build
-@@ -147,7 +147,7 @@ if not with_glvnd
+@@ -144,7 +144,7 @@ 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_name = 'EGL_@0@'.format(glvnd_vendor_name)
++ egl_lib_name = 'EGL_@0@'.format(glvnd_vendor_name) + get_option('egl-lib-suffix')
egl_lib_version = '0.0.0'
deps_for_egl += dep_glvnd
files_egl += [g_egldispatchstubs_h, g_egldispatchstubs_c]
@@ -90,9 +90,9 @@ Library selection is handled by libglvnd and/or libmap.conf.
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.orig 2020-12-03 22:36:27 UTC
+++ src/glx/meson.build
-@@ -113,10 +113,10 @@ elif with_dri_platform == 'windows'
+@@ -108,10 +108,10 @@ elif with_dri_platform == 'windows'
endif
if not with_glvnd
@@ -100,8 +100,8 @@ Library selection is handled by libglvnd and/or libmap.conf.
+ 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_name = 'GLX_@0@'.format(glvnd_vendor_name)
++ gl_lib_name = 'GLX_@0@'.format(glvnd_vendor_name) + get_option('egl-lib-suffix')
gl_lib_version = '0.0.0'
files_libglx += files(
'g_glxglvnddispatchfuncs.c',