Index: graphics/libosmesa/Makefile
===================================================================
--- graphics/libosmesa/Makefile
+++ graphics/libosmesa/Makefile
@@ -21,7 +21,6 @@
 		-Dgallium-va=disabled \
 		-Dgallium-opencl=disabled \
 		-Dgallium-xa=disabled \
-		-Dgallium-xvmc=disabled \
 		-Dgallium-nine=false \
 		-Dgles1=disabled \
 		-Dgles2=disabled \
Index: graphics/mesa-dri/Makefile
===================================================================
--- graphics/mesa-dri/Makefile
+++ graphics/mesa-dri/Makefile
@@ -43,10 +43,6 @@
 GALLIUM_DRIVERS+=	R300 R600 RADEONSI
 VULKAN_DRIVERS+=	AMD
 BUILD_DEPENDS+=		glslangValidator:graphics/glslang
-. if ${PORT_OPTIONS:MPLATFORM_X11}
-USE_XORG+=		xv xvmc
-MESON_ARGS+=		-Dgallium-xvmc=enabled
-. endif
 .endif
 .if ${ARCH} == amd64 || ${ARCH} == i386
 GALLIUM_DRIVERS+=	CROCUS IRIS SVGA
Index: graphics/mesa-dri/Makefile.common
===================================================================
--- graphics/mesa-dri/Makefile.common
+++ graphics/mesa-dri/Makefile.common
@@ -12,7 +12,7 @@
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	22.2.3
+MESABASEVERSION=	22.3.0
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
@@ -90,9 +90,7 @@
 
 LLVM_DEFAULT=	13
 BUILD_DEPENDS+=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-.if ${COMPONENT} != libs
 RUN_DEPENDS+=	llvm-config${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-.endif
 
 MESON_ARGS+=	--native-file="${WRKSRC}/llvm.ini"
 LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${LLVM_DEFAULT}/lib
Index: graphics/mesa-dri/distinfo
===================================================================
--- graphics/mesa-dri/distinfo
+++ graphics/mesa-dri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1667925985
-SHA256 (mesa-22.2.3.tar.xz) = ee7d026f7b1991dbae0861d359b671145c3a86f2a731353b885d2ea2d5c098d6
-SIZE (mesa-22.2.3.tar.xz) = 16464020
+TIMESTAMP = 1669895345
+SHA256 (mesa-22.3.0.tar.xz) = 644bf936584548c2b88762111ad58b4aa3e4688874200e5a4eb74e53ce301746
+SIZE (mesa-22.3.0.tar.xz) = 16878600
Index: graphics/mesa-dri/files/patch-meson.build
===================================================================
--- graphics/mesa-dri/files/patch-meson.build
+++ /dev/null
@@ -1,48 +0,0 @@
---- meson.build.orig	2022-10-11 18:53:31 UTC
-+++ meson.build
-@@ -1436,7 +1436,6 @@ functions_to_detect = {
-   'flock': '',
-   'strtok_r': '',
-   'getrandom': '',
--  'qsort_r': '',
-   'qsort_s': '',
- }
- 
-@@ -1445,6 +1444,37 @@ endforeach
-     pre_args += '-DHAVE_@0@'.format(f.to_upper())
-   endif
- endforeach
-+
-+if cpp.links('''
-+    #define _GNU_SOURCE
-+    #include <stdlib.h>
-+
-+    static int dcomp(const void *l, const void *r, void *t) { return 0; }
-+
-+    int main(int ac, char **av) {
-+      int arr[] = { 1 };
-+      void *t = NULL;
-+      qsort_r((void*)&arr[0], 1, 1, dcomp, t);
-+      return (0);
-+    }''',
-+    args : pre_args,
-+    name : 'GNU qsort_r')
-+  pre_args += '-DHAVE_GNU_QSORT_R'
-+elif cpp.links('''
-+    #include <stdlib.h>
-+
-+    static int dcomp(void *t, const void *l, const void *r) { return 0; }
-+
-+    int main(int ac, char **av) {
-+      int arr[] = { 1 };
-+      void *t = NULL;
-+      qsort_r((void*)&arr[0], 1, 1, t, dcomp);
-+      return (0);
-+    }''',
-+    args : pre_args,
-+    name : 'BSD qsort_r')
-+  pre_args += '-DHAVE_BSD_QSORT_R'
-+endif
- 
- if cc.has_header_symbol('time.h', 'struct timespec')
-    pre_args += '-DHAVE_STRUCT_TIMESPEC'
Index: graphics/mesa-dri/files/patch-src_util_u__memory.h
===================================================================
--- /dev/null
+++ graphics/mesa-dri/files/patch-src_util_u__memory.h
@@ -0,0 +1,13 @@
+--- src/util/u_memory.h.orig	2022-12-01 11:58:25 UTC
++++ src/util/u_memory.h
+@@ -91,8 +91,8 @@ mem_dup(const void *src, size_t size)
+ 
+ 
+ /* Allocate a structure aligned to a cache line. (used to make atomic ops faster) */
+-#define MALLOC_STRUCT_CL(T) (struct T *)align_malloc(sizeof(struct T), CACHE_LINE_SIZE)
+-#define CALLOC_STRUCT_CL(T) (struct T *)align_calloc(sizeof(struct T), CACHE_LINE_SIZE)
++#define MALLOC_STRUCT_CL(T) (struct T *)align_malloc(sizeof(struct T), MESA_CACHE_LINE_SIZE)
++#define CALLOC_STRUCT_CL(T) (struct T *)align_calloc(sizeof(struct T), MESA_CACHE_LINE_SIZE)
+ #define FREE_CL(ptr) align_free(ptr)
+ 
+ #ifdef __cplusplus
Index: graphics/mesa-dri/files/patch-src_util_u__qsort.h
===================================================================
--- graphics/mesa-dri/files/patch-src_util_u__qsort.h
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/util/u_qsort.h.orig	2022-03-18 19:26:47 UTC
-+++ src/util/u_qsort.h
-@@ -56,8 +56,10 @@ util_qsort_r(void *base, size_t nmemb, size_t size,
-              int (*compar)(const void *, const void *, void *),
-              void *arg)
- {
--#if HAVE_QSORT_R
--#  if DETECT_OS_APPLE || DETECT_OS_BSD
-+#if HAVE_GNU_QSORT_R
-+   /* GNU extension added in glibc 2.8 */
-+   qsort_r(base, nmemb, size, compar, arg);
-+#elif HAVE_BSD_QSORT_R
-    /* BSD/macOS qsort_r takes "arg" before the comparison function and it
-     * pass the "arg" before the elements.
-     */
-@@ -66,10 +68,6 @@ util_qsort_r(void *base, size_t nmemb, size_t size,
-       arg
-    };
-    qsort_r(base, nmemb, size, &data, util_qsort_adapter);
--#  else
--   /* GNU extension added in glibc 2.8 */
--   qsort_r(base, nmemb, size, compar, arg);
--#  endif
- #elif HAVE_QSORT_S
- #  ifdef _WIN32
-    /* MSVC/MinGW qsort_s takes "arg" after the comparison function and it
Index: graphics/mesa-dri/pkg-plist
===================================================================
--- graphics/mesa-dri/pkg-plist
+++ graphics/mesa-dri/pkg-plist
@@ -1,4 +1,5 @@
 @comment include/EGL/egl.h
+@comment include/EGL/eglext_angle.h
 @comment include/EGL/eglext.h
 @comment include/EGL/eglextchromium.h
 @comment include/EGL/eglmesaext.h
@@ -20,10 +21,6 @@
 %%SWRAST_GDRIVER%%lib/dri/swrast_dri.so
 %%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so
 %%ZINK_GDRIVER%%lib/dri/zink_dri.so
-%%PLATFORM_X11%%%%R600_GDRIVER%%lib/libXvMCr600.so
-%%PLATFORM_X11%%%%R600_GDRIVER%%lib/libXvMCr600.so.1
-%%PLATFORM_X11%%%%R600_GDRIVER%%lib/libXvMCr600.so.1.0
-%%PLATFORM_X11%%%%R600_GDRIVER%%lib/libXvMCr600.so.1.0.0
 @comment lib/libEGL.so
 @comment lib/libEGL.so.1
 @comment lib/libEGL.so.1.0.0
Index: graphics/mesa-gallium-va/Makefile
===================================================================
--- graphics/mesa-gallium-va/Makefile
+++ graphics/mesa-gallium-va/Makefile
@@ -28,7 +28,6 @@
 		-Dgallium-omx=disabled \
 		-Dgallium-xa=disabled \
 		-Dgallium-opencl=disabled \
-		-Dgallium-xvmc=disabled \
 		-Dgallium-nine=false \
 		-Dgbm=disabled \
 		-Dgles1=disabled \
Index: graphics/mesa-gallium-va/pkg-plist
===================================================================
--- graphics/mesa-gallium-va/pkg-plist
+++ graphics/mesa-gallium-va/pkg-plist
@@ -1,5 +1,6 @@
 @comment include/EGL/egl.h
 @comment include/EGL/eglext.h
+@comment include/EGL/eglext_angle.h
 @comment include/EGL/eglextchromium.h
 @comment include/EGL/eglmesaext.h
 @comment include/EGL/eglplatform.h
Index: graphics/mesa-gallium-vdpau/Makefile
===================================================================
--- graphics/mesa-gallium-vdpau/Makefile
+++ graphics/mesa-gallium-vdpau/Makefile
@@ -28,7 +28,6 @@
 		-Dgallium-omx=disabled \
 		-Dgallium-xa=disabled \
 		-Dgallium-opencl=disabled \
-		-Dgallium-xvmc=disabled \
 		-Dgallium-nine=false \
 		-Dgbm=disabled \
 		-Dgles1=disabled \
Index: graphics/mesa-gallium-vdpau/pkg-plist
===================================================================
--- graphics/mesa-gallium-vdpau/pkg-plist
+++ graphics/mesa-gallium-vdpau/pkg-plist
@@ -1,5 +1,6 @@
 @comment include/EGL/egl.h
 @comment include/EGL/eglext.h
+@comment include/EGL/eglext_angle.h
 @comment include/EGL/eglextchromium.h
 @comment include/EGL/eglmesaext.h
 @comment include/EGL/eglplatform.h
Index: graphics/mesa-libs/Makefile
===================================================================
--- graphics/mesa-libs/Makefile
+++ graphics/mesa-libs/Makefile
@@ -30,7 +30,6 @@
 .include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
 
 MESON_ARGS+=	-Dgallium-vdpau=disabled \
-		-Dgallium-xvmc=disabled \
 		-Dgallium-omx=disabled \
 		-Dgallium-va=disabled \
 		-Dgallium-xa=disabled \
Index: graphics/mesa-libs/pkg-plist
===================================================================
--- graphics/mesa-libs/pkg-plist
+++ graphics/mesa-libs/pkg-plist
@@ -1,5 +1,5 @@
 etc/libmap.d/mesa.conf
-include/EGL/eglextchromium.h
+include/EGL/eglext_angle.h
 include/EGL/eglmesaext.h
 @comment include/GL/internal/dri_interface.h
 include/gbm.h
Index: lang/clover/Makefile
===================================================================
--- lang/clover/Makefile
+++ lang/clover/Makefile
@@ -27,7 +27,6 @@
 		-Dgallium-va=disabled \
 		-Dgallium-vdpau=disabled \
 		-Dgallium-xa=disabled \
-		-Dgallium-xvmc=disabled \
 		-Dgles1=disabled \
 		-Dgles2=disabled \
 		-Dopengl=false \