From owner-dev-commits-ports-all@freebsd.org Wed Jul 28 07:12:20 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id A1391653826; Wed, 28 Jul 2021 07:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GZPxJ42f9z4VWy; Wed, 28 Jul 2021 07:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 72E8C19D3C; Wed, 28 Jul 2021 07:12:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16S7CKPZ031067; Wed, 28 Jul 2021 07:12:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16S7CKYr031066; Wed, 28 Jul 2021 07:12:20 GMT (envelope-from git) Date: Wed, 28 Jul 2021 07:12:20 GMT Message-Id: <202107280712.16S7CKYr031066@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: f74b56360de7 - main - graphics/mesa-*: Unbreak on 11.4 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f74b56360de7b82aa5135be306cdfacb3db3acd0 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2021 07:12:20 -0000 The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=f74b56360de7b82aa5135be306cdfacb3db3acd0 commit f74b56360de7b82aa5135be306cdfacb3db3acd0 Author: Emmanuel Vadot AuthorDate: 2021-07-28 07:12:07 +0000 Commit: Emmanuel Vadot CommitDate: 2021-07-28 07:12:07 +0000 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 +++++++++++++++ graphics/mesa-libs/Makefile | 2 -- 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 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