mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00
Code Issues Releases Activity

x11-toolkits/wlroots015: replace override.mk with upstream fix

Browse Source
This commit is contained in:
Jan Beich 2024-06-03 15:48:48 +02:00
parent 2d64423989
commit 0303e791dc
6 changed files with 127 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
x11-toolkits/wlroots015/Makefile
View File

@ -1,16 +1,22 @@
PORTNAME= wlroots
DISTVERSION= 0.15.1
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-toolkits
PKGNAMESUFFIX= 015
PATCH_SITES+= https://source.puri.sm/Librem5/${PORTNAME}/-/commit/:purism
PATCHFILES+= 21bc0ec09200.patch:-p1:purism # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3475
PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github
PATCHFILES+= dc5cefc1d2f8.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4488
PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/
PATCHFILES+= dd03d839ab56.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3499
PATCHFILES+= 17b2b0663372.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3478
PATCHFILES+= 347b32642fb6.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3318
PATCHFILES+= 7b8609eeb67b.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3857
PATCHFILES+= faa631c348d9.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4005
PATCHFILES+= bb32349c9776.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3501
PATCHFILES+= 822eb07eaca3.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4005
PATCHFILES+= 4b4f76cc1357.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4614
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Modular Wayland compositor library (deprecated 0.15.* series)
@ -33,12 +39,9 @@ USE_XORG= pixman
USE_LDCONFIG= yes
GL_SITE= https://gitlab.freedesktop.org
MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,}
PLIST_SUB= SUFFIX=-${DISTVERSION:R}
.ifdef PKGNAMESUFFIX
PORTSCOUT= limit:^0\.15\.
PREFIX= ${LOCALBASE}/${PKGBASE} # avoid conflict with the default
MESON_ARGS+= -Ddatadir="${LOCALBASE}/share"
.endif
OPTIONS_DEFINE= DRM NVIDIA OPENGL VULKAN X11
OPTIONS_DEFAULT=DRM OPENGL VULKAN X11

10
x11-toolkits/wlroots015/distinfo
View File

@ -3,6 +3,8 @@ SHA256 (wlroots-0.15.1.tar.bz2) = 8bb791aed9405abc20253c570de1a3b7af91ad65bee2b6
SIZE (wlroots-0.15.1.tar.bz2) = 423138
SHA256 (21bc0ec09200.patch) = bb5e4727c4cce2878c353ad329ae28523d2f229f3301bee15bb4ac243742986a
SIZE (21bc0ec09200.patch) = 1188
SHA256 (dc5cefc1d2f8.patch) = e1e52e14a287c3610531aeffe850b93502572e8a52c514bce54f894345d44317
SIZE (dc5cefc1d2f8.patch) = 1365
SHA256 (dd03d839ab56.patch) = 458f31cf2515fb075c33a947a5ead91c9560ab9db9c76da1c42d4a5fcd7f3c02
SIZE (dd03d839ab56.patch) = 3752
SHA256 (17b2b0663372.patch) = 142626a8365bb62f141c4c6f7820266f1911e2bef83b50b78e19b27560817960
@ -11,5 +13,13 @@ SHA256 (347b32642fb6.patch) = 836ec5d6b558d18bc156136376fcd13e3e358da9361e8fc006
SIZE (347b32642fb6.patch) = 3812
SHA256 (7b8609eeb67b.patch) = acb744d683f5ab88ffe5503ea401cd2cab8cada6438e056c233881a8950111c9
SIZE (7b8609eeb67b.patch) = 884
SHA256 (faa631c348d9.patch) = b0a73d15b38655e4af464be3a9ca684f8d72ed724624c1f3f9bdbee894bc2335
SIZE (faa631c348d9.patch) = 802
SHA256 (bb32349c9776.patch) = 2b12a4ed0702b8af893cca2e80bd6d742e3dc7c2cdf6041fbe851bfc0e2b26fd
SIZE (bb32349c9776.patch) = 879
SHA256 (822eb07eaca3.patch) = 2cdf10f6d66bfe1d2f50ebd05cb1fd1157b58859ff059c953cfcef899f01f634
SIZE (822eb07eaca3.patch) = 609
SHA256 (4b4f76cc1357.patch) = 163500bf90d39365a6ce8a9d24d48b2e65135d2f548c9532d933ed19b1097d53
SIZE (4b4f76cc1357.patch) = 2512
SHA256 (c0fc017207f0.patch) = bdafef91a067cc95d9b47f5a837e400b641d9479393136818c34f5eb6b846d71
SIZE (c0fc017207f0.patch) = 108229

8
x11-toolkits/wlroots015/override.mk
View File

@ -1,8 +0,0 @@
WLR_SUFFIX= 015
WLR_SOVERSION= 10
LIB_DEPENDS:= ${LIB_DEPENDS:S/wlroots.so/&.${WLR_SOVERSION}/:S/wlroots$/&${WLR_SUFFIX}/}
USES+= localbase # -isystem
CONFIGURE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/wlroots${WLR_SUFFIX}/libdata/pkgconfig"
MAKE_ENV+= PKG_CONFIG_PATH="${LOCALBASE}/wlroots${WLR_SUFFIX}/libdata/pkgconfig"

193
x11-toolkits/wlroots015/pkg-plist
View File

@ -1,97 +1,96 @@
include/wlr/backend.h
%%DRM%%include/wlr/backend/drm.h
include/wlr/backend/headless.h
include/wlr/backend/interface.h
%%DRM%%include/wlr/backend/libinput.h
include/wlr/backend/multi.h
include/wlr/backend/session.h
include/wlr/backend/wayland.h
%%X11%%include/wlr/backend/x11.h
include/wlr/config.h
include/wlr/interfaces/wlr_input_device.h
include/wlr/interfaces/wlr_keyboard.h
include/wlr/interfaces/wlr_output.h
include/wlr/interfaces/wlr_pointer.h
include/wlr/interfaces/wlr_switch.h
include/wlr/interfaces/wlr_tablet_pad.h
include/wlr/interfaces/wlr_tablet_tool.h
include/wlr/interfaces/wlr_touch.h
include/wlr/render/allocator.h
include/wlr/render/dmabuf.h
include/wlr/render/drm_format_set.h
%%OPENGL%%include/wlr/render/egl.h
%%OPENGL%%include/wlr/render/gles2.h
include/wlr/render/interface.h
include/wlr/render/pixman.h
%%VULKAN%%include/wlr/render/vulkan.h
include/wlr/render/wlr_renderer.h
include/wlr/render/wlr_texture.h
include/wlr/types/wlr_box.h
include/wlr/types/wlr_buffer.h
include/wlr/types/wlr_compositor.h
include/wlr/types/wlr_cursor.h
include/wlr/types/wlr_data_control_v1.h
include/wlr/types/wlr_data_device.h
include/wlr/types/wlr_drm.h
include/wlr/types/wlr_drm_lease_v1.h
include/wlr/types/wlr_export_dmabuf_v1.h
include/wlr/types/wlr_foreign_toplevel_management_v1.h
include/wlr/types/wlr_fullscreen_shell_v1.h
include/wlr/types/wlr_gamma_control_v1.h
include/wlr/types/wlr_idle.h
include/wlr/types/wlr_idle_inhibit_v1.h
include/wlr/types/wlr_input_device.h
include/wlr/types/wlr_input_inhibitor.h
include/wlr/types/wlr_input_method_v2.h
include/wlr/types/wlr_keyboard.h
include/wlr/types/wlr_keyboard_group.h
include/wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h
include/wlr/types/wlr_layer_shell_v1.h
include/wlr/types/wlr_linux_dmabuf_v1.h
include/wlr/types/wlr_matrix.h
include/wlr/types/wlr_output.h
include/wlr/types/wlr_output_damage.h
include/wlr/types/wlr_output_layout.h
include/wlr/types/wlr_output_management_v1.h
include/wlr/types/wlr_output_power_management_v1.h
include/wlr/types/wlr_pointer.h
include/wlr/types/wlr_pointer_constraints_v1.h
include/wlr/types/wlr_pointer_gestures_v1.h
include/wlr/types/wlr_presentation_time.h
include/wlr/types/wlr_primary_selection.h
include/wlr/types/wlr_primary_selection_v1.h
include/wlr/types/wlr_region.h
include/wlr/types/wlr_relative_pointer_v1.h
include/wlr/types/wlr_scene.h
include/wlr/types/wlr_screencopy_v1.h
include/wlr/types/wlr_seat.h
include/wlr/types/wlr_server_decoration.h
include/wlr/types/wlr_surface.h
include/wlr/types/wlr_switch.h
include/wlr/types/wlr_tablet_pad.h
include/wlr/types/wlr_tablet_tool.h
include/wlr/types/wlr_tablet_v2.h
include/wlr/types/wlr_text_input_v3.h
include/wlr/types/wlr_touch.h
include/wlr/types/wlr_viewporter.h
include/wlr/types/wlr_virtual_keyboard_v1.h
include/wlr/types/wlr_virtual_pointer_v1.h
include/wlr/types/wlr_xcursor_manager.h
include/wlr/types/wlr_xdg_activation_v1.h
include/wlr/types/wlr_xdg_decoration_v1.h
include/wlr/types/wlr_xdg_foreign_registry.h
include/wlr/types/wlr_xdg_foreign_v1.h
include/wlr/types/wlr_xdg_foreign_v2.h
include/wlr/types/wlr_xdg_output_v1.h
include/wlr/types/wlr_xdg_shell.h
include/wlr/util/addon.h
include/wlr/util/box.h
include/wlr/util/edges.h
include/wlr/util/log.h
include/wlr/util/region.h
include/wlr/version.h
include/wlr/xcursor.h
%%X11%%include/wlr/xwayland.h
lib/libwlroots.so
lib/libwlroots.so.10
libdata/pkgconfig/wlroots.pc
include/wlroots%%SUFFIX%%/wlr/backend.h
%%DRM%%include/wlroots%%SUFFIX%%/wlr/backend/drm.h
include/wlroots%%SUFFIX%%/wlr/backend/headless.h
include/wlroots%%SUFFIX%%/wlr/backend/interface.h
%%DRM%%include/wlroots%%SUFFIX%%/wlr/backend/libinput.h
include/wlroots%%SUFFIX%%/wlr/backend/multi.h
include/wlroots%%SUFFIX%%/wlr/backend/session.h
include/wlroots%%SUFFIX%%/wlr/backend/wayland.h
%%X11%%include/wlroots%%SUFFIX%%/wlr/backend/x11.h
include/wlroots%%SUFFIX%%/wlr/config.h
include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_input_device.h
include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_keyboard.h
include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_output.h
include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_pointer.h
include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_switch.h
include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_tablet_pad.h
include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_tablet_tool.h
include/wlroots%%SUFFIX%%/wlr/interfaces/wlr_touch.h
include/wlroots%%SUFFIX%%/wlr/render/allocator.h
include/wlroots%%SUFFIX%%/wlr/render/dmabuf.h
include/wlroots%%SUFFIX%%/wlr/render/drm_format_set.h
%%OPENGL%%include/wlroots%%SUFFIX%%/wlr/render/egl.h
%%OPENGL%%include/wlroots%%SUFFIX%%/wlr/render/gles2.h
include/wlroots%%SUFFIX%%/wlr/render/interface.h
include/wlroots%%SUFFIX%%/wlr/render/pixman.h
%%VULKAN%%include/wlroots%%SUFFIX%%/wlr/render/vulkan.h
include/wlroots%%SUFFIX%%/wlr/render/wlr_renderer.h
include/wlroots%%SUFFIX%%/wlr/render/wlr_texture.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_box.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_buffer.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_compositor.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_cursor.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_data_control_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_data_device.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_drm.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_drm_lease_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_export_dmabuf_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_foreign_toplevel_management_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_fullscreen_shell_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_gamma_control_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_idle.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_idle_inhibit_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_input_device.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_input_inhibitor.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_input_method_v2.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_keyboard.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_keyboard_group.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_layer_shell_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_linux_dmabuf_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_matrix.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_output.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_output_damage.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_output_layout.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_output_management_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_output_power_management_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_pointer.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_pointer_constraints_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_pointer_gestures_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_presentation_time.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_primary_selection.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_primary_selection_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_region.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_relative_pointer_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_scene.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_screencopy_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_seat.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_server_decoration.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_surface.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_switch.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_tablet_pad.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_tablet_tool.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_tablet_v2.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_text_input_v3.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_touch.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_viewporter.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_virtual_keyboard_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_virtual_pointer_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_xcursor_manager.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_activation_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_decoration_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_foreign_registry.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_foreign_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_foreign_v2.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_output_v1.h
include/wlroots%%SUFFIX%%/wlr/types/wlr_xdg_shell.h
include/wlroots%%SUFFIX%%/wlr/util/addon.h
include/wlroots%%SUFFIX%%/wlr/util/box.h
include/wlroots%%SUFFIX%%/wlr/util/edges.h
include/wlroots%%SUFFIX%%/wlr/util/log.h
include/wlroots%%SUFFIX%%/wlr/util/region.h
include/wlroots%%SUFFIX%%/wlr/version.h
include/wlroots%%SUFFIX%%/wlr/xcursor.h
%%X11%%include/wlroots%%SUFFIX%%/wlr/xwayland.h
lib/libwlroots%%SUFFIX%%.so
libdata/pkgconfig/wlroots%%SUFFIX%%.pc

5
x11-wm/hikari/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME= hikari
DISTVERSION= 2.3.3
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= x11-wm wayland
MASTER_SITES= https://hikari.acmelabs.space/releases/
@ -16,7 +16,7 @@ BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \
LIB_DEPENDS= libinput.so:x11/libinput \
libucl.so:textproc/libucl \
libwayland-server.so:graphics/wayland \
libwlroots.so:x11-toolkits/wlroots \
libwlroots-0.15.so:x11-toolkits/wlroots015 \
libxkbcommon.so:x11/libxkbcommon
RUN_DEPENDS= unix-selfauth-helper>0:security/unix-selfauth-helper
@ -48,5 +48,4 @@ post-install:
${MV} ${STAGEDIR}${ETCDIR}/hikari.conf \
${STAGEDIR}${ETCDIR}/hikari.conf.sample
.include "${.CURDIR:H:H}/x11-toolkits/wlroots015/override.mk"
.include <bsd.port.mk>

11
x11-wm/hikari/files/patch-Makefile
View File

@ -1,5 +1,16 @@
--- Makefile.orig 2021-04-09 17:37:23 UTC
+++ Makefile
@@ -126,8 +126,8 @@ CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ET
CFLAGS += -Wall -I. -Iinclude -DHIKARI_ETC_PREFIX=${ETC_PREFIX}
-WLROOTS_CFLAGS != ${PKG_CONFIG} --cflags wlroots
-WLROOTS_LIBS != ${PKG_CONFIG} --libs wlroots
+WLROOTS_CFLAGS != ${PKG_CONFIG} --cflags wlroots-0.15
+WLROOTS_LIBS != ${PKG_CONFIG} --libs wlroots-0.15
WLROOTS_CFLAGS += -DWLR_USE_UNSTABLE=1
@@ -252,7 +252,7 @@ install: hikari hikari-unlocker share/man/man1/hikari.
sed "s,PREFIX,${PREFIX}," etc/hikari/hikari.conf > ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf
chmod 644 ${DESTDIR}/${ETC_PREFIX}/etc/hikari/hikari.conf