From nobody Fri Feb 11 15:32:06 2022 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 43E5119AA614; Fri, 11 Feb 2022 15:32:07 +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 4JwHfZ4bwKz3HVn; Fri, 11 Feb 2022 15:32:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644593526; 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=QTK1r2G8uIW663Tq+OXjG13mljSThkSPh7rudfQvf+I=; b=awZlza7MigFQOM//Q54xAc9LtXT61Wjmpmec3AzSQEnC+U6BWLRVUo/SOTfjRiY6GuUuU4 kNgKdA0bPyiXr7/zOG1qRa+S1+EuxwNc4Y6C1CC4orp9bR/qTvT1bHvwz3yAlSc0DvLHi6 ZcQi2t+ASaxtWqV0Kcrzg3SRBTiQMhm9H1QQBOFbZJRd1UKNoQ9riTXE3nlOk1oRZdF7WW ADV5iTWe5yO/CLq3ws2zABzdf4+/O7aDfBHc1tu1lug0wkO+w5qFYjhw+bcGSzmpAuDKWi ZjXgL3poTIHZ1uSjldOXG/vHzdJ+//DJcT5M7r3VvtS8SAhZQLbmEwaECKYJzQ== 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 3673616A3C; Fri, 11 Feb 2022 15:32:06 +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 21BFW6ZB025343; Fri, 11 Feb 2022 15:32:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21BFW6Xp025342; Fri, 11 Feb 2022 15:32:06 GMT (envelope-from git) Date: Fri, 11 Feb 2022 15:32:06 GMT Message-Id: <202202111532.21BFW6Xp025342@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 3ac6140ab9cb - 2022Q1 - x11-wm/gamescope: unbundle libliftoff after 929a40f5e1c9 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/2022Q1 X-Git-Reftype: branch X-Git-Commit: 3ac6140ab9cb9b758dfc544cf6b7a2eb272402ac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644593526; 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=QTK1r2G8uIW663Tq+OXjG13mljSThkSPh7rudfQvf+I=; b=Cc8JnYkX6YCGLzNjxyDsd/4unY0IPQTCT7DCxe1QGKV2gCI6+9b3A/pHy/EaTpwpNUYJBj o06J2VI95tATyY1DdsMgBToohev02iP6bpHYZe88i0FCIVo7wG5BBBYICBESWPMQcYBZbX meFVFW7N1vX87PUIJvK07V76aHBOwGPiLGOdWohKOOcweQHBShKqbaPJzwIgKrH9etlKUR coTuynVQQYPbeSz9feQgp8scfdkzCeKvIRBsDVAa6R074nGR0bJ0HICKzk8DeIvtx2vqK7 6LYtD+tRIPPlu/ttPtjX+oQ3+4HOtjX4oBookDynNrLMmk3TjHlgJihSEJYdRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644593526; a=rsa-sha256; cv=none; b=dSBJpOMPckTVNKCuoNhAX+WpU/sRWG7jAU9veciazgEu3ls6lexzBeDgUe3UxfmQWW52L9 MrbMv2RnVzE4znew8zkGzZx/FsNF+7qjbeER/RzzEPP84TpRzMFYolGIj0cqtHHFEUVGWF kZJKIK9sOxxs/+z667zJTTTTLAROVp1ynF9IkGPA+MkavjIwNtSmwv8Kf7XiFpd4bmgET5 FFVtEvt6zuI1fdWj923P9f9sWek4owm2evb+AG5n+NPB2fVIoa/HpLjEOfsWWFnodvvXDC gnBX42Ao77cvslvWAIMVS3Fl8DD/qk4/vHUTmw0EDaILA6mEWQxs2IWTfkrn+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2022Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=3ac6140ab9cb9b758dfc544cf6b7a2eb272402ac commit 3ac6140ab9cb9b758dfc544cf6b7a2eb272402ac Author: Jan Beich AuthorDate: 2022-02-11 12:09:55 +0000 Commit: Jan Beich CommitDate: 2022-02-11 15:30:53 +0000 x11-wm/gamescope: unbundle libliftoff after 929a40f5e1c9 This reverts commit 8947b5348e896ba308935f13823954443ca3655c. (cherry picked from commit ef2d0a35dd40b8b59bf9f94b3887d26631b3465d) --- x11-wm/gamescope/Makefile | 6 +++--- x11-wm/gamescope/distinfo | 2 -- x11-wm/gamescope/files/patch-private-libs | 27 --------------------------- 3 files changed, 3 insertions(+), 32 deletions(-) diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index cc0b9d4f6bb5..39c862930839 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -1,5 +1,6 @@ PORTNAME= gamescope DISTVERSION= 3.10.8 +PORTREVISION= 1 CATEGORIES= x11-wm PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -21,6 +22,7 @@ BUILD_DEPENDS= glslangValidator:graphics/glslang \ wlroots>=0.15.0<0.16.0:x11-toolkits/wlroots LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ libdrm.so:graphics/libdrm \ + libliftoff.so:graphics/libliftoff \ libvulkan.so:graphics/vulkan-loader \ libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ @@ -28,14 +30,12 @@ LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \ USES= compiler:c++11-lib meson pkgconfig sdl xorg USE_GITHUB= yes -USE_GITLAB= nodefault USE_SDL= sdl2 USE_XORG= x11 xcomposite xdamage xext xfixes xrender xres xtst xxf86vm GH_ACCOUNT= Plagman GH_TUPLE= nothings:stb:af1a5bc:stb/subprojects/stb -GL_TUPLE= https://gitlab.freedesktop.org:emersion:libliftoff:2e1dd93b60224e77f6a49ad8fb36d184e3a9a3bc:libliftoff/subprojects/libliftoff PLIST_FILES= bin/${PORTNAME} -MESON_ARGS= --force-fallback-for=libliftoff # allow system wlroots +MESON_ARGS= --force-fallback-for= # allow system wlroots + libliftoff OPTIONS_DEFINE= PIPEWIRE OPTIONS_DEFAULT=PIPEWIRE diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo index 4f47a934505e..43f48ceb8452 100644 --- a/x11-wm/gamescope/distinfo +++ b/x11-wm/gamescope/distinfo @@ -3,8 +3,6 @@ SHA256 (Plagman-gamescope-3.10.8_GH0.tar.gz) = 4109b549870b28a1af98aedc94f66594f SIZE (Plagman-gamescope-3.10.8_GH0.tar.gz) = 99561 SHA256 (nothings-stb-af1a5bc_GH0.tar.gz) = 3facf6e6f8c3e1715e1a088f22bad9c9202973f9369fb3f088f46cced3f64058 SIZE (nothings-stb-af1a5bc_GH0.tar.gz) = 1387334 -SHA256 (emersion-libliftoff-2e1dd93b60224e77f6a49ad8fb36d184e3a9a3bc_GL0.tar.gz) = 487a09a299b178797d93fd1938a4513f02f7d562cdc534dd44561d4751300daf -SIZE (emersion-libliftoff-2e1dd93b60224e77f6a49ad8fb36d184e3a9a3bc_GL0.tar.gz) = 31198 SHA256 (ec8e547be135.patch) = c0568f97611b3fe023a17d01f6ae6023f050fb4eb8be6ad4c6fa739456bed297 SIZE (ec8e547be135.patch) = 2861 SHA256 (ea415ae28442.patch) = 4ec00a765409d266262e1198d9f7f9650db299c0d0c0b929506ce6c0b81fae01 diff --git a/x11-wm/gamescope/files/patch-private-libs b/x11-wm/gamescope/files/patch-private-libs deleted file mode 100644 index e2961b1e65e9..000000000000 --- a/x11-wm/gamescope/files/patch-private-libs +++ /dev/null @@ -1,27 +0,0 @@ -libliftoff is untagged and has no other consumers. Keep it private to -gamescope package for now. - ---- subprojects/libliftoff/meson.build.orig 2020-05-26 19:30:31 UTC -+++ subprojects/libliftoff/meson.build -@@ -38,7 +38,7 @@ liftoff_lib = library( - include_directories: liftoff_inc, - version: meson.project_version(), - dependencies: liftoff_deps, -- install: true, -+ install: not meson.is_subproject(), - ) - - liftoff = declare_dependency( -@@ -47,6 +47,7 @@ liftoff = declare_dependency( - dependencies: liftoff_deps, - ) - -+if not meson.is_subproject() - install_headers('include/libliftoff.h') - - pkgconfig = import('pkgconfig') -@@ -60,3 +61,4 @@ pkgconfig.generate( - - subdir('example') - subdir('test') -+endif