summaryrefslogtreecommitdiff
path: root/x11-wm/wayfire
diff options
context:
space:
mode:
Diffstat (limited to 'x11-wm/wayfire')
-rw-r--r--x11-wm/wayfire/Makefile30
-rw-r--r--x11-wm/wayfire/distinfo14
-rw-r--r--x11-wm/wayfire/files/patch-wlroots01732
-rw-r--r--x11-wm/wayfire/pkg-plist34
4 files changed, 51 insertions, 59 deletions
diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile
index c8af247557e0..0742aca84f0b 100644
--- a/x11-wm/wayfire/Makefile
+++ b/x11-wm/wayfire/Makefile
@@ -1,10 +1,9 @@
PORTNAME= wayfire
DISTVERSIONPREFIX= v
-DISTVERSION= 0.9.0
-PORTREVISION= 2
+DISTVERSION= 0.10.0
CATEGORIES= x11-wm wayland
-MAINTAINER= jbeich@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= 3D Wayland compositor
WWW= https://wayfire.org/
@@ -12,20 +11,20 @@ LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/LICENSE
BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
- nlohmann-json>0:devel/nlohmann-json \
- wf-config>=0.9.0<0.10.0:devel/wf-config \
+ wf-config>=0.10.0<0.11.0:devel/wf-config \
${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \
wayland-protocols>=1.12:graphics/wayland-protocols \
glm>=0.9.8:math/glm
LIB_DEPENDS= libevdev.so:devel/libevdev \
libinotify.so:devel/libinotify \
+ libudev.so:devel/libudev-devd \
libwf-config.so:devel/wf-config \
+ libyyjson.so:devel/yyjson \
libpng.so:graphics/png \
libwayland-server.so:graphics/wayland \
- libwlroots-0.17.so:x11-toolkits/wlroots017 \
+ libwlroots-0.19.so:x11-toolkits/wlroots019 \
libinput.so:x11/libinput \
libxkbcommon.so:x11/libxkbcommon
-RUN_DEPENDS= nlohmann-json>0:devel/nlohmann-json
TEST_DEPENDS= doctest>0:devel/doctest
USES= cmake:indirect compiler:c++17-lang gl gnome jpeg meson pkgconfig xorg
@@ -34,13 +33,15 @@ USE_GL= egl glesv2
USE_GNOME= cairo pango
USE_XORG= pixman
GH_ACCOUNT= WayfireWM
-GH_TUPLE= WayfireWM:wf-touch:b8b844f:wftouch/subprojects/wf-touch \
- WayfireWM:wf-utils:08553c4:wfutils/subprojects/wf-utils
+GH_TUPLE= WayfireWM:wf-touch:093d894:wftouch/subprojects/wf-touch \
+ WayfireWM:wf-utils:3ef27d1:wfutils/subprojects/wf-utils
MESON_ARGS= -Dtests=disabled \
-Dwf-touch:tests=disabled \
- -Dwf-utils:default_library=static \
${NULL}
+# XXX https://github.com/WayfireWM/wayfire/issues/2800
+USES+= localbase
+
.if !exists(/usr/include/omp.h)
# LLVM openmp in base doesn't support powerpc, armv6, armv7 yet
MESON_ARGS+= -Denable_openmp=false
@@ -58,12 +59,6 @@ post-patch:
-e '/project_version/s/@0@/${DISTVERSIONFULL}/' \
${WRKSRC}/meson.build
-.ifdef GH_TUPLE
-post-configure:
- @${REINPLACE_CMD} 's/meson install/& \
- --skip-subprojects/' ${BUILD_WRKSRC}/build.ninja
-.endif
-
post-install:
${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${EXAMPLESDIR}
@@ -71,7 +66,8 @@ post-install:
pre-test:
@if [ ! -e ${WRKDIR}/.meson_build_tests ]; then \
${RM} ${CONFIGURE_COOKIE} ${BUILD_COOKIE}; \
- ${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure -Dtests=enabled"; \
+ ${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure \
+ ${MESON_ARGS:M*tests*:S/=dis/=en/}"; \
${TOUCH} ${WRKDIR}/.meson_build_tests; \
fi
diff --git a/x11-wm/wayfire/distinfo b/x11-wm/wayfire/distinfo
index 8e706d071d10..779fe7e32d9d 100644
--- a/x11-wm/wayfire/distinfo
+++ b/x11-wm/wayfire/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1724497494
-SHA256 (WayfireWM-wayfire-v0.9.0_GH0.tar.gz) = 233fa0cf1c967a48d40a075ea7e34132e80ad30c2aef5e306c4466be1e585acb
-SIZE (WayfireWM-wayfire-v0.9.0_GH0.tar.gz) = 477667
-SHA256 (WayfireWM-wf-touch-b8b844f_GH0.tar.gz) = d4c1ba47e3f1561a4de2fc3166a46e9a3849526b62efab27b160a4a2804fb6b8
-SIZE (WayfireWM-wf-touch-b8b844f_GH0.tar.gz) = 9976
-SHA256 (WayfireWM-wf-utils-08553c4_GH0.tar.gz) = 0d5f9293fa0012b095c8e902884ca56f828928cf14a578ceac712f73e85b40d5
-SIZE (WayfireWM-wf-utils-08553c4_GH0.tar.gz) = 48507
+TIMESTAMP = 1756267943
+SHA256 (WayfireWM-wayfire-v0.10.0_GH0.tar.gz) = f4b3997ae0cc764d38226038d05291f44b02988782f27852c26b04387b9da440
+SIZE (WayfireWM-wayfire-v0.10.0_GH0.tar.gz) = 507994
+SHA256 (WayfireWM-wf-touch-093d894_GH0.tar.gz) = 7fa685012ed73363d507f093838b7d64264b6038bbdc5baab571171f5120d257
+SIZE (WayfireWM-wf-touch-093d894_GH0.tar.gz) = 10577
+SHA256 (WayfireWM-wf-utils-3ef27d1_GH0.tar.gz) = fcea63b4e4fd026fede0fc0fbeb4858c3d2df0eb9da400d26a322b2ff10a2d68
+SIZE (WayfireWM-wf-utils-3ef27d1_GH0.tar.gz) = 48507
diff --git a/x11-wm/wayfire/files/patch-wlroots017 b/x11-wm/wayfire/files/patch-wlroots017
deleted file mode 100644
index 28311aebc9a3..000000000000
--- a/x11-wm/wayfire/files/patch-wlroots017
+++ /dev/null
@@ -1,32 +0,0 @@
-Run-time dependency wlroots found: NO (tried pkgconfig and cmake)
-Looking for a fallback subproject for the dependency wlroots
-
-meson.build:45:11: ERROR: Subproject exists but has no meson.build file.
-
---- meson.build.orig 2024-08-24 11:04:54 UTC
-+++ meson.build
-@@ -42,11 +42,11 @@ elif get_option('use_system_wlroots').enabled()
-
- elif get_option('use_system_wlroots').enabled()
- use_system_wlroots = true
-- wlroots = dependency('wlroots', version: ['>=0.17.0', '<0.18.0'], required: true)
-+ wlroots = dependency('wlroots-0.17', version: ['>=0.17.0', '<0.18.0'], required: true)
-
- elif get_option('use_system_wlroots').auto()
- message( 'SEARCHING FOR WLROOTS' )
-- wlroots = dependency('wlroots', version: ['>=0.17.0', '<0.18.0'], required: false)
-+ wlroots = dependency('wlroots-0.17', version: ['>=0.17.0', '<0.18.0'], required: false)
- use_system_wlroots = true
- if not wlroots.found()
- use_system_wlroots = false
---- src/meson.build.orig 2024-08-24 11:04:54 UTC
-+++ src/meson.build
-@@ -147,7 +147,7 @@ public_api_requirements = [
- wayland_server,
- pixman,
- # These might be subprojects so we need to pass them as strings
-- 'wlroots',
-+ 'wlroots-0.17',
- 'wf-config',
- ]
-
diff --git a/x11-wm/wayfire/pkg-plist b/x11-wm/wayfire/pkg-plist
index 8775999874d7..c741060a3665 100644
--- a/x11-wm/wayfire/pkg-plist
+++ b/x11-wm/wayfire/pkg-plist
@@ -1,7 +1,13 @@
bin/wayfire
+include/wayfire/action/action.hpp
+include/wayfire/action/action_interface.hpp
include/wayfire/bindings-repository.hpp
include/wayfire/bindings.hpp
include/wayfire/compositor-view.hpp
+include/wayfire/condition/access_interface.hpp
+include/wayfire/condition/condition.hpp
+include/wayfire/condition/logic_condition.hpp
+include/wayfire/condition/test_condition.hpp
include/wayfire/config-backend.hpp
include/wayfire/config.h
include/wayfire/core.hpp
@@ -11,10 +17,13 @@ include/wayfire/geometry.hpp
include/wayfire/idle.hpp
include/wayfire/img.hpp
include/wayfire/input-device.hpp
+include/wayfire/lexer/lexer.hpp
+include/wayfire/lexer/literal.hpp
+include/wayfire/lexer/symbol.hpp
include/wayfire/matcher.hpp
+include/wayfire/nonstd/json.hpp
include/wayfire/nonstd/observer_ptr.h
include/wayfire/nonstd/reverse.hpp
-include/wayfire/nonstd/safe-list.hpp
include/wayfire/nonstd/tracking-allocator.hpp
include/wayfire/nonstd/wlroots-full.hpp
include/wayfire/nonstd/wlroots.hpp
@@ -23,8 +32,13 @@ include/wayfire/opengl.hpp
include/wayfire/option-wrapper.hpp
include/wayfire/output-layout.hpp
include/wayfire/output.hpp
+include/wayfire/parser/action_parser.hpp
+include/wayfire/parser/condition_parser.hpp
+include/wayfire/parser/lambda_rule_parser.hpp
+include/wayfire/parser/rule_parser.hpp
include/wayfire/per-output-plugin.hpp
include/wayfire/plugin.hpp
+include/wayfire/plugins/animate/animate.hpp
include/wayfire/plugins/blur/blur.hpp
include/wayfire/plugins/common/cairo-util.hpp
include/wayfire/plugins/common/geometry-animation.hpp
@@ -34,7 +48,6 @@ include/wayfire/plugins/common/move-drag-interface.hpp
include/wayfire/plugins/common/preview-indication.hpp
include/wayfire/plugins/common/shared-core-data.hpp
include/wayfire/plugins/common/simple-text-node.hpp
-include/wayfire/plugins/common/simple-texture.hpp
include/wayfire/plugins/common/util.hpp
include/wayfire/plugins/common/workspace-wall.hpp
include/wayfire/plugins/crossfade.hpp
@@ -43,12 +56,16 @@ include/wayfire/plugins/input-method-v1/input-method-v1.hpp
include/wayfire/plugins/ipc/ipc-activator.hpp
include/wayfire/plugins/ipc/ipc-helpers.hpp
include/wayfire/plugins/ipc/ipc-method-repository.hpp
+include/wayfire/plugins/ipc/ipc-rules-common.hpp
include/wayfire/plugins/scale-signal.hpp
include/wayfire/plugins/vswitch.hpp
include/wayfire/plugins/wm-actions-signals.hpp
include/wayfire/plugins/wobbly/wobbly-signal.hpp
include/wayfire/region.hpp
include/wayfire/render-manager.hpp
+include/wayfire/render.hpp
+include/wayfire/rule/lambda_rule.hpp
+include/wayfire/rule/rule.hpp
include/wayfire/scene-input.hpp
include/wayfire/scene-operations.hpp
include/wayfire/scene-render.hpp
@@ -58,6 +75,7 @@ include/wayfire/signal-definitions.hpp
include/wayfire/signal-provider.hpp
include/wayfire/toplevel-view.hpp
include/wayfire/toplevel.hpp
+include/wayfire/touch/touch.hpp
include/wayfire/txn/transaction-manager.hpp
include/wayfire/txn/transaction-object.hpp
include/wayfire/txn/transaction.hpp
@@ -71,6 +89,8 @@ include/wayfire/unstable/wlr-view-keyboard-interaction.hpp
include/wayfire/unstable/xdg-toplevel-base.hpp
include/wayfire/unstable/xwl-toplevel-base.hpp
include/wayfire/util.hpp
+include/wayfire/utils.hpp
+include/wayfire/variant.hpp
include/wayfire/view-access-interface.hpp
include/wayfire/view-helpers.hpp
include/wayfire/view-transform.hpp
@@ -80,6 +100,12 @@ include/wayfire/workarea.hpp
include/wayfire/workspace-set.hpp
include/wayfire/workspace-stream.hpp
lib/libwayfire-blur-base.so
+lib/libwayfire-move-drag-interface.a
+lib/libwayfire-workspace-wall.a
+lib/libwf-utils.so
+lib/libwf-utils.so.0
+lib/libwf-utils.so.0.4.0
+lib/libwftouch.a
lib/wayfire/libalpha.so
lib/wayfire/libanimate.so
lib/wayfire/libautostart.so
@@ -88,7 +114,6 @@ lib/wayfire/libcommand.so
lib/wayfire/libcube.so
lib/wayfire/libdecoration.so
lib/wayfire/libdefault-config-backend.so
-lib/wayfire/libdemo-ipc.so
lib/wayfire/libexpo.so
lib/wayfire/libextra-gestures.so
lib/wayfire/libfast-switcher.so
@@ -113,6 +138,7 @@ lib/wayfire/libshortcuts-inhibit.so
lib/wayfire/libsimple-tile.so
lib/wayfire/libstipc.so
lib/wayfire/libswitcher.so
+lib/wayfire/libvk-color-management.so
lib/wayfire/libvswipe.so
lib/wayfire/libvswitch.so
lib/wayfire/libwayfire-shell.so
@@ -125,6 +151,7 @@ lib/wayfire/libxdg-activation.so
lib/wayfire/libxkb-bindings.so
lib/wayfire/libzoom.so
libdata/pkgconfig/wayfire.pc
+libdata/pkgconfig/wf-utils.pc
share/man/man1/wayfire.1.gz
%%EXAMPLESDIR%%/wayfire.ini
%%DATADIR%%/metadata/alpha.xml
@@ -174,3 +201,4 @@ share/man/man1/wayfire.1.gz
%%DATADIR%%/metadata/zoom.xml
%%DATADIR%%/protocols/unstable/wayfire-shell-unstable-v2.xml
share/wayland-sessions/wayfire.desktop
+share/xdg-desktop-portal/wayfire-portals.conf
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-31 22:28:45 +0000