From nobody Wed Nov 22 16:05:16 2023 X-Original-To: dev-commits-ports-all@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 4Sb5gJ2q47z5287j; Wed, 22 Nov 2023 16:05:16 +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 4Sb5gJ2MPkz3FKF; Wed, 22 Nov 2023 16:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700669116; 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=1jsXapKpJKxkUhTktvBEsDAruJVx83efJSwzjrakRDI=; b=oyeox3kYfe7zjR0AydB8puUxaV14puNAbc8WABLCrt/UxRDW9Et6Q5SlsIibmFK9il/Hsk M0Psnf5PxfoH4N5ONowfX4UpYI2UNHCv9LACvHLO5ewPfwQjf0NyjL+vP8QOSn4sp5ob1S 6/1eYfjD6P4cxexlcZxZgcnEh3f7eoUbzOzgTAYGxAcLcTza8XmKUx4I+6v9hpTSyVHd/K wkptVUGBCvAyvt8t4TaMDJNkr5+EAZJ/utyOi3mPEDoNF44EoZt8WZLsezOdQQT3Z//CiY PVK1RMYnA+0lFEVPtodAijKJF0Q+DSGsdD1te1xCcatv/gfvQW6ZOMGBjzSIWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700669116; 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=1jsXapKpJKxkUhTktvBEsDAruJVx83efJSwzjrakRDI=; b=qT3LBT8CbDhv6xP29uZKpv51VxZE+jrxuElu2Uz6qh0gk6gUCY+BsdsTF9iPn9U1ZqfDWB wFBkQb5xcGkuLr7CYq5LdD3u/O2tAG1EaH07qxjmbzlgkc7FB4b0rCYOje3OGDZlDLDFnw yH76ITVc3NYUF/oYOJKhNp3EjjoIIbiaEndmmaccvJUQL/JHzYqngbAUydxgPXX4xKEnfQ DyQ7K3NDjEACBvLIuG5Yl0fx/dpNQrwz6g8yLq0tmlC3L0LYNkk7Uq76lDwNBvMOA7CqC9 h2peATMphlC/12EICu2F2Rhx2buTljVOwbRLtwHwfandlXbdCP3P1HdisZDkaQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700669116; a=rsa-sha256; cv=none; b=XCb6zPm/kHZA2cSL2uLVmghXlFdnp/JyPe4rGyk6vyIh7mb+9lTOgtDsDxyzIvs7/1xnZe 3/KFrkPgoezzJTxCtdpNw87MYylRZRiFIKmnYiWzR3MGGd5dSWnT/IB63rDVkYSIsBbVuH M51VcwurkhE2uPQmphIycSal/rCU6BQbhiIMDUZwuJnKZ6wbnjodcs2H142gJZaf7gO8wq hPn+RpCgsvIA1GVOnnYdEvGQa3nzGSpbXXLKYmka4hN+9Q16F/X8VM3O8CgSU/sNaAgeH8 6Sjwb+cPYYxDOImKsJXCfIR+HX6B3dFZe+MkiWBFUU5yY33KjC2oQGdRVpDX9w== 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 4Sb5gJ16Bcz9Ss; Wed, 22 Nov 2023 16:05:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AMG5Guj001656; Wed, 22 Nov 2023 16:05:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AMG5GSv001653; Wed, 22 Nov 2023 16:05:16 GMT (envelope-from git) Date: Wed, 22 Nov 2023 16:05:16 GMT Message-Id: <202311221605.3AMG5GSv001653@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: 956c42a3d46a - main - x11-wm/gamescope: back to default wlroots List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 956c42a3d46a3713caa764124a13ea32833961b6 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=956c42a3d46a3713caa764124a13ea32833961b6 commit 956c42a3d46a3713caa764124a13ea32833961b6 Author: Jan Beich AuthorDate: 2023-11-22 15:46:35 +0000 Commit: Jan Beich CommitDate: 2023-11-22 16:04:33 +0000 x11-wm/gamescope: back to default wlroots --- x11-wm/gamescope/Makefile | 11 +++++++++-- x11-wm/gamescope/distinfo | 2 ++ 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index b307a2f9ef91..7972f9b22bda 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,9 +1,11 @@ PORTNAME= gamescope DISTVERSION= 3.13.8 +PORTREVISION= 1 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= a618ea074660.patch:-p1 # https://github.com/ValveSoftware/gamescope/issues/120 +PATCHFILES+= 4a067fb4ebe2.patch:-p1 # https://github.com/ValveSoftware/gamescope/pull/678 MAINTAINER= jbeich@FreeBSD.org COMMENT= SteamOS session compositing window manager @@ -18,7 +20,7 @@ BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.17:graphics/wayland-protocols \ glm>0:math/glm \ hwdata>0:misc/hwdata \ - wlroots>=0.16.0<0.17.0:x11-toolkits/wlroots + wlroots>=0.17.0<0.18.0:x11-toolkits/wlroots LIB_DEPENDS= libdrm.so:graphics/libdrm \ libliftoff.so:graphics/libliftoff \ libvulkan.so:graphics/vulkan-loader \ @@ -55,6 +57,12 @@ PIPEWIRE_MESON_ENABLED= pipewire post-extract: # Merge patch_directory for subprojects without meson.build @(cd ${WRKSRC}/subprojects/packagefiles && ${COPYTREE_SHARE} . ..) +.if defined(PATCHFILES) && ${PATCHFILES:M4a067fb4ebe2*} +# Pretend to be a regular file for vendor patch to apply as is + @${RMDIR} ${WRKSRC}/subprojects/wlroots + @${ECHO_CMD} "Subproject commit 1712a7d27444d62f8da8eeedf0840b386a810e96" \ + >${WRKSRC}/subprojects/wlroots +.endif .ifdef GH_TUPLE post-configure: @@ -87,5 +95,4 @@ bundled-libcxx: .endif .endif # exists(/usr/lib/libc++.so) -.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk" .include diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo index 2e94dc85bd5e..f3e16d93e149 100644 --- a/x11-wm/gamescope/distinfo +++ b/x11-wm/gamescope/distinfo @@ -13,3 +13,5 @@ SHA256 (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = b5a9ff1793b1e2d388a3819bf SIZE (llvm-llvm-project-llvmorg-16.0.1_GH0.tar.gz) = 179289803 SHA256 (a618ea074660.patch) = c79b4b7a231d9c6e34912b8f4a301c6c60b921b6be5fb9c132d999e9a6930424 SIZE (a618ea074660.patch) = 2589 +SHA256 (4a067fb4ebe2.patch) = fb12df8318e06a77ead4aa5752e32eec48efc70de43f069369a4c6a83a590152 +SIZE (4a067fb4ebe2.patch) = 4823