From nobody Thu Aug 18 00:31:12 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 4M7QmJ5QqVz4YjR9; Thu, 18 Aug 2022 00:31:12 +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 4M7QmJ50Tpz3cG1; Thu, 18 Aug 2022 00:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660782672; 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=rndvSONaCXb954vRXr+efXaeLhJwBwRvFULe6GOM/gI=; b=WuELegN1cXz873Xog1wPwUsPBcAdKXmQ6uCUwUWWVIBS75POlMHVnlWoQ49MEqKQKmOnWg wAMytJbaFBeTWeXx5J6SgNamYXX9pluJ5NT4GaM3TfWnqv/cpkv9/+1oK+kRd+GBWHXC6P QJe1k84lHd/ZOieSyl2aemXvOa2ISLlXGjYkoJ0E4YM1BYuE3NixwFwBWxR86XEQC8LCYu TfHIIta4f+UGb3AOE4+XQgnFDi9hpSxwVhoPVBV9/HE1pdqyjvpVxNTv1YJOAcOp06iA7/ UWOESUsfnddWe9HWodBtpqrWIBIV+zqIncb60FjwthN7mTp7O1Lo6nddSejg/A== 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 4M7QmJ43Q0z18c8; Thu, 18 Aug 2022 00:31:12 +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 27I0VCS7091643; Thu, 18 Aug 2022 00:31:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27I0VCJe091632; Thu, 18 Aug 2022 00:31:12 GMT (envelope-from git) Date: Thu, 18 Aug 2022 00:31:12 GMT Message-Id: <202208180031.27I0VCJe091632@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: 7e0eeca6bb23 - main - x11-wm/gamescope: bundle libliftoff, preparing for update 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: 7e0eeca6bb238a8cc201b921c52a97fd856dd255 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660782672; 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=rndvSONaCXb954vRXr+efXaeLhJwBwRvFULe6GOM/gI=; b=qXRdHcXwXUDWV8bGs/+gbseL58ZaWQZglm0/VHsjcn1EtCdP6fqZHogDlC5qJaLKPMlpLD OhnSBcr4thDMN5U55sVqrUsZd3UJ/5pnciDhqIGExA49tFodkQzSVZAIB+hoVXn/GIXzK4 zYFfLeWlW+ujw15rd0bQzzRs/y0N2QFnxSygxrQzYh1GNnxDr2mDEyvxp4CTpNvS7cMTb0 vHBIbgZjiQuqZgzh+U+DBYn3G5sQ0U6JjoujThVistikAyO0FZ2uwbUPeUA0p/du7XLsFR Kjv24jBLVV2sBKTy3ElU3VEWkd2EUbZ9mSMV3EVO3nPmJ9kzduCyyRP1hagy2w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660782672; a=rsa-sha256; cv=none; b=q9dfUqt57RAU+UryCUy2+hm5luGljQXIcj/xBp4Y0bbIcijbVeP6lamCSs3Ut9yIRzpQxO 24K27/CAT3YbRGXTH0vaGS5d8m0OtyAzmnnwMwEeR6i7hVD5FAlTCnRQVoN79GW4vz7zPB YpHdxYLyZW1xxD18NbxvmFy5eAnlhzB3124V6iMNdcuHC9GD5DdoEhNk78i77xcGyjjkEB Y38+H4ZNta0a9JQXZdvYveCHvZywZtvUsem/VRD5fGMGxWrSvv+urtrbO9Y7RaiRCu+9UR jATnuEPDRACwThIhcmMvkFWjBLjScu1EJB1fKmHylYZq7bekqfUrHdzq7y0Kuw== 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=7e0eeca6bb238a8cc201b921c52a97fd856dd255 commit 7e0eeca6bb238a8cc201b921c52a97fd856dd255 Author: Jan Beich AuthorDate: 2022-08-17 23:43:51 +0000 Commit: Jan Beich CommitDate: 2022-08-18 00:29:59 +0000 x11-wm/gamescope: bundle libliftoff, preparing for update This reverts commit ef2d0a35dd40b8b59bf9f94b3887d26631b3465d. --- x11-wm/gamescope/Makefile | 6 +++--- x11-wm/gamescope/distinfo | 2 ++ x11-wm/gamescope/files/patch-private-libs | 26 ++++++++++++++++++++++++++ 3 files changed, 31 insertions(+), 3 deletions(-) diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index 9627b0cef72b..24b79d7eeb8d 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -15,13 +15,11 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= glslangValidator:graphics/glslang \ evdev-proto>0:devel/evdev-proto \ - libliftoff>=0.2.0<0.3.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 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 \ @@ -29,12 +27,14 @@ 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:378ccb4f84a2473fe73dbdc56fe35a0d2ee661cc:libliftoff/subprojects/libliftoff PLIST_FILES= bin/${PORTNAME} -MESON_ARGS= --force-fallback-for= # allow system wlroots + libliftoff +MESON_ARGS= --force-fallback-for=libliftoff # allow system wlroots OPTIONS_DEFINE= PIPEWIRE OPTIONS_DEFAULT=PIPEWIRE diff --git a/x11-wm/gamescope/distinfo b/x11-wm/gamescope/distinfo index 21147e921445..3d4543ad6a04 100644 --- a/x11-wm/gamescope/distinfo +++ b/x11-wm/gamescope/distinfo @@ -3,6 +3,8 @@ SHA256 (Plagman-gamescope-3.11.32_GH0.tar.gz) = e0a4ff5b8cc7aa1d1d8e7c9cd124a7f2 SIZE (Plagman-gamescope-3.11.32_GH0.tar.gz) = 187530 SHA256 (nothings-stb-af1a5bc_GH0.tar.gz) = 3facf6e6f8c3e1715e1a088f22bad9c9202973f9369fb3f088f46cced3f64058 SIZE (nothings-stb-af1a5bc_GH0.tar.gz) = 1387334 +SHA256 (emersion-libliftoff-378ccb4f84a2473fe73dbdc56fe35a0d2ee661cc_GL0.tar.gz) = 7f296842c84e536432c38d069518c705be04c4c44937bc19a28e887e84ee9103 +SIZE (emersion-libliftoff-378ccb4f84a2473fe73dbdc56fe35a0d2ee661cc_GL0.tar.gz) = 31371 SHA256 (2a84a44f6897.patch) = fd892d4477885926b0ef5793d5222764afa2ba334fd25c4cc671c89812e100b5 SIZE (2a84a44f6897.patch) = 2931 SHA256 (e0927f7bce95.patch) = 6bbab2f37d7e76a1eade6d81bc0b441cc09f0020143bafb53555b767bf056600 diff --git a/x11-wm/gamescope/files/patch-private-libs b/x11-wm/gamescope/files/patch-private-libs new file mode 100644 index 000000000000..a50ea41a00bf --- /dev/null +++ b/x11-wm/gamescope/files/patch-private-libs @@ -0,0 +1,26 @@ +libliftoff package is too old. 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