From nobody Thu Aug 18 09:43:47 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 4M7g1w1gfZz4Z1lt; Thu, 18 Aug 2022 09:43:48 +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 4M7g1w1G3zz3b72; Thu, 18 Aug 2022 09:43:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660815828; 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=fEMML64kvwhnKUCd9a8NEwvLFrtiwDIOhBjK3alOUw8=; b=bCL6XwuQ/FuzMHHwiMzd5JJVeCd18jf+1oE5NTGECn3+SWJN7MM2c3oaSyBIQ56Iqfz09o 4C6y0bAjIqWV2iB3Y+YXuA3cnytcblIq2XO2ywc3r9+YIkZV6aBSuqySxen3PGV3Zi//r0 u2qfdzFDpT6c9euhB0oznsPZsGGqcQ9R+SVmRzL93p81R6jPHNTFG6WNgOqJ99wAqkQuYL g6A6ag0YURODkyB1pnbb2WRhnZZhxhz7TvXMOHIDZaffrSEw/sBAtgaZ1r8WbHMilAaMob 9YEcSDCYnSIaswhLVDWjaUfklYIlC7vJH+sQDvSYGoDCXEj76e76phKtxSwDUQ== 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 4M7g1w0MPMz1P5F; Thu, 18 Aug 2022 09:43:48 +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 27I9hliN072330; Thu, 18 Aug 2022 09:43:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27I9hlxS072329; Thu, 18 Aug 2022 09:43:47 GMT (envelope-from git) Date: Thu, 18 Aug 2022 09:43:47 GMT Message-Id: <202208180943.27I9hlxS072329@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: bf4b73d37d7b - main - x11-wm/gamescope: unbundle libliftoff after 93054149a58a 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: bf4b73d37d7b09739e7275f94f1fb66ddb925a53 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1660815828; 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=fEMML64kvwhnKUCd9a8NEwvLFrtiwDIOhBjK3alOUw8=; b=VMYp4yPnVtisF3vj9BQ/PYkGC5UNNZvHKUO/APNWatFt889eJIGZD9EwhOjtbmHdzoVs2v AYAajHeGnneR4eDFTEiasMnn9Jj2UI4J+4JCcqRTGwQY7Wpf+zhQnT36Vxca2/YSoZpFl8 xIViQHYjAqhH4kJ0wYWCYkfeEDOiTfIzMVoETe7k5WI07RV1ubBM4MZXIwyi5BTjvMpqEc s9/6PZ8QKIvF/q1M/PwFwdQt0e96cM949cc2vFlbWEWASzfsO3ujGhYcUYENrFavoP3+gp hBTMeHfHxwxfsiYl5vd2YLabi6GXNN1kezNQgYtbKz8HyOkk0eYfRn1V+jKGmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1660815828; a=rsa-sha256; cv=none; b=PC6kQ96SktW7zXhcJHZEks5Uxw+qNNhZXYrouwDX8H4mA11kyWAk167tKi6iwKThaQz/sZ 6PeI41KDzZ+w7lM2yK1KizQjJpNVAMQUgAe3um6hIXg8uICCG6qEUZ9IbIE8Qtu7sQppOA pUoSRHkEHrXZw+iGUbBY7ttAN2/Si/IX0WPmkt72fWQN01rRESofKgn57aTkxmon8xXu1l TmT2g6UgcJP9zhJqXOlptYokQtgpF4PIfTqr+zGD0Q6gZOBBgV2JNctAvJJl/xOTcsdior r4/68mwDA/K3zA6R5BrEIPaxOs7CepBVG8ByjWmmsgvVE0c4l2L82vMqZ0ldtQ== 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=bf4b73d37d7b09739e7275f94f1fb66ddb925a53 commit bf4b73d37d7b09739e7275f94f1fb66ddb925a53 Author: Jan Beich AuthorDate: 2022-08-18 09:41:17 +0000 Commit: Jan Beich CommitDate: 2022-08-18 09:42:54 +0000 x11-wm/gamescope: unbundle libliftoff after 93054149a58a This reverts commit 7e0eeca6bb238a8cc201b921c52a97fd856dd255. --- x11-wm/gamescope/Makefile | 6 +++--- x11-wm/gamescope/distinfo | 2 -- x11-wm/gamescope/files/patch-private-libs | 26 -------------------------- 3 files changed, 3 insertions(+), 31 deletions(-) diff --git a/x11-wm/gamescope/Makefile b/x11-wm/gamescope/Makefile index 0afccff3a983..04f0eb0a6c8d 100644 --- a/x11-wm/gamescope/Makefile +++ b/x11-wm/gamescope/Makefile @@ -15,11 +15,13 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= glslangValidator:graphics/glslang \ evdev-proto>0:devel/evdev-proto \ + 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 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 +29,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:9c84f7945aab0d88365f4c878f9de8a68deca3ea: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 bbb438a18841..8d8b020be368 100644 --- a/x11-wm/gamescope/distinfo +++ b/x11-wm/gamescope/distinfo @@ -3,8 +3,6 @@ SHA256 (Plagman-gamescope-3.11.36_GH0.tar.gz) = 39ea32510c6b7d982a9431e71a66e02a SIZE (Plagman-gamescope-3.11.36_GH0.tar.gz) = 192928 SHA256 (nothings-stb-af1a5bc_GH0.tar.gz) = 3facf6e6f8c3e1715e1a088f22bad9c9202973f9369fb3f088f46cced3f64058 SIZE (nothings-stb-af1a5bc_GH0.tar.gz) = 1387334 -SHA256 (emersion-libliftoff-9c84f7945aab0d88365f4c878f9de8a68deca3ea_GL0.tar.gz) = a189ea791b1557e71274e671897bc253bdd3c8dbf460042b659d656444a8420b -SIZE (emersion-libliftoff-9c84f7945aab0d88365f4c878f9de8a68deca3ea_GL0.tar.gz) = 31697 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 a50ea41a00bf..000000000000 --- a/x11-wm/gamescope/files/patch-private-libs +++ /dev/null @@ -1,26 +0,0 @@ -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