From a468f54e0d9ee66359a19c72be4594da9e503645 Mon Sep 17 00:00:00 2001 From: Sergey Fedorov Date: Sun, 5 Jan 2025 05:39:27 +0800 Subject: [PATCH] mesa: fix bug in header --- x11/mesa/Portfile | 6 +++++- .../346f4d3c11b7299b10617606d8c830c4ccf1ff48.diff | 12 ++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 x11/mesa/files/346f4d3c11b7299b10617606d8c830c4ccf1ff48.diff diff --git a/x11/mesa/Portfile b/x11/mesa/Portfile index 19e660778768b..4cc9427c6b52b 100644 --- a/x11/mesa/Portfile +++ b/x11/mesa/Portfile @@ -14,7 +14,7 @@ name mesa conflicts gl-headers epoch 1 version 24.3.2 -revision 0 +revision 1 checksums rmd160 37e3482c994b41959837267f02a522dabe21bd2d \ sha256 ad9f5f3a6d2169e4786254ee6eb5062f746d11b826739291205d360f1f3ff716 \ size 30640276 @@ -58,6 +58,10 @@ patchfiles patch-meson-spec-python.diff \ patch-fix-build.diff \ patch-fix-linking.diff +# Fix a bug in headers: +# https://gitlab.freedesktop.org/mesa/mesa/-/commit/346f4d3c11b7299b10617606d8c830c4ccf1ff48 +patchfiles-append 346f4d3c11b7299b10617606d8c830c4ccf1ff48.diff + # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32658 patchfiles-append patch-fix-32-bit.diff diff --git a/x11/mesa/files/346f4d3c11b7299b10617606d8c830c4ccf1ff48.diff b/x11/mesa/files/346f4d3c11b7299b10617606d8c830c4ccf1ff48.diff new file mode 100644 index 0000000000000..342f7511bc8fa --- /dev/null +++ b/x11/mesa/files/346f4d3c11b7299b10617606d8c830c4ccf1ff48.diff @@ -0,0 +1,12 @@ +diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h +index 87c046b254524eccb856ce29a325a0c8fcd028f2..a4d576ecda2f346ae0b3d9a82901b1d61809ab97 100644 +--- include/GL/internal/dri_interface.h ++++ include/GL/internal/dri_interface.h +@@ -442,7 +442,6 @@ struct mesa_glinterop_device_info; + struct mesa_glinterop_export_in; + struct mesa_glinterop_export_out; + struct mesa_glinterop_flush_out; +-typedef struct __GLsync *GLsync; + + struct __DRI2interopExtensionRec { + __DRIextension base;