diff options
| -rw-r--r-- | graphics/mesa-devel/Makefile | 5 | ||||
| -rw-r--r-- | graphics/mesa-devel/distinfo | 8 | ||||
| -rw-r--r-- | graphics/mesa-devel/files/patch-suffix | 16 |
3 files changed, 13 insertions, 16 deletions
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index d371f653f239..ab036c3aca96 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,8 +1,8 @@ # $FreeBSD$ PORTNAME= mesa -DISTVERSION= 20.3-branchpoint-1033 -DISTVERSIONSUFFIX= -gd3c67d7e7ec +DISTVERSION= 20.3-branchpoint-1120 +DISTVERSIONSUFFIX= -gef9362acb81 CATEGORIES= graphics PKGNAMESUFFIX= -devel @@ -16,7 +16,6 @@ PATCHFILES+= 700efacda59c.patch:-p1 PATCHFILES+= 4ed6d957f689.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/966#note_394512 PATCHFILES+= 167fa293d7b7.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5464 PATCHFILES+= 19e001833ec1.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7778 -PATCHFILES+= 789f6a802b0c.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7887 MAINTAINER= jbeich@FreeBSD.org COMMENT= Bleeding edge Mesa drivers (OpenGL, Vulkan) diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 741ba45125b5..c4d596e9b83b 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1606941813 -SHA256 (mesa3d-mesa-20.3-branchpoint-1033-gd3c67d7e7ec_GH0.tar.gz) = a49a3ce78962d16c78999eda36e420254d19e567ef3ff97520be8b88b71f1e83 -SIZE (mesa3d-mesa-20.3-branchpoint-1033-gd3c67d7e7ec_GH0.tar.gz) = 22359853 +TIMESTAMP = 1607126460 +SHA256 (mesa3d-mesa-20.3-branchpoint-1120-gef9362acb81_GH0.tar.gz) = 06651320bf43679d7775519f2ca1b67b7218577fe6e96980377f53f0aaf2507b +SIZE (mesa3d-mesa-20.3-branchpoint-1120-gef9362acb81_GH0.tar.gz) = 22452260 SHA256 (9f52b5177728.patch) = d4f380b8872726b88c1aa75d0a9cb63adf79144a7c34da6b7fd525ea417d2b73 SIZE (9f52b5177728.patch) = 832 SHA256 (2b9168cf579b.patch) = 2c664de141894b21368abab34fb1a1671d68845551520c9acb7dd5f1d0125072 @@ -19,5 +19,3 @@ SHA256 (167fa293d7b7.patch) = cc3ad8e59d5d4d7380917e715f676abba65549b07e377dbf6f SIZE (167fa293d7b7.patch) = 2496 SHA256 (19e001833ec1.patch) = 5ac28692c61dc3dcc5f7e74a8053d63365fc28fb28136ddb11791990a414f762 SIZE (19e001833ec1.patch) = 4057 -SHA256 (789f6a802b0c.patch) = cf31d0b04a4d134595adc04acbf861fc6e95a2f92c2f3343615f28bc09a441f3 -SIZE (789f6a802b0c.patch) = 868 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', |