From nobody Sat Nov 19 17:46:54 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 4NF1LQ5k8Pz4hSVC; Sat, 19 Nov 2022 17:46:54 +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 4NF1LQ5JR2z44V4; Sat, 19 Nov 2022 17:46:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668880014; 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=mCA3mfw00PFzOiTGLj0vDJ76C+yBa+GLMRWkSPvNdPE=; b=qCBavMW7+cP0F8Jdgtyt74dsgaLPBUTywSQgD1JHYcCVIz/Bzir9Trc01AHYrPTsixr6X8 V8MRK9H1ZbIv/QXEVgjpuIBeLr7Wag+TrkD6hvQVpRA2LRqfEqST116QL3N18xA45lOj1q +k/uKsHyDsK3qrQzsk7FS79Hg4rrPW0Fo0bSsJ12/rpDyqfJsOd9U5C5oZBzd2v3d9WRQo DxH4gGANcbXQmdPcha4wqnTFcBm67MOQ5voxElv7lDqRv8QQ3W8qKlh3Y3zRNyNsG1imSn Rh5JT8ckNnpj4vH+ZtTb/0cUBijFZTdhOElJkxMMzhoQxSfIpStJzOxJs6Cj5w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1668880014; 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=mCA3mfw00PFzOiTGLj0vDJ76C+yBa+GLMRWkSPvNdPE=; b=gjI4j2rcGuM452/UWKIDy6lEvLKL2R1R6FVNOyZoabtTmTg6f58Eggz2HhbsAWZJhK/2Jf HHI4ehowZpJDDUOChl2wf1fK05v/jsQEQKoBalx99DbNMnDHad9+UupgUnVEi4B/Anq51o a7o+aslaM1LsdE0yDlwhGMjNpaDfAfVshci9V2PWQZT0uAIBya3yUC1Pj+7ZAAE54ZvcBv 82dxtS2HbdUWaEC86ZXJZIg3BnXxcBDobI6MXNuDlXp00aEZJAM8zpLjPA5yA5V3kdMGe2 MAfKgDz5yK/OFvsWdBR65hj2zskJDl2qlbS+RBFuUCGGBGYWZAUbvuGQBLb06A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1668880014; a=rsa-sha256; cv=none; b=Pol7++4pUySRXO7SIeL3AFTRcb405S3crZVO0Xnge7f13OjFnpcdj1tdXal1EM5aDzMa9B SkSnPuAvm3TpT3P15HgpY80FrMRKylqMtnifaUOBBUCX51aQbTvv65sSnVYnJadIpqGobm 5KgQevuXlPj5Y8MhgZbZvv8+migM4Xc72hXFD6eC+xzG5ycguH2PpnameOe2X9vyB6l5+6 Pyy6VjLGZoHvprzXpA12ORXapsNC2vWtMiQIK+PapIjY+setFQdy6kkr3wChBvsSpnkX3Q mhDH7VzfJZNu8stLAHA2TWhXNMwwMs1H3/1qhF8LbtXi7gt0QRdrMoHExm37nw== 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 4NF1LQ4Mtjzv35; Sat, 19 Nov 2022 17:46:54 +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 2AJHksn3024515; Sat, 19 Nov 2022 17:46:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AJHkstp024514; Sat, 19 Nov 2022 17:46:54 GMT (envelope-from git) Date: Sat, 19 Nov 2022 17:46:54 GMT Message-Id: <202211191746.2AJHkstp024514@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: 855b2e50340e - main - x11-wm/phoc: move bundled wlroots to -phosh flavor 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: 855b2e50340ebc30d6daec438d7368e3fc91f7cb Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=855b2e50340ebc30d6daec438d7368e3fc91f7cb commit 855b2e50340ebc30d6daec438d7368e3fc91f7cb Author: Jan Beich AuthorDate: 2022-11-19 17:09:07 +0000 Commit: Jan Beich CommitDate: 2022-11-19 17:45:04 +0000 x11-wm/phoc: move bundled wlroots to -phosh flavor Partially revert 4ea852fab0aa after 79c3c0814886. Other consumers may not need Phosh-specific changes from PureOS, and system wlroots helps debugging bundled version. --- x11-wm/phoc/Makefile | 13 +++++++++++++ .../{patch-private-wlroots => extra-patch-private-wlroots} | 0 2 files changed, 13 insertions(+) diff --git a/x11-wm/phoc/Makefile b/x11-wm/phoc/Makefile index 05ca77d8ee49..083dbae31388 100644 --- a/x11-wm/phoc/Makefile +++ b/x11-wm/phoc/Makefile @@ -19,6 +19,8 @@ LIB_DEPENDS= libwayland-server.so:graphics/wayland \ libxkbcommon.so:x11/libxkbcommon RUN_DEPENDS= ${LOCALBASE}/share/glib-2.0/schemas/org.gnome.mutter.gschema.xml:x11-wm/mutter +FLAVORS= default phosh + USES= compiler:c11 gl gnome meson pkgconfig python:build shebangfix xorg USE_GITLAB= yes USE_GL= glesv2 @@ -32,5 +34,16 @@ CFLAGS+= -Wno-error=format-nonliteral # clang PLIST_FILES= bin/${PORTNAME} GLIB_SCHEMAS= sm.puri.phoc.gschema.xml +.if ${FLAVOR:U} == phosh +PKGNAMESUFFIX= -${FLAVOR} +COMMENT+= (with patched wlroots from PureOS) +EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-private-wlroots +CONFLICTS_INSTALL= ${PORTNAME} .include "${.CURDIR}/Makefile.wlroots" +.else +COMMENT+= (with system wlroots) +CONFLICTS_INSTALL= ${PORTNAME}-phosh +.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk" +.endif + .include diff --git a/x11-wm/phoc/files/patch-private-wlroots b/x11-wm/phoc/files/extra-patch-private-wlroots similarity index 100% rename from x11-wm/phoc/files/patch-private-wlroots rename to x11-wm/phoc/files/extra-patch-private-wlroots