Skip to content

Commit

Permalink
x11-wm/swayfx: flatten to detach from master port
Browse files Browse the repository at this point in the history
  • Loading branch information
jbeich committed Mar 1, 2024
1 parent b61fb6f commit 66405ad
Show file tree
Hide file tree
Showing 4 changed files with 102 additions and 20 deletions.
12 changes: 6 additions & 6 deletions 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
Expand All @@ -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
Expand Down
16 changes: 7 additions & 9 deletions 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
Expand All @@ -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
Expand Down
62 changes: 57 additions & 5 deletions 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 <bsd.port.mk>
32 changes: 32 additions & 0 deletions 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

0 comments on commit 66405ad

Please sign in to comment.