From nobody Fri Feb 11 12:12:58 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 591B019C29BB; Fri, 11 Feb 2022 12:12:59 +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 4JwCDp57f1z4kRf; Fri, 11 Feb 2022 12:12:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644581578; 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=KZBmlIYaVxWEHF8Kfzr3YdEZYVIlhxou5z81h6GlRoU=; b=iFlMwEXYc21lTsfoOXnYWbVXRG/yl+b68Zec+y63UKuLaQyDXWYuWZUANP1AbeiN5OBfV7 qs/1A3dQtjbLYFVTIWSm/UD+gcXAtaZxanpmYVFjPxYDRcbhmE4fcSzFyLUMBhe3LJNf2B xV/6BHeHEskZX41dH77u77Lje6zssSrckXsyjbOBy0cc+pS8brmhU6R75e5RTeAw4I1smk D1He/6lZX2H4iX5W4kAAk+Nka/Aod5w+d4mLTI4/aDZSDzC2auS+gs9C/qwgqIQgrmUtez jqc6TU1cLW5q7vDk/BQmOrOOFh+q4/0iHiSGXoSHpRrnGtzTzEUq3gfh7RODFg== 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 47E0614037; Fri, 11 Feb 2022 12:12:58 +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 21BCCwsq059031; Fri, 11 Feb 2022 12:12:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21BCCwnj059030; Fri, 11 Feb 2022 12:12:58 GMT (envelope-from git) Date: Fri, 11 Feb 2022 12:12:58 GMT Message-Id: <202202111212.21BCCwnj059030@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: ef2d0a35dd40 - main - 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/main X-Git-Reftype: branch X-Git-Commit: ef2d0a35dd40b8b59bf9f94b3887d26631b3465d Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644581578; 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=KZBmlIYaVxWEHF8Kfzr3YdEZYVIlhxou5z81h6GlRoU=; b=H6vZ+WrJKxhGpk1uMiNDXNYtn52RQLJpnFZkhJTrHT3pV1GiG9p0Cj2GwqjCBLCCLGyQ5v +lIrCgexE/ECVOl84nhq2uezdefxCbzuiRqlO6w+B6uQIyEgm+q1dgodnfPI3/eGQ8eJmm wHOkndJtvmlrxn/Zjaug1Onoox0w++9a7GzGEKIyhW1jne74TqxI0C6SCp+NczRhqix/XT D0ysyWWTKu33SJMReXhupfTyjbc/P0iJiuBdEN3NKXrWP6Tu6MgWg1a7t64S0Y4rmnr8za oT+6j/J3ruIjf4U5aQbX2wJnPh2oweI3QRyDoDquDnGesEL/PP2q6jZMW4FL6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644581578; a=rsa-sha256; cv=none; b=FU91CPvhmt6HfPhxtMOGMXNXeYeBnCuW/Yl0p4zSvRSligB7jsl7Nk3ywD2mMYo508SKNM DG1DC4Od7zPTw5ivmKwMo2IiPJJGBtt+AH6g4RjsNRem1dONKledINxCdUCmrOKx8j8FHE 1CtNM0doDv6H/CUlN962m8106FYmGdNqac4FMEZzayee9JTSw1rqXHImUj2UPV7gl8034g Fff+37cts9fQ32/Uao3+6hoPkCOJsv7C/EdFjMvP+cpaFgrnAN/0fjIxTx6FpesdITbqSz yneExqQh4snSUQQ2uPzLI190eMhi9CJuYPN8f9Iuqbhxb+ZrqCnv6WvuBKLVkg== 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=ef2d0a35dd40b8b59bf9f94b3887d26631b3465d commit ef2d0a35dd40b8b59bf9f94b3887d26631b3465d Author: Jan Beich AuthorDate: 2022-02-11 12:09:55 +0000 Commit: Jan Beich CommitDate: 2022-02-11 12:12:27 +0000 x11-wm/gamescope: unbundle libliftoff after 929a40f5e1c9 This reverts commit 8947b5348e896ba308935f13823954443ca3655c. --- x11-wm/gamescope/Makefile | 5 ++--- x11-wm/gamescope/distinfo | 2 -- x11-wm/gamescope/files/patch-private-libs | 27 --------------------------- 3 files changed, 2 insertions(+), 32 deletions(-) diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index 501d1f6364e0..ad93b7e39eeb 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -20,6 +20,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 \ @@ -27,14 +28,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:378ccb4f84a2473fe73dbdc56fe35a0d2ee661cc: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 08648a55d336..43421b132073 100644 --- a/x11-wm/gamescope/distinfo +++ b/x11-wm/gamescope/distinfo @@ -3,8 +3,6 @@ SHA256 (Plagman-gamescope-3.11.10_GH0.tar.gz) = c353cb9dd310ea74be25ec96104ff1bb SIZE (Plagman-gamescope-3.11.10_GH0.tar.gz) = 153805 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 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