From nobody Fri Mar 1 05:52:23 2024 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 4TmHKz4lJfz5BwgF; Fri, 1 Mar 2024 05:52:23 +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 4TmHKz47BBz4d4l; Fri, 1 Mar 2024 05:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709272343; 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=cGOir/UbvzP5t6BfVqTy50Tgtepz0+ydqisnJcAisVM=; b=topoRrBGirFxgECDMq2Fxnj8452uRVYsJWtNvq2dFGyU3egUZbwC8ys99JTpWZb+EhLXBZ uj3zc8w6X/qzFxUQP/6BCFkppIRshIH9W9N10IDgILbctW4D8IHq3kMuTU0EzhSR56drB1 3y/AeyD5CpkCaB8tfhOKiSgnHMr+rUXdZAxMhhq8hh9mSv3LsGOoWI6tWx+8ne1ReHvHe/ KLP0HgHorsagZ7pA5XM+Y8GZMLcviABqondVKTxyhm3JGAMaawgCleKdXV2vW2qTVLKHuV +4pv4PgMsXVJ00YEOFL8W0aMMsPArzfYX8Tltto9nFcg/n7XUEgnGK87axikSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1709272343; a=rsa-sha256; cv=none; b=epWhybnZxohmJ17UTdXFTP+Ju0cWEjY03TjWLVdZWI9OuExJr2wUbtT1qPpZZiqZctmVlT A5v+lozixcBPpKphBRrosvIzrZbbQQRbGvvR7Pwm1sEQZ+rwAu1xpgcrCY+xybQILwe9/e Er4PbSYMDIoh22uedbFI1VS/IJP7nlzynWz2A9OIb7YA7VMGLVpcwpUjBRxBiQ77xZ15K0 Bdz3pVQyIne3AAKzuFpb6vqi/jcKBqEqya8UQP1XwPSVbGzlleeqI8VH80P1PDMD323s8e qJanz3LxU5Q78jBncSzndjnREQ2XEe/Ira3pwdCSNAO7a4KQfPV+CfbwwAL5eQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1709272343; 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=cGOir/UbvzP5t6BfVqTy50Tgtepz0+ydqisnJcAisVM=; b=tHmpF6rMZZgbK890HsE/zUWPkgTacSmRpweG6PPHT1iBsJRTum9UZADGzdBPek+gf0CCvM VYDZ6wfCr1ZghqBFmnc+jfalkH0MU+W9NZ2wQ9u27zUdyD0PCOe5PmExIZmCutHIEOqo+7 pMd3IB5kB1l4sHzcDRoOAN+7NRjeJpdqEkoQW17qICNesXcb7262FvyibD7ExreHmTR0PF M+h0zheSAAFAat0RuSUbpv9LC0oxK52OQ7r228pPqFqnfAAVyihv6S2NThj4B77hmSpXMM cvkGTGVvnJMklZbh9xWJfZlKL1WWyr13So0znicEfgWdU5pF0YWHBIEzzkmLeg== 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 4TmHKz3l7xzDf8; Fri, 1 Mar 2024 05:52:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 4215qNmI094934; Fri, 1 Mar 2024 05:52:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4215qNdf094931; Fri, 1 Mar 2024 05:52:23 GMT (envelope-from git) Date: Fri, 1 Mar 2024 05:52:23 GMT Message-Id: <202403010552.4215qNdf094931@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: 66405adbabf6 - main - x11-wm/swayfx: flatten to detach from master port 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: 66405adbabf68d0385fd72dd888506aee42b8658 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=66405adbabf68d0385fd72dd888506aee42b8658 commit 66405adbabf68d0385fd72dd888506aee42b8658 Author: Jan Beich AuthorDate: 2024-02-29 17:10:10 +0000 Commit: Jan Beich CommitDate: 2024-03-01 05:49:27 +0000 x11-wm/swayfx: flatten to detach from master port --- x11-wm/sway-devel/Makefile | 12 ++++----- x11-wm/sway/Makefile | 16 ++++++------ x11-wm/swayfx/Makefile | 62 ++++++++++++++++++++++++++++++++++++++++++---- x11-wm/swayfx/pkg-plist | 32 ++++++++++++++++++++++++ 4 files changed, 102 insertions(+), 20 deletions(-) diff --git a/x11-wm/sway-devel/Makefile b/x11-wm/sway-devel/Makefile index 6afc159f379f..475f01f915b1 100644 --- a/x11-wm/sway-devel/Makefile +++ b/x11-wm/sway-devel/Makefile @@ -1,15 +1,15 @@ PORTNAME= sway -DISTVERSION?= 1.9 # git rev-list --count 1.9.. +DISTVERSION= 1.9 # git rev-list --count 1.9.. CATEGORIES= x11-wm wayland -PKGNAMESUFFIX?= -devel +PKGNAMESUFFIX= -devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090 PATCHFILES+= 1f1c83e83a1a.patch:-p1 # https://github.com/swaywm/sway/pull/5090 MAINTAINER= jbeich@FreeBSD.org -COMMENT?= i3-compatible Wayland compositor (development snapshot) -WWW?= https://swaywm.org/ +COMMENT= i3-compatible Wayland compositor (development snapshot) +WWW= https://swaywm.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE @@ -29,10 +29,10 @@ USES= compiler:c11 gnome meson pkgconfig xorg USE_GITHUB= yes USE_GNOME= cairo pango USE_XORG= pixman -GH_ACCOUNT?= swaywm +GH_ACCOUNT= swaywm MESON_ARGS= -Dsd-bus-provider=basu -CONFLICTS_INSTALL?= ${PORTNAME} ${PORTNAME}fx +CONFLICTS_INSTALL= ${PORTNAME} ${PORTNAME}fx OPTIONS_DEFINE= BASU MANPAGES PIXBUF SWAYBG X11 OPTIONS_DEFAULT=BASU MANPAGES PIXBUF SWAYBG X11 diff --git a/x11-wm/sway/Makefile b/x11-wm/sway/Makefile index 26a870c608ff..e22477c2ed09 100644 --- a/x11-wm/sway/Makefile +++ b/x11-wm/sway/Makefile @@ -1,18 +1,16 @@ PORTNAME= sway -DISTVERSION?= 1.8.1 -PORTREVISION?= 3 +DISTVERSION= 1.8.1 +PORTREVISION= 3 CATEGORIES= x11-wm wayland PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090 PATCHFILES+= f98ca3ab7ca1.patch:-p1 # https://github.com/swaywm/sway/pull/5090 -.ifndef PKGNAMESUFFIX PATCHFILES+= dee032d0a0ec.patch:-p1 # https://github.com/swaywm/sway/pull/7525 -.endif MAINTAINER= jbeich@FreeBSD.org -COMMENT?= i3-compatible Wayland compositor -WWW?= https://swaywm.org/ +COMMENT= i3-compatible Wayland compositor +WWW= https://swaywm.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE @@ -30,13 +28,13 @@ LIB_DEPENDS= libjson-c.so:devel/json-c \ USES= compiler:c11 gl gnome meson pkgconfig xorg USE_GITHUB= yes -USE_GL+= glesv2 +USE_GL= glesv2 USE_GNOME= cairo pango USE_XORG= pixman -GH_ACCOUNT?= swaywm +GH_ACCOUNT= swaywm MESON_ARGS= -Dsd-bus-provider=basu -CONFLICTS_INSTALL?= ${PORTNAME}-devel ${PORTNAME}fx +CONFLICTS_INSTALL= ${PORTNAME}-devel ${PORTNAME}fx OPTIONS_DEFINE= BASU MANPAGES PIXBUF SWAYBG X11 OPTIONS_DEFAULT=BASU MANPAGES PIXBUF SWAYBG X11 diff --git a/x11-wm/swayfx/Makefile b/x11-wm/swayfx/Makefile index ad5556bc24cd..0dc9ab9228bb 100644 --- a/x11-wm/swayfx/Makefile +++ b/x11-wm/swayfx/Makefile @@ -1,20 +1,72 @@ +PORTNAME= sway DISTVERSION= 0.3.2 PORTREVISION= 1 +CATEGORIES= x11-wm wayland PKGNAMESUFFIX= ${GH_PROJECT:S/${PORTNAME}//} +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= cd9d1038a822.patch:-p1 # https://github.com/swaywm/sway/pull/5090 +PATCHFILES+= f98ca3ab7ca1.patch:-p1 # https://github.com/swaywm/sway/pull/5090 PATCHFILES+= c47aa61c6492.patch:-p1 # https://github.com/WillPower3309/swayfx/pull/209 +MAINTAINER= jbeich@FreeBSD.org COMMENT= Sway, but with eye candy! WWW= https://github.com/WillPower3309/swayfx -MASTERDIR= ${.CURDIR}/../sway -DESCR= ${.CURDIR}/pkg-descr -DISTINFO_FILE= ${.CURDIR}/distinfo +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE +BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ + wayland-protocols>=1.24:graphics/wayland-protocols +LIB_DEPENDS= libjson-c.so:devel/json-c \ + libevdev.so:devel/libevdev \ + libudev.so:devel/libudev-devd \ + libpcre2-8.so:devel/pcre2 \ + libwayland-egl.so:graphics/wayland \ + libwlroots.so:x11-toolkits/wlroots \ + libinput.so:x11/libinput \ + libxkbcommon.so:x11/libxkbcommon + +USES= compiler:c11 gl gnome meson pkgconfig xorg +USE_GITHUB= yes +USE_GL+= egl glesv2 +USE_GNOME= cairo pango +USE_XORG= pixman GH_ACCOUNT= WillPower3309 GH_PROJECT= swayfx -USE_GL= egl +MESON_ARGS= -Dsd-bus-provider=basu CONFLICTS_INSTALL= ${PORTNAME} ${PORTNAME}-devel -.include "${MASTERDIR}/Makefile" +OPTIONS_DEFINE= BASU MANPAGES PIXBUF SWAYBG X11 +OPTIONS_DEFAULT=BASU MANPAGES PIXBUF SWAYBG X11 +OPTIONS_SUB= yes + +BASU_DESC= Tray in swaybar via basu +BASU_LIB_DEPENDS= libbasu.so:devel/basu +BASU_MESON_ENABLED= tray + +MANPAGES_BUILD_DEPENDS= scdoc>=1.9.2:textproc/scdoc +MANPAGES_MESON_ENABLED= man-pages + +PIXBUF_USE= GNOME=gdkpixbuf2 +PIXBUF_MESON_ENABLED= gdk-pixbuf + +SWAYBG_DESC= Default command to set background +SWAYBG_RUN_DEPENDS= swaybg:x11/swaybg + +X11_USE= XORG=xcb +X11_LIB_DEPENDS= libxcb-icccm.so:x11/xcb-util-wm +X11_MESON_ENABLED= xwayland + +post-patch: +# Let @sample handle default files under etc/ + @${REINPLACE_CMD} -e '/config\.in/{ N; s/@BASENAME@/&.sample/; }' \ + ${WRKSRC}/meson.build +# Extract (snapshot) version from the port instead of meson.build + @${REINPLACE_CMD} -i .nogit -e 's/git.found()/false/' \ + -e '/project_version/s/@0@/${DISTVERSIONFULL}/' \ + ${WRKSRC}/meson.build + +.include "${.CURDIR:H:H}/x11-toolkits/wlroots016/override.mk" +.include diff --git a/x11-wm/swayfx/pkg-plist b/x11-wm/swayfx/pkg-plist new file mode 100644 index 000000000000..eef9c0cea933 --- /dev/null +++ b/x11-wm/swayfx/pkg-plist @@ -0,0 +1,32 @@ +bin/sway +bin/swaybar +bin/swaymsg +bin/swaynag +@sample %%ETCDIR%%/config.sample +%%MANPAGES%%share/man/man1/sway.1.gz +%%MANPAGES%%share/man/man1/swaymsg.1.gz +%%MANPAGES%%share/man/man1/swaynag.1.gz +%%MANPAGES%%share/man/man5/sway-bar.5.gz +%%MANPAGES%%share/man/man5/sway-input.5.gz +%%MANPAGES%%share/man/man5/sway-output.5.gz +%%MANPAGES%%share/man/man5/sway.5.gz +%%MANPAGES%%share/man/man5/swaynag.5.gz +%%MANPAGES%%share/man/man7/sway-ipc.7.gz +%%MANPAGES%%share/man/man7/swaybar-protocol.7.gz +share/backgrounds/sway/Sway_Wallpaper_Blue_1136x640.png +share/backgrounds/sway/Sway_Wallpaper_Blue_1136x640_Portrait.png +share/backgrounds/sway/Sway_Wallpaper_Blue_1366x768.png +share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png +share/backgrounds/sway/Sway_Wallpaper_Blue_2048x1536.png +share/backgrounds/sway/Sway_Wallpaper_Blue_2048x1536_Portrait.png +share/backgrounds/sway/Sway_Wallpaper_Blue_768x1024.png +share/backgrounds/sway/Sway_Wallpaper_Blue_768x1024_Portrait.png +share/bash-completion/completions/sway +share/bash-completion/completions/swaybar +share/bash-completion/completions/swaymsg +share/fish/vendor_completions.d/sway.fish +share/fish/vendor_completions.d/swaymsg.fish +share/fish/vendor_completions.d/swaynag.fish +share/wayland-sessions/sway.desktop +share/zsh/site-functions/_sway +share/zsh/site-functions/_swaymsg