svn commit: r566514 - in head/graphics/mesa-devel: . files

[Jan Beich]

Author: jbeich
Date: Thu Feb 25 00:31:58 2021
New Revision: 566514
URL: https://svnweb.freebsd.org/changeset/ports/566514

Log:
  graphics/mesa-devel: update to 21.0.b.2294
  
  Changes:	https://gitlab.freedesktop.org/mesa/mesa/-/compare/60726ed0d31...05d0514a8fc

Modified:
  head/graphics/mesa-devel/Makefile   (contents, props changed)
  head/graphics/mesa-devel/distinfo   (contents, props changed)
  head/graphics/mesa-devel/files/patch-suffix   (contents, props changed)

Modified: head/graphics/mesa-devel/Makefile
==============================================================================
--- head/graphics/mesa-devel/Makefile	Thu Feb 25 00:31:45 2021	(r566513)
+++ head/graphics/mesa-devel/Makefile	Thu Feb 25 00:31:58 2021	(r566514)
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	mesa
-DISTVERSION=	21.0-branchpoint-2148
-DISTVERSIONSUFFIX=	-g60726ed0d31
+DISTVERSION=	21.0-branchpoint-2294
+DISTVERSIONSUFFIX=	-g05d0514a8fc
 CATEGORIES=	graphics
 PKGNAMESUFFIX=	-devel
 
@@ -12,14 +12,12 @@ PATCHFILES+=	55822330540d.patch:-p1 # https://gitlab.f
 PATCHFILES+=	f6c7569ad9ea.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/1598
 PATCHFILES+=	cb8f7a253934.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/3568
 PATCHFILES+=	700efacda59c.patch:-p1
-PATCHFILES+=	52dc4fc50f37.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/issues/966#note_394512
+PATCHFILES+=	9f99ac6e45eb.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+=	50433886a3e3.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6881
 PATCHFILES+=	79a9c5e470c2.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8221
 PATCHFILES+=	891152495cf7.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9168
-PATCHFILES+=	e70b8a595fdb.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9169
-PATCHFILES+=	033ef62c3532.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9169
 
 MAINTAINER=	jbeich at FreeBSD.org
 COMMENT=	Bleeding edge Mesa drivers (OpenGL, Vulkan)

Modified: head/graphics/mesa-devel/distinfo
==============================================================================
--- head/graphics/mesa-devel/distinfo	Thu Feb 25 00:31:45 2021	(r566513)
+++ head/graphics/mesa-devel/distinfo	Thu Feb 25 00:31:58 2021	(r566514)
@@ -1,6 +1,6 @@
-TIMESTAMP = 1614039634
-SHA256 (mesa3d-mesa-21.0-branchpoint-2148-g60726ed0d31_GH0.tar.gz) = 624cb0cfbb5895d721a50a32f7ba8189b8322ebaa868cb34cfd829cf2893f38f
-SIZE (mesa3d-mesa-21.0-branchpoint-2148-g60726ed0d31_GH0.tar.gz) = 23012036
+TIMESTAMP = 1614209101
+SHA256 (mesa3d-mesa-21.0-branchpoint-2294-g05d0514a8fc_GH0.tar.gz) = cf9559c968401c488636096afaf4e8cfe13c138f3febf93c4c6150cb6960481b
+SIZE (mesa3d-mesa-21.0-branchpoint-2294-g05d0514a8fc_GH0.tar.gz) = 23035238
 SHA256 (9f52b5177728.patch) = d4f380b8872726b88c1aa75d0a9cb63adf79144a7c34da6b7fd525ea417d2b73
 SIZE (9f52b5177728.patch) = 832
 SHA256 (55822330540d.patch) = fc776fee1d59f743a060ad1f78e1d9eba8826beb1fe7abef1734a407734b6109
@@ -11,8 +11,8 @@ SHA256 (cb8f7a253934.patch) = 9e914ac8325ce15ab0cc3861
 SIZE (cb8f7a253934.patch) = 3512
 SHA256 (700efacda59c.patch) = f034cfbe09edff0baba67e46e7e3812fdef73ff3cf3e579050c024c95234c8d5
 SIZE (700efacda59c.patch) = 981
-SHA256 (52dc4fc50f37.patch) = 8be7cd16506c1ad3e955e27c26f44fc2dde12fe141cbd3a35f69190f64d70436
-SIZE (52dc4fc50f37.patch) = 41026
+SHA256 (9f99ac6e45eb.patch) = 2fdcb9e37fbb4d99b128e3da8e0096fde338783944877988311d6c11be4c88c6
+SIZE (9f99ac6e45eb.patch) = 41217
 SHA256 (167fa293d7b7.patch) = cc3ad8e59d5d4d7380917e715f676abba65549b07e377dbf6fcec5c294915360
 SIZE (167fa293d7b7.patch) = 2496
 SHA256 (19e001833ec1.patch) = 5ac28692c61dc3dcc5f7e74a8053d63365fc28fb28136ddb11791990a414f762
@@ -23,7 +23,3 @@ SHA256 (79a9c5e470c2.patch) = d6f5e0378d16864e21399c4e
 SIZE (79a9c5e470c2.patch) = 866
 SHA256 (891152495cf7.patch) = e120e26688c1bfca76f4cb711814d1483693cbc66fcb130c88f98a8bf142f826
 SIZE (891152495cf7.patch) = 1258
-SHA256 (e70b8a595fdb.patch) = 92b77b4146ca08514f769417a8a1b2525a7b68ab3af57650db5431b1832dd95c
-SIZE (e70b8a595fdb.patch) = 1254
-SHA256 (033ef62c3532.patch) = d167946f3a4ea5191b7f3cce7fdc23172fde4c4557aa1e0c3da10419b3346d83
-SIZE (033ef62c3532.patch) = 1295

Modified: head/graphics/mesa-devel/files/patch-suffix
==============================================================================
--- head/graphics/mesa-devel/files/patch-suffix	Thu Feb 25 00:31:45 2021	(r566513)
+++ head/graphics/mesa-devel/files/patch-suffix	Thu Feb 25 00:31:58 2021	(r566514)
@@ -149,9 +149,9 @@ Library selection is handled by libglvnd and/or libmap
    [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.orig	2021-02-24 18:55:02 UTC
 +++ src/util/meson.build
-@@ -122,7 +122,7 @@ files_mesa_util = files(
+@@ -135,7 +135,7 @@ files_mesa_util = files(
    'xxhash.h',
  )
  
@@ -160,3 +160,12 @@ Library selection is handled by libglvnd and/or libmap
  
  install_data(files_drirc, install_dir : join_paths(get_option('datadir'), 'drirc.d'))
  
+@@ -158,7 +158,7 @@ files_xmlconfig = files(
+ 
+ files_xmlconfig += custom_target(
+   'driconf_static.h',
+-  input: ['driconf_static.py', '00-mesa-defaults.conf'],
++  input: ['driconf_static.py', '00-mesa at 0@-defaults.conf'.format(get_option('egl-lib-suffix'))],
+   output: 'driconf_static.h',
+   command: [
+     prog_python, '@INPUT0@', '@INPUT1@', '@OUTPUT@'