aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Vadot <manu@FreeBSD.org>2021-07-28 07:12:07 +0000
committerEmmanuel Vadot <manu@FreeBSD.org>2021-07-28 07:12:07 +0000
commitf74b56360de7b82aa5135be306cdfacb3db3acd0 (patch)
treea45c3b32c860a1a4227bd9ef94e5098c260354b1
parent981cfc2817e95a6cf95a46edf044efe5c8b3afaa (diff)
downloadports-f74b56360de7b82aa5135be306cdfacb3db3acd0.tar.gz
ports-f74b56360de7b82aa5135be306cdfacb3db3acd0.zip
graphics/mesa-*: Unbreak on 11.4
Re-add patches that was removed on the 21.1.5 update. PR: 257305
-rw-r--r--graphics/mesa-dri/Makefile.common4
-rw-r--r--graphics/mesa-dri/files/extra-patch-src_util_build__id.c15
-rw-r--r--graphics/mesa-libs/Makefile2
3 files changed, 19 insertions, 2 deletions
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 <bsd.port.pre.mk>
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;
+
diff --git a/graphics/mesa-libs/Makefile b/graphics/mesa-libs/Makefile
index 858a91d7472f..7d759b34ca81 100644
--- a/graphics/mesa-libs/Makefile
+++ b/graphics/mesa-libs/Makefile
@@ -6,8 +6,6 @@ CATEGORIES= graphics
COMMENT= OpenGL libraries that support GLX and EGL clients
-BROKEN_FreeBSD_11= error: unknown type name 'Elf_Nhdr'
-
BUILD_DEPENDS= libglvnd>0:graphics/libglvnd
OPTIONS_GROUP= PLATFORM