Skip to content

Commit

Permalink
x11-wm/hyprland: switch to wlroots-devel to simplify updates
Browse files Browse the repository at this point in the history
Giving up adding more workarounds after 0.36.0 introduced

hyprwm/Hyprland@301b48b74087
https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/20935646168f

../src/render/Renderer.cpp:2501:9: error: use of undeclared identifier 'wlr_damage_ring_rotate_buffer'
 2501 |         wlr_damage_ring_rotate_buffer(&pMonitor->damage, m_pCurrentWlrBuffer, damage.pixman());
      |         ^

This reverts commit 46de20d.
This reverts commit 474e59a.
  • Loading branch information
jbeich committed Mar 1, 2024
1 parent fd469ee commit 5b41952
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 132 deletions.
8 changes: 8 additions & 0 deletions x11-wm/hyprland/Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
PORTNAME= hyprland
DISTVERSIONPREFIX= v
DISTVERSION= 0.35.0
PORTREVISION= 1
CATEGORIES= x11-wm wayland

MAINTAINER= jbeich@FreeBSD.org
Expand Down Expand Up @@ -107,6 +108,13 @@ bundled-libcxx:
@${DO_MAKE_BUILD:NDESTDIR*} install -C ${WRKDIR}/libcxx_build
.endif
.endif # exists(/usr/lib/libc++.so)

.include "${.CURDIR:H:H}/x11-toolkits/wlroots-devel/override.mk"
post-patch: wlroots-devel-patch
wlroots-devel-patch:
# Prefer <wlr/*> headers (used by <hyprland/*>) from wlroots-devel
@${REINPLACE_CMD} -i .devel "/subdirs/s|''|'../wlroots-devel/include', &|" \
${WRKSRC}/meson.build
.include <bsd.port.mk>

# XXX Work around !target(makesum)
Expand Down
2 changes: 1 addition & 1 deletion x11-wm/hyprland/files/patch-system-wlroots
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Allow system wlroots to reduce maintenance (wlroots has tons of options)

-wlroots = subproject('wlroots', default_options: ['examples=false', 'renderers=gles2'])
-have_xwlr = wlroots.get_variable('features').get('xwayland')
+wlroots = dependency('wlroots', version: ['>=0.17.0', '<0.18.0'], default_options: ['examples=false', 'renderers=gles2'])
+wlroots = dependency('wlroots', version: ['>=0.18.0', '<0.19.0'], default_options: ['examples=false', 'renderers=gles2'])
+have_xwlr = wlroots.get_variable(pkgconfig: 'have_xwayland', internal: 'have_xwayland') == 'true'
xcb_dep = dependency('xcb', required: get_option('xwayland'))

Expand Down
131 changes: 0 additions & 131 deletions x11-wm/hyprland/files/patch-wlroots-0.17

This file was deleted.

0 comments on commit 5b41952

Please sign in to comment.