diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2022-02-25 13:08:39 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2022-02-26 00:42:46 +0000 |
| commit | d34d11c6944f82fcb0c183cdae196bd417fda781 (patch) | |
| tree | e4ceada453ee69dfcf2548378d0e6d09ce1aadbe /graphics | |
| parent | 8a39e5b1f98911a755357caadfb47ebdf3f0b4d6 (diff) | |
| download | freebsd-ports-d34d11c6944f82fcb0c183cdae196bd417fda781.zip | |
graphics/mesa-devel: update to 21.4.b.828
Changes: https://gitlab.freedesktop.org/mesa/mesa/-/compare/b4bef890ee4...e5c39bc427f
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/mesa-devel/Makefile | 6 | ||||
| -rw-r--r-- | graphics/mesa-devel/distinfo | 6 | ||||
| -rw-r--r-- | graphics/mesa-devel/files/patch-suffix | 17 | ||||
| -rw-r--r-- | graphics/mesa-devel/pkg-plist | 1 |
4 files changed, 21 insertions, 9 deletions
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index c7174bdf7870..f4f07c519a4a 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,6 +1,6 @@ PORTNAME= mesa -DISTVERSION= 22.0-branchpoint-752 -DISTVERSIONSUFFIX= -gb4bef890ee4 +DISTVERSION= 22.0-branchpoint-828 +DISTVERSIONSUFFIX= -ge5c39bc427f CATEGORIES= graphics PKGNAMESUFFIX= -devel @@ -147,6 +147,8 @@ post-patch: ${WRKSRC}/bin/git_sha1_gen.py post-patch-COINST-on: + @${MV} ${WRKSRC}/src/amd/vulkan/00-radv-defaults.conf \ + ${WRKSRC}/src/amd/vulkan/00-radv${PKGNAMESUFFIX}-defaults.conf @${MV} ${WRKSRC}/src/util/00-${PORTNAME}-defaults.conf \ ${WRKSRC}/src/util/00-${PKGBASE}-defaults.conf diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index a420af09feb7..1ce787579f35 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,6 +1,6 @@ -TIMESTAMP = 1645651522 -SHA256 (mesa3d-mesa-22.0-branchpoint-752-gb4bef890ee4_GH0.tar.gz) = b2c8da58866ae27270a27607cff8745a60f93d067ed29eeccdeda8a02d16b2c1 -SIZE (mesa3d-mesa-22.0-branchpoint-752-gb4bef890ee4_GH0.tar.gz) = 23598120 +TIMESTAMP = 1645828462 +SHA256 (mesa3d-mesa-22.0-branchpoint-828-ge5c39bc427f_GH0.tar.gz) = 75dee3abdd483c5c23859c8182f8886e997b4ad6b10f78b1e057959fc5070b3b +SIZE (mesa3d-mesa-22.0-branchpoint-828-ge5c39bc427f_GH0.tar.gz) = 23610402 SHA256 (700efacda59c.patch) = f034cfbe09edff0baba67e46e7e3812fdef73ff3cf3e579050c024c95234c8d5 SIZE (700efacda59c.patch) = 981 SHA256 (50433886a3e3.patch) = 15af265e9dbb5dec7514062cfa549d1c1053f567395d9d133611c2a5138da470 diff --git a/graphics/mesa-devel/files/patch-suffix b/graphics/mesa-devel/files/patch-suffix index 1f9cf9358d2c..b2003b02bd54 100644 --- a/graphics/mesa-devel/files/patch-suffix +++ b/graphics/mesa-devel/files/patch-suffix @@ -40,17 +40,26 @@ Library selection is handled by libglvnd and/or libmap.conf. endif _xa = get_option('gallium-xa') ---- src/amd/vulkan/meson.build.orig 2021-02-15 15:47:31 UTC +--- src/amd/vulkan/meson.build.orig 2022-02-25 15:38:08 UTC +++ src/amd/vulkan/meson.build -@@ -150,7 +150,7 @@ if with_llvm and with_ld_version_script - endif +@@ -92,7 +92,7 @@ libradv_files = files( + 'vk_format.h', + ) + +-files_drirc = files('00-radv-defaults.conf') ++files_drirc = files('00-radv@0@-defaults.conf'.format(get_option('egl-lib-suffix'))) + + install_data(files_drirc, install_dir : join_paths(get_option('datadir'), 'drirc.d')) + +@@ -150,7 +150,7 @@ endif + vulkan_radv_def = 'vulkan_radv.def' libvulkan_radeon = shared_library( - 'vulkan_radeon', + 'vulkan_radeon' + get_option('egl-lib-suffix'), [libradv_files, radv_entrypoints, sha1_h], + vs_module_defs : vulkan_radv_def, 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-12-03 22:36:27 UTC +++ src/egl/meson.build @@ -144,7 +144,7 @@ if not with_glvnd diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist index 9d795ca0130f..19bbfb5ad595 100644 --- a/graphics/mesa-devel/pkg-plist +++ b/graphics/mesa-devel/pkg-plist @@ -37,6 +37,7 @@ lib/libglapi%%SUFFIX%%.so.0.0.0 %%NO_COINST%%libdata/pkgconfig/dri.pc %%NO_COINST%%libdata/pkgconfig/gbm.pc share/drirc.d/00-mesa%%SUFFIX%%-defaults.conf +%%radv%%share/drirc.d/00-radv%%SUFFIX%%-defaults.conf %%NO_COINST%%share/glvnd/egl_vendor.d/50_mesa.json %%VKLAYERS%%share/vulkan/explicit_layer.d/VkLayer_MESA_overlay.json %%anv%%%%NO_COINST%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json |