From nobody Sat Apr 29 23:42:57 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Q85cx5GNWz48QYg; Sat, 29 Apr 2023 23:42:57 +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 4Q85cx4m70z40dh; Sat, 29 Apr 2023 23:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682811777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nayCUzkj3lzZriTnHLvRieASrEH/s5CJOsSnpU0RBUE=; b=HuHZUMdxRbckfUcPER/0BCtRB0+2XDQRB6Gkn3DRi0pTcFMTR51ofd4IwqWVryFkni9qX9 n0/upYGafWFfGgnzWDMEsOqNuMLriZL3PDPNS5mSsNbgD0dijXEJJuo1mf7evOcRj8q3aw 9fO2s1eAjrbGlo+7RgsjVtEic7dvggL38MfzZAgqmj0Cymi6Mx01XeOJxqSaCzgn2LUDoX OMkAcA4DdpNamuMPxEevl0nEr37aK+kj+pacPNKRGQKRX6lwqYtQMv/YvPJoa5onsRXXrJ l41aNVmn0dZb6VN6HExU10tZQq1KZLq1rmu0vHvHOm0AlLxWo39FQRXReUqAfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1682811777; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nayCUzkj3lzZriTnHLvRieASrEH/s5CJOsSnpU0RBUE=; b=tCfOhzUighv4Ne3s1fFffAgK3AWqpIzfXxNqisqurp97P/caVc04Q8mf1/ABgRGV0Gw/Yu Lw1KBwttkVRBNeOQ4FGCqScYExJFJ2F1QQdQlCXU+P0yiSLDi8wkXR2pkXZW6ze1XVFwjZ aGkt+yHy1Kqegr0V8giN4jLLSlv9KZMApwtvvEoOW2UpzB0WmbQ/wYoARZ6wDn+cUokT6S /acoWDILKYSeYpdQvGmqkKSdkmkJFCsxyTuu/zu3olz+iGL1qR58/YOlwLaMxgXu5pya9F 0v1pN+MYOLpida70fyyIHe1hawsEJ0N2DOSgYicsaAnrVp7qHMX2GomaivmO3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1682811777; a=rsa-sha256; cv=none; b=BwXens/Rzsv/nUoIGqoFVmRDt8+2QrRueGXhXItEES/Tlzq8Q4MhI1a9J6zA6e+m0sRXTo UFpW2FI1b3/G4E3TtwTXxlNEnIcMhw1IeyOQz6wuB0vHlRPzWoRPCNsx1I5P//bQH3x5IH I8J6Fsz0FCgd6bRVu+eBHXhyc0GiQWeOjBXGzDpFtflHb3g99sYcdNToyrLAWy+EMvIVxQ wxvDUL3sZM2K/0lhJ+9NTa4NEP1ymsFEAZLnu3UN9qz5Bj/6UalS4bPNnRBKrbP0+JgjhD L/QbQWJqroA8cR/XwGv8Alo1jJ4frJ2wixT0rsI3zgKbbDLGUtPotE978i9/Vg== 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 4Q85cx3psjz11Dk; Sat, 29 Apr 2023 23:42:57 +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 33TNgv4a061104; Sat, 29 Apr 2023 23:42:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33TNgv2Y061103; Sat, 29 Apr 2023 23:42:57 GMT (envelope-from git) Date: Sat, 29 Apr 2023 23:42:57 GMT Message-Id: <202304292342.33TNgv2Y061103@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 62f02a3116fe - 2023Q2 - graphics/mesa-devel: discard user edits to libmap.conf(5) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q2 X-Git-Reftype: branch X-Git-Commit: 62f02a3116fed01b5edc45840e4a1548c36b63b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=62f02a3116fed01b5edc45840e4a1548c36b63b8 commit 62f02a3116fed01b5edc45840e4a1548c36b63b8 Author: Jan Beich AuthorDate: 2023-04-29 22:06:12 +0000 Commit: Jan Beich CommitDate: 2023-04-29 23:42:13 +0000 graphics/mesa-devel: discard user edits to libmap.conf(5) - pkg32.sh from emulators/wine* uses RUN_SCRIPTS=false, so mesa-devel.conf.sample isn't copied to mesa-devel.conf - other ports with libmap.conf(5) support don't use @sample - partially overriding mesa-{dri,libs} is only useful for debugging (cherry picked from commit 13d5524a0dec75df4d80f3fca4f266cb790f1b76) --- graphics/mesa-devel/Makefile | 3 ++- graphics/mesa-devel/pkg-plist | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 98d810b0063d..dbd220e24a1e 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= mesa DISTVERSION= 23.1-branchpoint-780 DISTVERSIONSUFFIX= -gb07f575a91d +PORTREVISION= 1 CATEGORIES= graphics PKGNAMESUFFIX= -devel @@ -174,6 +175,6 @@ post-patch-COINST-on: post-install-COINST-on: @${INSTALL_DATA} ${WRKDIR}/libmap.conf \ - ${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf.sample + ${STAGEDIR}${PREFIX}/etc/libmap.d/${PKGBASE}.conf .include diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist index 0cc426306aed..3a43b378fa2b 100644 --- a/graphics/mesa-devel/pkg-plist +++ b/graphics/mesa-devel/pkg-plist @@ -1,7 +1,7 @@ %%VKLAYERS%%bin/mesa-overlay-control.py %%NO_COINST%%%%OPENCL%%etc/OpenCL/vendors/mesa.icd %%OPENCL%%etc/OpenCL/vendors/rusticl.icd -%%COINST%%@sample etc/libmap.d/mesa%%SUFFIX%%.conf.sample +%%COINST%%etc/libmap.d/mesa%%SUFFIX%%.conf %%NO_COINST%%include/EGL/eglext_angle.h %%NO_COINST%%include/EGL/eglmesaext.h %%NO_COINST%%include/GL/internal/dri_interface.h