From nobody Tue Dec 28 00:42:47 2021 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 1C49E1919118; Tue, 28 Dec 2021 00:42:48 +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 4JNG3C3K4Wz3KFw; Tue, 28 Dec 2021 00:42:47 +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 2719427CCD; Tue, 28 Dec 2021 00:42:47 +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 1BS0gl6k077758; Tue, 28 Dec 2021 00:42:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BS0gl1r077757; Tue, 28 Dec 2021 00:42:47 GMT (envelope-from git) Date: Tue, 28 Dec 2021 00:42:47 GMT Message-Id: <202112280042.1BS0gl1r077757@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: 1b3c44d137ce - main - x11-toolkits/wlroots: backport some fixes from upstream 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: 1b3c44d137ce39914901457a7f5d4bdc21cb4e1c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1640652167; 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=F1+trrV6IhBOoUU2uR5EMSnj036PMVi0j7q161sH/FM=; b=xAx/13LpckmbfidmBb55mVai2yn5fq162pajUe6rZk17kGrvZgE/98GB3MpID9baYgv0ky p+VYZMsQ1vVKKcFll9LO1OhUu1Arr6hRDBK1SB2iqz9XS9degEpTaIpX+U+uOlpMKT7heR 5oNxVTC0nFVA32zGsMJzWsOR4LSBSBGlhJXmJ4D/GqXoAomhqaCNewK76FRfKTFhlIbZrR +HZs++CjGg+lnS2uT8Y5A26zc3Kjt8LTqIziW7tzbL1II+cSkXVZd9EYhnD9KqALbA03mn f4iLEL+t7D+s1zqff6XKqSDDhIyWiGOEZLtYb95xQneSUVlmnSHoXWsOxLrynA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1640652167; a=rsa-sha256; cv=none; b=LvIfDt1XrXlILDS5hWoR2P0NFRquH64rgpleMwmN1hoPGvjjJJWQchdtffcwEGmrHl/0ys PWHdK4TXlNCzLaJa+lo28yh68HiiLxMfP7oIrgVvig1C0WhCdctXDixnKXNmR7MJao5qe1 sdG9R0nTxBEsPMT3p5klsBXsMzkWP7PRVKdbRnBhjKCDZBOMru0lynzNtt4NnRHz1IE57G pEHXRqNDBpqEM8luI17x8ZLP/4W8Ys1hu9qIm50zBjKI3uReKJKj3nBVFZuxH/17M3n78L zGMvMnXqdS5+oHjMP0baZsM5px+H+fu8RVrigBL2kw4hXXkd8RSmzIO7f/04kQ== 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=1b3c44d137ce39914901457a7f5d4bdc21cb4e1c commit 1b3c44d137ce39914901457a7f5d4bdc21cb4e1c Author: Jan Beich AuthorDate: 2021-12-27 10:56:40 +0000 Commit: Jan Beich CommitDate: 2021-12-28 00:41:53 +0000 x11-toolkits/wlroots: backport some fixes from upstream - wlr_texture: remove wlr_texture_from_wl_drm() from header - scene: schedule an output frame on wl_surface.frame - vulkan: Fix imported image layout --- x11-toolkits/wlroots/Makefile | 4 ++++ x11-toolkits/wlroots/distinfo | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile index 5677b6b2d18b..755d3eac263a 100644 --- a/x11-toolkits/wlroots/Makefile +++ b/x11-toolkits/wlroots/Makefile @@ -1,6 +1,7 @@ PORTNAME= wlroots DISTVERSION= 0.15.0 DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/} +PORTREVISION= 1 CATEGORIES= x11-toolkits PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github @@ -8,6 +9,9 @@ PATCHFILES+= 7c0e2a271a4c.patch:-p1:github # https://gitlab.freedesktop.org/wlro PATCHFILES+= 55a8d225cf8c.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ PATCHFILES+= 347b32642fb6.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3318 +PATCHFILES+= 823476e76ed1.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3409 +PATCHFILES+= 812951f5bc47.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3411 +PATCHFILES+= 9988eb3378db.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3413 MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo index ca9dca337423..99f7e9e4077f 100644 --- a/x11-toolkits/wlroots/distinfo +++ b/x11-toolkits/wlroots/distinfo @@ -7,5 +7,11 @@ SHA256 (55a8d225cf8c.patch) = f9df98540fdabe35c61ed828f6d64633aab72edf0ba1c7ad08 SIZE (55a8d225cf8c.patch) = 4209 SHA256 (347b32642fb6.patch) = df24f95731b45a141f5ccbe263249fed9ba445ad04ce0da2c000142c763954c3 SIZE (347b32642fb6.patch) = 3808 +SHA256 (823476e76ed1.patch) = f0ad7c2366042451be01270f33e6552bf4676f64440972ecc1fe9ee9cd75267a +SIZE (823476e76ed1.patch) = 1234 +SHA256 (812951f5bc47.patch) = 94dbc14a66c791570362bfe0dae03a5b974a35668d333c5c5a9f940f21de3e58 +SIZE (812951f5bc47.patch) = 1745 +SHA256 (9988eb3378db.patch) = 335d3c460780fea1f7a27f5e64ebb473b3281964843a6492f1ac334c124213e3 +SIZE (9988eb3378db.patch) = 1497 SHA256 (c0fc017207f0.patch) = bdafef91a067cc95d9b47f5a837e400b641d9479393136818c34f5eb6b846d71 SIZE (c0fc017207f0.patch) = 108229