From nobody Sat Sep 17 11:09:46 2022 X-Original-To: dev-commits-ports-main@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 4MV7WG5HNnz4cQNy; Sat, 17 Sep 2022 11:09:46 +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 4MV7WG4kTjz3tsj; Sat, 17 Sep 2022 11:09:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663412986; 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=wIDa6yl37Fdd4PVZNHYj4Uqf6eNuXUpjBNVbfnzGUnQ=; b=ri532ws5mBCPcAp13bsGxCKYY1d5c1flqWKmrBcIuBkdpPsDfktNCULClD0UGgVdpeUjZj 3rend0398djV/qit11UzdMF209YAQwYpG1A20DgXcUuqmFyVN4vDn6pZR5SFhgAkhEHtlh kFIkZa5RGHoiw/4LoqTzOZH4wprJ7PRQglNsbzvKF6BjjeN7Lx6k4IpIE3XGwWIcHGgsF6 6+IJxGURT3PHi9TGZLN1NiigDtcCzTSoA5+apjoTnUpQFDVKTDvMAOLPlxSsJRSUqJYZwx /zIPpR1btQiO8NBPYCicGVTLFK7TK4Y1ykmF9Lcm1sDp27jFUA0jCyPGzdANAQ== 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 4MV7WG3l24zh96; Sat, 17 Sep 2022 11:09:46 +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 28HB9kZZ028185; Sat, 17 Sep 2022 11:09:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28HB9kaL028184; Sat, 17 Sep 2022 11:09:46 GMT (envelope-from git) Date: Sat, 17 Sep 2022 11:09:46 GMT Message-Id: <202209171109.28HB9kaL028184@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: b3fbc0c3d48c - main - graphics/mesa-devel: unbreak on -CURRENT after GNU qsort_r List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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/main X-Git-Reftype: branch X-Git-Commit: b3fbc0c3d48c5e1cc7ac2e87e3ee1f847120bfab Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663412986; 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=wIDa6yl37Fdd4PVZNHYj4Uqf6eNuXUpjBNVbfnzGUnQ=; b=ty2qFs0JZxW8J58TdHGXeHG6EaWUNUaWKml0Qkrtve4BP36SRKVdRkL4A8ylh4dG3eQZSV HS2ghMTJAMng0ICA+J3OpZ4IOucjixRE3upyePWpGaSgDxcJCda+8WNyHXae7r/SW2fOUn 6qlEawb81rV5YbrwZV6SjgwTHDFNIV/eYQhRKP3gzteu67nHi7eutN709wDhKLkdek6VrA gXmOHggLvTKmlNvSgHokQfJCyKFExiUPzDTIT0AWhDX2PrEByXzx1tKoOeNBbhjtl3sQHF Clih0KMh/f3mxx0V/AKBh3YKZNVH3AFt4mowQ5G65vfBCZs0xoVQ+cLJWObPHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663412986; a=rsa-sha256; cv=none; b=qctW5xyI5rCE227hVvCZpMdyO1yHcfmiu/I4GXFkbOxmRnBfyQyjR+Op75Ojh9mcwGK+th 8B2SUbuJqaPWazgwpbw7gBcgDi0MX8R9JvXFYfTiALol1AXOgk8f+4/yGVlu7+d+2P2YP/ gSGViAlk6bB1V7EdWO5+PYgVr6MWEClFWzggsYVlwHrtrX1aCwC4hpwRHy3SNSVlmZxa0G wFe/0eDgVXwvXfS2cSDBkqwf8gA0QIXxdbI0G0MZRR6BsWJtb+vGKLuqYwrbBREZo1EJc6 NDx/c9iPq7k6SMnfE5T378UxWZCV99p3tzgwLraqcDk//3iyAKO7fMMuSBnxtA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=b3fbc0c3d48c5e1cc7ac2e87e3ee1f847120bfab commit b3fbc0c3d48c5e1cc7ac2e87e3ee1f847120bfab Author: Jan Beich AuthorDate: 2022-09-17 07:47:03 +0000 Commit: Jan Beich CommitDate: 2022-09-17 11:09:03 +0000 graphics/mesa-devel: unbreak on -CURRENT after GNU qsort_r In file included from ../src/util/u_qsort.cpp:24: ../src/util/u_qsort.h:68:4: error: no matching function for call to 'qsort_r' qsort_r(base, nmemb, size, &data, util_qsort_adapter); ^~~~~~~ /usr/include/stdlib.h:314:7: note: candidate function not viable: no known conversion from 'struct util_qsort_adapter_data *' to 'int (*)(const void *, const void *, void *)' for 4th argument void qsort_r(void *, size_t, size_t, ^ PR: 266227 Reported by: antoine (via exp-run) Submitted by: delphij --- graphics/mesa-devel/Makefile | 1 + graphics/mesa-devel/distinfo | 2 ++ 2 files changed, 3 insertions(+) diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 5e903bfca8c4..9242a7e414c0 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -10,6 +10,7 @@ PATCHFILES+= 50433886a3e3.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/- PATCHFILES+= 4356e7185193.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16987 PATCHFILES+= b2a22acce617.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16987 PATCHFILES+= 19eb2c30bff0.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16987 +PATCHFILES+= 8f1aa7dc16df.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18527 MAINTAINER= jbeich@FreeBSD.org COMMENT= Bleeding edge Mesa drivers (OpenGL, Vulkan) diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index dec555b16469..45bb1af3cbc0 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -11,3 +11,5 @@ SHA256 (b2a22acce617.patch) = 9ec231cdcec3235164b0c0298d35e65225940878e75d9f972b SIZE (b2a22acce617.patch) = 2425 SHA256 (19eb2c30bff0.patch) = 238e1031e32bda8fa72bd649df857d775ffe5caec26c1d4428215cf65f564c2b SIZE (19eb2c30bff0.patch) = 1217 +SHA256 (8f1aa7dc16df.patch) = 8e53f4030197998492b16ff0315db195389bd0e508258f0650dd474f0225e202 +SIZE (8f1aa7dc16df.patch) = 2804