From nobody Tue Jun 07 12:11:11 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 63FFA12D2F8F; Tue, 7 Jun 2022 12:11:11 +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 4LHTjC2Pqcz3FFN; Tue, 7 Jun 2022 12:11:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654603871; 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=0u5X9lYkOIPaiQRNDylHfh4KUyhGKZhRWGL/DV0Aef4=; b=RYVIh2TNn0G4THkoJqsKqw/s+t13wXsynfuL6Q9TsvkPEtZxktjfiw1eGPrky7nODTt8BO vqjyKvkB+HDvlG0PRYOuL59F/IR+nRjrgJTyqItVVP3p8189lzml5vHlGj/+Y5BaFH4TCc XR+yfq6Pk6U+JycQ+z0AXDCobqfDp//G9IZqeCIPb5yI8b3Aw17nGdmaPSk+jJVcdJ8HQA PC/KJ121Qr5xMKG6zGemrTkXALFVVxI1JYDyezPjt9wM9Lfm4JAW6T+ahIvoo2MlImtmI7 OpZghWZxWhCWRQxONUjcN9Eqy/pKPhA1tSN2zku77Pih76NSCvUzv2aREtaZ7Q== 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 32A611ABB2; Tue, 7 Jun 2022 12:11:11 +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 257CBB0i042385; Tue, 7 Jun 2022 12:11:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 257CBBpE042372; Tue, 7 Jun 2022 12:11:11 GMT (envelope-from git) Date: Tue, 7 Jun 2022 12:11:11 GMT Message-Id: <202206071211.257CBBpE042372@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: 976fb87003a0 - main - graphics/libdrm: Update to 2.4.111 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: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 976fb87003a05a4ccfe163a6a57038c46af0a60c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654603871; 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=0u5X9lYkOIPaiQRNDylHfh4KUyhGKZhRWGL/DV0Aef4=; b=U8wn/l9M0FMvdg+LF2jSj3yT3h9aOdRfOXOd8bc3mmRbU6addU1/AqABlPje1OzzmgvVMV y8vp+an8ilmXgZlfpyEDoksSEIFd/hVrsMsdRD9HfITa8F++zYTOoHFL41EHWBYgn70ZzM di/Jz548iQpbRYZ6Cn32mG09bISR/rR5ptpBDOLLlGVmRbnAodD939k2ia//j2TjUvPWKW adlPfxRquFmw4ZU80B+2/39lBC5dDDlzdy8FNVQqWP3BXg5cCeBgbAAoldXCVK1YiHB1z9 oZk/6/yVxtdu+5Q6HJo6qnFSuYyN57oi5QhBJb93FP8+ULLMyaGDb6pRt9dTXQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654603871; a=rsa-sha256; cv=none; b=v/6Xgpwi/Y76C58TWtMdS4VAtw9xqVoK40uZx9t1Xj6XXW10KIqpdqnYIgm4c0gxUF/ix5 H76q+M9TxISi8eE7shic2NNZwoJfiuw0Qa+xUBBBKMffxglVFcRGcRBxLt9WTISm74Vy4C 0QRLZAQzb09DkeGKBnz2bo5TK9TvQschgSyIseUG90JY8+fmiDdZBiacwFHzJm+WjZTepU axn//nFzRkVLNkBW+js5/qfoURt785bqMj7Oyf4FXD5KSbzrDrfbTcZfjJZmeOoPo1RQBM Fff/X8bofxlR/rjQPRIbUa1swjTzWLtOF/wPCcebonkRPCe1HS9BiZbUnBugfw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=976fb87003a05a4ccfe163a6a57038c46af0a60c commit 976fb87003a05a4ccfe163a6a57038c46af0a60c Author: Emmanuel Vadot AuthorDate: 2022-06-03 09:55:51 +0000 Commit: Emmanuel Vadot CommitDate: 2022-06-07 12:10:21 +0000 graphics/libdrm: Update to 2.4.111 Change log: https://lists.freedesktop.org/archives/dri-devel/2022-June/357686.html Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D35394 --- graphics/libdrm/Makefile | 2 +- graphics/libdrm/distinfo | 6 +++--- graphics/libdrm/files/patch-libkms_vmwgfx.c | 27 --------------------------- graphics/libdrm/pkg-plist | 5 ----- 4 files changed, 4 insertions(+), 36 deletions(-) diff --git a/graphics/libdrm/Makefile b/graphics/libdrm/Makefile index 2f5688d1e861..519b483e00eb 100644 --- a/graphics/libdrm/Makefile +++ b/graphics/libdrm/Makefile @@ -1,7 +1,7 @@ # Created by: lesi@FreeBSD.org PORTNAME= libdrm -PORTVERSION= 2.4.110 +PORTVERSION= 2.4.111 PORTEPOCH= 1 CATEGORIES= graphics x11 MASTER_SITES= https://dri.freedesktop.org/libdrm/ diff --git a/graphics/libdrm/distinfo b/graphics/libdrm/distinfo index 3dcbe14711ff..7b22ef87c6d3 100644 --- a/graphics/libdrm/distinfo +++ b/graphics/libdrm/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1645773982 -SHA256 (libdrm-2.4.110.tar.xz) = eecee4c4b47ed6d6ce1a9be3d6d92102548ea35e442282216d47d05293cf9737 -SIZE (libdrm-2.4.110.tar.xz) = 436372 +TIMESTAMP = 1654250031 +SHA256 (libdrm-2.4.111.tar.xz) = 1ad7164f77424de6f4ecba7c262bde196a214c6e19a6fbf497f0815f4d7ab2a9 +SIZE (libdrm-2.4.111.tar.xz) = 447388 SHA256 (7207431e466a.patch) = 97aa33faa22e4adc70d7154829aba1b4730ec01d3ebad1d2aea3d735fc181a9b SIZE (7207431e466a.patch) = 4791 diff --git a/graphics/libdrm/files/patch-libkms_vmwgfx.c b/graphics/libdrm/files/patch-libkms_vmwgfx.c deleted file mode 100644 index 17e68b6c6191..000000000000 --- a/graphics/libdrm/files/patch-libkms_vmwgfx.c +++ /dev/null @@ -1,27 +0,0 @@ -# the defintion of ERESTART is behind a check for _KERNEL, but -# defining that causes errno to not be defined. fortunately, there's -# an alternative switch. unfortunately, those differ by platform and -# _WANT_KERNEL_ERRNO is too recent to be part of any release, so just -# define ERESTART if we still don't have it after including errno.h -# ---- libkms/vmwgfx.c.orig 2018-05-09 22:26:03 UTC -+++ libkms/vmwgfx.c -@@ -26,10 +26,18 @@ - **************************************************************************/ - - -+#if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) -+#define _WANT_KERNEL_ERRNO -+#elif defined(__DragonFly__) -+#define _KERNEL_STRUCTURES -+#endif - #include - #include - #include - #include "internal.h" -+#ifndef ERESTART -+#define ERESTART (-1) -+#endif - - #include "xf86drm.h" - #include "libdrm_macros.h" diff --git a/graphics/libdrm/pkg-plist b/graphics/libdrm/pkg-plist index a152ac735bda..8bd293ff9648 100644 --- a/graphics/libdrm/pkg-plist +++ b/graphics/libdrm/pkg-plist @@ -38,7 +38,6 @@ include/libdrm/vc4_drm.h include/libdrm/via_drm.h include/libdrm/virtgpu_drm.h %%VMWGFX_DRIVERS%%include/libdrm/vmwgfx_drm.h -include/libkms/libkms.h include/libsync.h include/xf86drm.h include/xf86drmMode.h @@ -54,14 +53,10 @@ lib/libdrm.so.2.4.0 %%RADEON_DRIVERS%%lib/libdrm_radeon.so %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1 %%RADEON_DRIVERS%%lib/libdrm_radeon.so.1.0.1 -lib/libkms.so -lib/libkms.so.1 -lib/libkms.so.1.0.0 libdata/pkgconfig/libdrm.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_amdgpu.pc %%INTEL_DRIVER%%libdata/pkgconfig/libdrm_intel.pc %%RADEON_DRIVERS%%libdata/pkgconfig/libdrm_radeon.pc -libdata/pkgconfig/libkms.pc %%MANPAGES%%man/man3/drmAvailable.3.gz %%MANPAGES%%man/man3/drmHandleEvent.3.gz %%MANPAGES%%man/man3/drmModeGetResources.3.gz