From f74b56360de7b82aa5135be306cdfacb3db3acd0 Mon Sep 17 00:00:00 2001 From: Emmanuel Vadot Date: Wed, 28 Jul 2021 09:12:07 +0200 Subject: graphics/mesa-*: Unbreak on 11.4 Re-add patches that was removed on the 21.1.5 update. PR: 257305 --- graphics/mesa-dri/Makefile.common | 4 ++++ graphics/mesa-dri/files/extra-patch-src_util_build__id.c | 15 +++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 graphics/mesa-dri/files/extra-patch-src_util_build__id.c (limited to 'graphics/mesa-dri') diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common index 20931bf44980..36ba47ccbe30 100644 --- a/graphics/mesa-dri/Makefile.common +++ b/graphics/mesa-dri/Makefile.common @@ -81,6 +81,10 @@ PKGHELP= ${.CURDIR}/pkg-help PKGINSTALL= ${.CURDIR}/pkg-install PKGDEINSTALL= ${.CURDIR}/pkg-deinstall +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200000 +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-src_util_build__id.c +.endif + .include BINARY_ALIAS+= python3=${PYTHON_VERSION} diff --git a/graphics/mesa-dri/files/extra-patch-src_util_build__id.c b/graphics/mesa-dri/files/extra-patch-src_util_build__id.c new file mode 100644 index 000000000000..4b7b69d6b8ee --- /dev/null +++ b/graphics/mesa-dri/files/extra-patch-src_util_build__id.c @@ -0,0 +1,15 @@ +# Elf_ doesn't exist, use Elf32_ or Elf64_ +# +--- src/util/build_id.c.orig 2017-12-21 17:31:22 UTC ++++ src/util/build_id.c +@@ -38,6 +38,10 @@ + #define ElfW(type) Elf_##type + #endif + ++#if defined(__FreeBSD__) && __FreeBSD__ < 12 ++typedef Elf_Note Elf_Nhdr; ++#endif ++ + struct build_id_note { + ElfW(Nhdr) nhdr; + -- cgit v1.2.3