diff --git a/x11-toolkits/wlroots/Makefile b/x11-toolkits/wlroots/Makefile index 755d3eac263a..46592ab00636 100644 --- a/x11-toolkits/wlroots/Makefile +++ b/x11-toolkits/wlroots/Makefile @@ -1,80 +1,76 @@ PORTNAME= wlroots -DISTVERSION= 0.15.0 +DISTVERSION= 0.15.1 DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/} -PORTREVISION= 1 CATEGORIES= x11-toolkits PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github PATCHFILES+= 7c0e2a271a4c.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 PATCHFILES+= 55a8d225cf8c.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ PATCHFILES+= 347b32642fb6.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3318 -PATCHFILES+= 823476e76ed1.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3409 -PATCHFILES+= 812951f5bc47.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3411 -PATCHFILES+= 9988eb3378db.patch:-p1 # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3413 MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.24:graphics/wayland-protocols LIB_DEPENDS= libudev.so:devel/libudev-devd \ libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ libseat.so:sysutils/seatd \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c11 gl meson pkgconfig xorg USE_GITLAB= yes USE_GL= gbm USE_XORG= pixman USE_LDCONFIG= yes GL_SITE= https://gitlab.freedesktop.org -GL_COMMIT= 9f41627aa10a94d9427bc315fa3d363a61b94d7c +GL_COMMIT= 29938b74251e826f3778f6bf9c54974a30488cc1 MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,} OPTIONS_DEFINE= DRM NVIDIA OPENGL VULKAN X11 OPTIONS_DEFAULT=DRM OPENGL VULKAN X11 OPTIONS_SUB= yes DRM_DESC= KMS console support DRM_LIB_DEPENDS= libinput.so:x11/libinput DRM_VARS= BACKENDS+="drm libinput" NVIDIA_DESC= EGLStreams support for DRM backend (experimental) NVIDIA_PATCH_SITES= https://github.com/danvd/${GL_PROJECT}-eglstreams/commit/:nvidia NVIDIA_PATCHFILES= c0fc017207f0.patch:-p1:nvidia # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2769 NVIDIA_IMPLIES= DRM OPENGL X11 .if make(makesum) .MAKEFLAGS: WITH+=NVIDIA .endif OPENGL_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri OPENGL_USE= GL=egl,glesv2 OPENGL_VARS= RENDERERS+=gles2 VULKAN_DESC= Vulkan renderer VULKAN_BUILD_DEPENDS= glslangValidator:graphics/glslang \ vulkan-headers>0:graphics/vulkan-headers VULKAN_LIB_DEPENDS= libvulkan.so:graphics/vulkan-loader VULKAN_RUN_DEPENDS= mesa-dri>0:graphics/mesa-dri VULKAN_VARS= RENDERERS+=vulkan X11_LIB_DEPENDS= libxcb-errors.so:x11/xcb-util-errors \ libxcb-render-util.so:x11/xcb-util-renderutil \ libxcb-icccm.so:x11/xcb-util-wm X11_BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ xwayland-devel>0:x11-servers/xwayland-devel X11_RUN_DEPENDS= xwayland-devel>0:x11-servers/xwayland-devel X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland X11_VARS= BACKENDS+=x11 post-patch: # Extract (snapshot) version from the port instead of meson.build @${REINPLACE_CMD} "/STR/s/meson.project_version()/'${DISTVERSIONFULL}'/" \ ${WRKSRC}/include/wlr/meson.build .include diff --git a/x11-toolkits/wlroots/distinfo b/x11-toolkits/wlroots/distinfo index 99f7e9e4077f..e3239b7c54b2 100644 --- a/x11-toolkits/wlroots/distinfo +++ b/x11-toolkits/wlroots/distinfo @@ -1,17 +1,11 @@ -TIMESTAMP = 1639578848 -SHA256 (wlroots-wlroots-9f41627aa10a94d9427bc315fa3d363a61b94d7c_GL0.tar.gz) = 31381f649538bb52c5fa0b3c0d2a2d9a1fc3f0dd22367c39a12abbe53b53bb04 -SIZE (wlroots-wlroots-9f41627aa10a94d9427bc315fa3d363a61b94d7c_GL0.tar.gz) = 565273 +TIMESTAMP = 1643923194 +SHA256 (wlroots-wlroots-29938b74251e826f3778f6bf9c54974a30488cc1_GL0.tar.gz) = 7d3bc1ee9851354a76632de5d0428a3b9583f43ee3e3194f7be616f404f8eae1 +SIZE (wlroots-wlroots-29938b74251e826f3778f6bf9c54974a30488cc1_GL0.tar.gz) = 566013 SHA256 (7c0e2a271a4c.patch) = 2b92d3dde7640061ed85ab1690031f7627bebc2366e8c4da217017188ba7195e SIZE (7c0e2a271a4c.patch) = 5729 SHA256 (55a8d225cf8c.patch) = f9df98540fdabe35c61ed828f6d64633aab72edf0ba1c7ad0849594f10383ce7 SIZE (55a8d225cf8c.patch) = 4209 SHA256 (347b32642fb6.patch) = df24f95731b45a141f5ccbe263249fed9ba445ad04ce0da2c000142c763954c3 SIZE (347b32642fb6.patch) = 3808 -SHA256 (823476e76ed1.patch) = f0ad7c2366042451be01270f33e6552bf4676f64440972ecc1fe9ee9cd75267a -SIZE (823476e76ed1.patch) = 1234 -SHA256 (812951f5bc47.patch) = 94dbc14a66c791570362bfe0dae03a5b974a35668d333c5c5a9f940f21de3e58 -SIZE (812951f5bc47.patch) = 1745 -SHA256 (9988eb3378db.patch) = 335d3c460780fea1f7a27f5e64ebb473b3281964843a6492f1ac334c124213e3 -SIZE (9988eb3378db.patch) = 1497 SHA256 (c0fc017207f0.patch) = bdafef91a067cc95d9b47f5a837e400b641d9479393136818c34f5eb6b846d71 SIZE (c0fc017207f0.patch) = 108229