git: 239ba7a240fd - main - graphics/libglvnd: fix on armv6/armv7

From: Emmanuel Vadot <manu_at_FreeBSD.org>
Date: Fri, 03 Jun 2022 13:42:08 UTC
The branch main has been updated by manu:

URL: https://cgit.FreeBSD.org/ports/commit/?id=239ba7a240fd6fd611ac6a72986de6b26ab5da64

commit 239ba7a240fd6fd611ac6a72986de6b26ab5da64
Author:     Robert Clausecker <fuz@fuz.su>
AuthorDate: 2022-06-03 13:18:05 +0000
Commit:     Emmanuel Vadot <manu@FreeBSD.org>
CommitDate: 2022-06-03 13:41:40 +0000

    graphics/libglvnd: fix on armv6/armv7
    
    The .thumb_func directive does not switch to thumb mode in clang's
    integrated assembler.  This causes the code to be miscompiled in that
    it is generated as ARM code but the symbols are tagged as thumb.  The
    resulting library is unusable.  Every call into it crashes.
    
    Fix this issue by applying an upstream patch set to have the entry
    stubs be in ARM mode instead of Thumb mode.
    
    See also:       https://gitlab.freedesktop.org/glvnd/libglvnd/-/merge_requests/267
    See also:       https://gitlab.freedesktop.org/glvnd/libglvnd/-/issues/232
    PR:             263845
---
 graphics/libglvnd/Makefile | 7 ++++++-
 graphics/libglvnd/distinfo | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/graphics/libglvnd/Makefile b/graphics/libglvnd/Makefile
index 5315970b50a8..da53c5bd2dbe 100644
--- a/graphics/libglvnd/Makefile
+++ b/graphics/libglvnd/Makefile
@@ -1,8 +1,13 @@
 PORTNAME=	libglvnd
 DISTVERSION=	1.4.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 
+PATCH_SITES=	https://gitlab.freedesktop.org/glvnd/libglvnd/-/commit/
+PATCHFILES=	28da9963e52ee2d2e1501351eb26b77cec89f886.diff:-p1 \
+		d853cf56f81afff725946eec1144560a121da5af.diff:-p1 \
+		b90f235998e199d810ef61c0a8dc103d297962cb.diff:-p1
+
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	GL Vendor-Neutral Dispatch library
 
diff --git a/graphics/libglvnd/distinfo b/graphics/libglvnd/distinfo
index 1d0339433671..e5ed10887064 100644
--- a/graphics/libglvnd/distinfo
+++ b/graphics/libglvnd/distinfo
@@ -1,3 +1,9 @@
-TIMESTAMP = 1639756178
+TIMESTAMP = 1654257944
 SHA256 (glvnd-libglvnd-8f3c5b17a21e2222ab3e5fd38870b915815aca49_GL0.tar.gz) = 7f9f046121fbca7dc5f51a70323b9267d6dc39b513913bf5a7758ca21db557f9
 SIZE (glvnd-libglvnd-8f3c5b17a21e2222ab3e5fd38870b915815aca49_GL0.tar.gz) = 839074
+SHA256 (28da9963e52ee2d2e1501351eb26b77cec89f886.diff) = 4dea5f63d013cd4566f1c8621317fc121a1d571d3a2ab5d5677f556d922956bf
+SIZE (28da9963e52ee2d2e1501351eb26b77cec89f886.diff) = 2152
+SHA256 (d853cf56f81afff725946eec1144560a121da5af.diff) = 9470d97af48d8aac8957e4c17da323a7541451ce8aab197bca1d2d715c9b16cd
+SIZE (d853cf56f81afff725946eec1144560a121da5af.diff) = 2668
+SHA256 (b90f235998e199d810ef61c0a8dc103d297962cb.diff) = 5187e708099b1067bcc45bd79cbefb0cca6879f8b34f96834ff48443d232c21a
+SIZE (b90f235998e199d810ef61c0a8dc103d297962cb.diff) = 541