From nobody Sat Nov 26 17:27:39 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 4NKJZz3M0gz4hd8V; Sat, 26 Nov 2022 17:27:39 +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 4NKJZz2q3gz44Yh; Sat, 26 Nov 2022 17:27:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669483659; 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=8maEx0xP4M3j/OZqR5Ewbtu/Hu+KdM7MhUAf5duWUxE=; b=CyHlqS3vytFC7OpEfhk1rSSJqxArNGW1N9L8x5vHpabIKsSwQFOX6FVGdZxty/SHxpg48w W7H/lVZe8I1P2J5wWZmn+hRIPp8KjmAuFjW4y7hhQ95D+GOnFPjeMR3R4xvGd8pxLSYnu+ G0P3voD00ttWyiWL9/SemjHHUlqsA7ik2pmYNqXfHjMO4btDANk6SbAlSaWoir8QR6Kgfv VNXE5Q8k/F56Pn+OT39Q+/ET5+heNil94izTK1AP3WyGT5mixOFmjAsKlKfbAJij3Y78x0 BHF4FmpkjcYhidDkiIdaSd3aEfOOcqdr7a4SNeDJgYUpfFRQ2cSyaVcC+JYKDw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669483659; 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=8maEx0xP4M3j/OZqR5Ewbtu/Hu+KdM7MhUAf5duWUxE=; b=bUzgOEJd420p92hvzlrzvMghNw61gzieBXC7lBR7eG8vJC3EXXF68Anw3/qvD6fLjhgf1s quz/BUXX0sJRRo863Uid85QqG4rOkLl2n/IRCkwFCmaUCdsjJm24T9bm3lLtc+f+Bn4Ml0 ggZmz72OXIAO8EEXh4RcqeyQ2tb5RAw/1T9Z0HYRwxjZKVIstzLrATZK+NaxArRuGuz+zJ Ml91epLWj/waB9OSA5Mw971GmiVdLpXQQCl6pQ1k8DAOq7ASySzFanYby0EUTmWZ/lCS38 Sdth7+Y6gdiKYJgaoODUVXk9Tc48qaH2BuRQSEp4mFQ2AbLp8ARMI/s0XaAx/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669483659; a=rsa-sha256; cv=none; b=dCl23VH6y8kW6ZCgrKmn/eIhmO3Sud01HiuvruNcWvpbBM9zUjJeCqbu/nqQUjuggkljT2 HDoLsVGaHi5l6Q/BU0r3B18LGEOQFlDV7W4EplwNrG8q2d8ZAl3YvvyrctiBqrOqilb69T NVUZEngfBLAz3GXBAGOpCzleqoDPaIzslWaI/iKACj11H19rbdhAwbLIFy52HAlZ85+tLj 2jZ29Fp3l0qqOlsDZI+7Lp7cdNrj3kZ4GbC+ny8A7u8b3SXAJ6GL6EY1i+bY8RZjxBFG+c vxoVpP8ktviHqQHXh9U5iRRZH+HTu/rJ0em+TeKzEHniXW3RJPrz9is/AAh9hg== 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 4NKJZz1cXJzSRP; Sat, 26 Nov 2022 17:27:39 +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 2AQHRdUY094406; Sat, 26 Nov 2022 17:27:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AQHRdjv094405; Sat, 26 Nov 2022 17:27:39 GMT (envelope-from git) Date: Sat, 26 Nov 2022 17:27:39 GMT Message-Id: <202211261727.2AQHRdjv094405@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: bc1d9770a8d9 - main - x11-wm/gamescope: back to default wlroots 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: bc1d9770a8d994898456c311c87049713ce61bc1 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=bc1d9770a8d994898456c311c87049713ce61bc1 commit bc1d9770a8d994898456c311c87049713ce61bc1 Author: Jan Beich AuthorDate: 2022-11-26 17:13:22 +0000 Commit: Jan Beich CommitDate: 2022-11-26 17:25:47 +0000 x11-wm/gamescope: back to default wlroots --- x11-wm/gamescope/Makefile | 13 +++++++++++-- x11-wm/gamescope/distinfo | 6 ++++++ 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index f67ab0062dcc..cebb5140805d 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,11 +1,15 @@ PORTNAME= gamescope DISTVERSION= 3.11.49 +PORTREVISION= 1 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 2a84a44f6897.patch:-p1 # https://github.com/Plagman/gamescope/pull/119 PATCHFILES+= e0927f7bce95.patch:-p1 # https://github.com/Plagman/gamescope/pull/119 PATCHFILES+= a618ea074660.patch:-p1 # https://github.com/Plagman/gamescope/issues/120 +PATCHFILES+= 91fbb22bda68.patch:-p1 # https://github.com/Plagman/gamescope/pull/677 +PATCHFILES+= f4a33bd37e49.patch:-p1 # https://github.com/Plagman/gamescope/pull/632 +PATCHFILES+= be5e7d23e49e.patch:-p1 # wlroots 0.16 (black screen fix) MAINTAINER= jbeich@FreeBSD.org COMMENT= Micro-compositor from SteamOS @@ -19,7 +23,7 @@ BUILD_DEPENDS= glslangValidator:graphics/glslang \ libliftoff>=0.3.0<0.4.0:graphics/libliftoff \ vulkan-headers>0:graphics/vulkan-headers \ wayland-protocols>=1.17:graphics/wayland-protocols \ - wlroots>=0.15.0<0.16.0:x11-toolkits/wlroots + wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libdrm.so:graphics/libdrm \ libliftoff.so:graphics/libliftoff \ @@ -47,6 +51,11 @@ PIPEWIRE_MESON_ENABLED= pipewire post-extract: # Merge patch_directory for subprojects without meson.build @(cd ${WRKSRC}/subprojects/packagefiles && ${COPYTREE_SHARE} . ..) +.if defined(PATCHFILES) && ${PATCHFILES:M91fbb22bda68*} +# Pretend to be a regular file for vendor patch to apply as is + @${RMDIR} ${WRKSRC}/subprojects/wlroots + @${ECHO_CMD} "Subproject commit 9f41627aa10a94d9427bc315fa3d363a61b94d7c" \ + >${WRKSRC}/subprojects/wlroots +.endif -.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" .include diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo index 8d723f58b646..c8a4a23812b8 100644 --- a/x11-wm/gamescope/distinfo +++ b/x11-wm/gamescope/distinfo @@ -9,3 +9,9 @@ SHA256 (e0927f7bce95.patch) = 6bbab2f37d7e76a1eade6d81bc0b441cc09f0020143bafb535 SIZE (e0927f7bce95.patch) = 1609 SHA256 (a618ea074660.patch) = c79b4b7a231d9c6e34912b8f4a301c6c60b921b6be5fb9c132d999e9a6930424 SIZE (a618ea074660.patch) = 2589 +SHA256 (91fbb22bda68.patch) = 024f58139f8d07c01138f3dcf39170dbfd48802b11001d73c7cdb494752e315f +SIZE (91fbb22bda68.patch) = 17412 +SHA256 (f4a33bd37e49.patch) = dd22a0f5e4f0af44b65d04c22c2a67c992b0a3098adb83ddf52e5bcf222c9ec3 +SIZE (f4a33bd37e49.patch) = 1514 +SHA256 (be5e7d23e49e.patch) = 0c9ca3bcb9a580ed7774f2bff1d3b07a34da3ec35ea7292b90e84b315bf3eccf +SIZE (be5e7d23e49e.patch) = 1216