From nobody Wed Jun 08 08:23:57 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 7C9ED838CBB; Wed, 8 Jun 2022 08:23: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 4LJ0cY31ltz4f4C; Wed, 8 Jun 2022 08:23:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654676637; 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=kcaIArPueKfL/8PN5sZFx1sQTxJTzs2haT/gIf+Wr0Y=; b=ZPA/le8Kge4uBueI0447/EZh/Jz0rTc/UzMTL44JLN5WX7JcCZwIScqlaVbTqdjyLinS6M i1C7KdeJ68RV2GywpFDVXqkmHl+T5nlJmxl5tc7CHiHZMHl5W4KBfeCb4eI9+HXk9pH/qC H4XyxRjlfDMXsGctX7HWFz7IECu3RghMD2sqIESI6yP1dYKhPyY6wLuQzDmh0lpKVHTwut unlQKJoR+WjMdD5ldRXU9ZQUZmqR134pZ6a4ARG/8KzWGhi8g1GicpLqgkDqR3ZiUf251X px6ZlekVLY2Z/qOlXR/qX6NqKUqaPCfYey59GLHE7A63lmi2ENchEgR/UPm50g== 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 4773B3CDD; Wed, 8 Jun 2022 08:23: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 2588NvYg081653; Wed, 8 Jun 2022 08:23:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2588NvVp081652; Wed, 8 Jun 2022 08:23:57 GMT (envelope-from git) Date: Wed, 8 Jun 2022 08:23:57 GMT Message-Id: <202206080823.2588NvVp081652@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: 0b95c0475f36 - main - x11-drivers/xf86-video-amdgpu: Update to 22.0.0 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: 0b95c0475f367ceda5e8253f89501f9b861e344d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654676637; 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=kcaIArPueKfL/8PN5sZFx1sQTxJTzs2haT/gIf+Wr0Y=; b=glHr7Dj1dclt/rLaxW+re2phhfNCeQBH3SlcwnznLf0NTC1pB4ChIopjHITuMcoq3TME7D 1PKwkVl3gdMMiYdY8Pwf5riTBvsEwND52PvRMHyk4Ht2T2u8+EQVy2iWL4m/kcUL2O7T2j r87FqjWrC16MtQsAkIJGhi2aASuuEr6RbdJL7t9qCJqHVVmdek1NgCupa3bjG4QxrKPvAp MALbnnPOwlHktnGVPAwkODy1FKtP3fDfMH912l9In/n48VngqEFcuNY2qFvJKSiUtVLCdf ZZZplaZRJpsfFU/lMIclIxU+CXpIeAmI12wA8VzSfPtF3DRyYYOgSpA4vfnz3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654676637; a=rsa-sha256; cv=none; b=cBhQsr6sN9tA9mvpeg7MCvDsXiysphK6a130MHMCIE25PiNqyD/emyWtFWEfv3QNCyshuQ AhtAWHQ/haFDpkKbRhMvfg+p6hNk9fp/yNJAsIyqUwh5LTIXPDHfIkvTtQR7RDwVPOCMi7 U2Lk5LcHClyGij/z0LDTfcuDPCs1dyfIveDWx1M/Ios90keouLNJXo078x0N+7MWZyA6yT ZA7GaTfYMOxii9rOZnPvJFiaFx65XIufviOyn1YUiyUk2/KwvcJtjBgeQ5nAHrOaCC1ynw slRTVUw5C0snrw9QUjOB2KRqI3eBNB0/K6UKNGXnVCH+7yioXjpB0b1PciDaaA== 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=0b95c0475f367ceda5e8253f89501f9b861e344d commit 0b95c0475f367ceda5e8253f89501f9b861e344d Author: Emmanuel Vadot AuthorDate: 2022-05-20 07:59:59 +0000 Commit: Emmanuel Vadot CommitDate: 2022-06-08 08:23:05 +0000 x11-drivers/xf86-video-amdgpu: Update to 22.0.0 While here pet portlint. Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D35269 --- x11-drivers/xf86-video-amdgpu/Makefile | 19 ++++----- x11-drivers/xf86-video-amdgpu/distinfo | 10 ++--- .../files/patch-src_amdgpu__drm__queue.c | 47 ---------------------- .../files/patch-src_amdgpu__kms.c | 11 ----- 4 files changed, 15 insertions(+), 72 deletions(-) diff --git a/x11-drivers/xf86-video-amdgpu/Makefile b/x11-drivers/xf86-video-amdgpu/Makefile index 134aa97a9a3c..664c8e7d3145 100644 --- a/x11-drivers/xf86-video-amdgpu/Makefile +++ b/x11-drivers/xf86-video-amdgpu/Makefile @@ -1,26 +1,27 @@ # this port is for future amdgpu kernel support testing. PORTNAME= xf86-video-amdgpu -PORTVERSION= 19.1.0 -PORTREVISION= 2 +PORTVERSION= 22.0.0 CATEGORIES= x11-drivers +PATCH_SITES= https://gitlab.freedesktop.org/xorg/driver/${PORTNAME}/-/commit/ +PATCHFILES+= 77b13493.patch:-p1 # https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/merge_requests/77 + MAINTAINER= x11@FreeBSD.org COMMENT= X.Org amdgpu display driver -PATCH_SITES= https://gitlab.freedesktop.org/xorg/driver/${PORTNAME}/-/commit/ -PATCHFILES+= edcbe5f52ddfceee3d66d69bbcebbceac06b6d0d.patch:-p1 - LICENSE= MIT LICENSE_FILE= ${WRKSRC}/COPYING +# No amdgpu kernel driver on non-x86 and PC98. +ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64le +ONLY_FOR_ARCHS_REASON= KMS is required and currently only available on x86/arm64/powerpc64le + LIB_DEPENDS= libdrm_amdgpu.so:graphics/libdrm -USES= gl xorg-cat:driver +EXTRACT_SUFX= .tar.xz +USES= gl xorg-cat:driver tar:xz USE_GL= gbm -# No amdgpu kernel driver on non-x86 and PC98. -ONLY_FOR_ARCHS= aarch64 i386 amd64 powerpc64le -ONLY_FOR_ARCHS_REASON= KMS is required and currently only available on x86/arm64/powerpc64le CONFIGURE_ARGS+=--disable-udev diff --git a/x11-drivers/xf86-video-amdgpu/distinfo b/x11-drivers/xf86-video-amdgpu/distinfo index 6787da0e094b..c6eb8f643809 100644 --- a/x11-drivers/xf86-video-amdgpu/distinfo +++ b/x11-drivers/xf86-video-amdgpu/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1597786182 -SHA256 (xorg/driver/xf86-video-amdgpu-19.1.0.tar.bz2) = 4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d -SIZE (xorg/driver/xf86-video-amdgpu-19.1.0.tar.bz2) = 441746 -SHA256 (xorg/driver/edcbe5f52ddfceee3d66d69bbcebbceac06b6d0d.patch) = 6a0c855a3c6d1a747055ee5c616c2a155b0e798485b3de4028ccfef420835084 -SIZE (xorg/driver/edcbe5f52ddfceee3d66d69bbcebbceac06b6d0d.patch) = 848 +TIMESTAMP = 1654594086 +SHA256 (xorg/driver/xf86-video-amdgpu-22.0.0.tar.xz) = 9d23fb602915dc3ccde92aa4d1e9485e7e54eaae2f41f485e55eb20761778266 +SIZE (xorg/driver/xf86-video-amdgpu-22.0.0.tar.xz) = 376956 +SHA256 (xorg/driver/77b13493.patch) = 1e76bb36f7fd69e0556ae6b5a7d2331a711367b6a7421adc221f2fcae1aff82b +SIZE (xorg/driver/77b13493.patch) = 1269 diff --git a/x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__drm__queue.c b/x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__drm__queue.c deleted file mode 100644 index bbf1c20c91ac..000000000000 --- a/x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__drm__queue.c +++ /dev/null @@ -1,47 +0,0 @@ ---- src/amdgpu_drm_queue.c.orig 2016-09-20 08:19:15 UTC -+++ src/amdgpu_drm_queue.c -@@ -61,7 +61,7 @@ amdgpu_drm_queue_handler(int fd, unsigne - unsigned int usec, void *user_ptr) - { - uintptr_t seq = (uintptr_t)user_ptr; -- struct amdgpu_drm_queue_entry *e, *tmp; -+ struct amdgpu_drm_queue_entry *e = NULL, *tmp; - - xorg_list_for_each_entry_safe(e, tmp, &amdgpu_drm_queue, list) { - if (e->seq == seq) { -@@ -133,7 +133,7 @@ amdgpu_drm_abort_one(struct amdgpu_drm_q - void - amdgpu_drm_abort_client(ClientPtr client) - { -- struct amdgpu_drm_queue_entry *e; -+ struct amdgpu_drm_queue_entry *e = NULL; - - xorg_list_for_each_entry(e, &amdgpu_drm_queue, list) { - if (e->client == client) -@@ -147,7 +147,7 @@ amdgpu_drm_abort_client(ClientPtr client - void - amdgpu_drm_abort_entry(uintptr_t seq) - { -- struct amdgpu_drm_queue_entry *e, *tmp; -+ struct amdgpu_drm_queue_entry *e = NULL, *tmp; - - xorg_list_for_each_entry_safe(e, tmp, &amdgpu_drm_queue, list) { - if (e->seq == seq) { -@@ -163,7 +163,7 @@ amdgpu_drm_abort_entry(uintptr_t seq) - void - amdgpu_drm_abort_id(uint64_t id) - { -- struct amdgpu_drm_queue_entry *e, *tmp; -+ struct amdgpu_drm_queue_entry *e = NULL, *tmp; - - xorg_list_for_each_entry_safe(e, tmp, &amdgpu_drm_queue, list) { - if (e->id == id) { -@@ -191,7 +191,7 @@ amdgpu_drm_queue_init() - void - amdgpu_drm_queue_close(ScrnInfoPtr scrn) - { -- struct amdgpu_drm_queue_entry *e, *tmp; -+ struct amdgpu_drm_queue_entry *e = NULL, *tmp; - - xorg_list_for_each_entry_safe(e, tmp, &amdgpu_drm_queue, list) { - if (e->crtc->scrn == scrn) diff --git a/x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__kms.c b/x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__kms.c deleted file mode 100644 index 885b2058eef4..000000000000 --- a/x11-drivers/xf86-video-amdgpu/files/patch-src_amdgpu__kms.c +++ /dev/null @@ -1,11 +0,0 @@ ---- src/amdgpu_kms.c.orig 2016-11-17 06:07:48 UTC -+++ src/amdgpu_kms.c -@@ -723,7 +723,7 @@ amdgpu_dirty_update(ScrnInfoPtr scrn) - { - AMDGPUInfoPtr info = AMDGPUPTR(scrn); - ScreenPtr screen = scrn->pScreen; -- PixmapDirtyUpdatePtr ent; -+ PixmapDirtyUpdatePtr ent = NULL; - RegionPtr region; - - xorg_list_for_each_entry(ent, &screen->pixmap_dirty_list, ent) {