diff --git a/x11-toolkits/wlroots-devel/Makefile b/x11-toolkits/wlroots-devel/Makefile index 08c6e5604eb6..408024a73cb4 100644 --- a/x11-toolkits/wlroots-devel/Makefile +++ b/x11-toolkits/wlroots-devel/Makefile @@ -1,79 +1,79 @@ PORTNAME= wlroots -DISTVERSION= 0.16.0-494 +DISTVERSION= 0.16.0-504 DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/} CATEGORIES= x11-toolkits PKGNAMESUFFIX= -devel PATCH_SITES+= https://github.com/swaywm/${GL_PROJECT}/commit/:github PATCHFILES+= 10f80a8f1bb2.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 PATCHFILES+= 3196c73d487f.patch:-p1:github # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/2064 PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ MAINTAINER= jbeich@FreeBSD.org COMMENT= Modular Wayland compositor library (development snapshot) WWW= https://gitlab.freedesktop.org/wlroots/wlroots LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= wayland-protocols>=1.31:graphics/wayland-protocols LIB_DEPENDS= libdrm.so:graphics/libdrm \ libwayland-server.so:graphics/wayland \ 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= b61d5922f1d0910a848deb100570ad8587aea38d +GL_COMMIT= 3dc646ea889084cd7aa980f38124b5df548cf10d MESON_ARGS= -Dexamples=false -Dbackends=${BACKENDS:ts,} -Drenderers=${RENDERERS:ts,} .ifdef PKGNAMESUFFIX PORTSCOUT= ignore:1 PREFIX= ${LOCALBASE}/${PKGBASE} # avoid conflict with the default MESON_ARGS+= -Ddatadir="${LOCALBASE}/share" .endif OPTIONS_DEFINE= DRM OPENGL VULKAN X11 OPTIONS_DEFAULT=DRM OPENGL VULKAN X11 OPTIONS_SUB= yes DRM_DESC= KMS console support DRM_BUILD_DEPENDS= hwdata>0:misc/hwdata DRM_LIB_DEPENDS= libudev.so:devel/libudev-devd \ libliftoff.so:graphics/libliftoff \ libdisplay-info.so:sysutils/libdisplay-info \ libseat.so:sysutils/seatd \ libinput.so:x11/libinput DRM_MESON_ENABLED= session DRM_VARS= BACKENDS+="drm libinput" 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-devel/distinfo b/x11-toolkits/wlroots-devel/distinfo index 022c40196f08..07fdf590f858 100644 --- a/x11-toolkits/wlroots-devel/distinfo +++ b/x11-toolkits/wlroots-devel/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1685803001 -SHA256 (wlroots-wlroots-b61d5922f1d0910a848deb100570ad8587aea38d_GL0.tar.gz) = 2ceafa8672aec5db3362f4ff3f9bfb1c8e6bfac5ae00a75394dcd0c52eb000be -SIZE (wlroots-wlroots-b61d5922f1d0910a848deb100570ad8587aea38d_GL0.tar.gz) = 627286 +TIMESTAMP = 1685999179 +SHA256 (wlroots-wlroots-3dc646ea889084cd7aa980f38124b5df548cf10d_GL0.tar.gz) = e5b80e8e3fcd87da42063bbe775d778f8c46c55b1f3ee727c29cff1c565bda9f +SIZE (wlroots-wlroots-3dc646ea889084cd7aa980f38124b5df548cf10d_GL0.tar.gz) = 627082 SHA256 (10f80a8f1bb2.patch) = ca65f8eecf32e7364d5ba43cd9ee91060710a6fb8392892c86ad71e4f2a4c0b5 SIZE (10f80a8f1bb2.patch) = 6097 SHA256 (3196c73d487f.patch) = 69c6bc4658852bb45a24b129f625a7faaed8035dab0d79c388ae74d650beacdc SIZE (3196c73d487f.patch) = 4243 diff --git a/x11-wm/sway-devel/Makefile b/x11-wm/sway-devel/Makefile index 00e51d530f55..ddc243bc483b 100644 --- a/x11-wm/sway-devel/Makefile +++ b/x11-wm/sway-devel/Makefile @@ -1,71 +1,73 @@ PORTNAME= sway DISTVERSION?= 1.8.1-148 # git rev-list --count 1.8.1.. DISTVERSIONSUFFIX?= -gb5cb49bce CATEGORIES= x11-wm wayland 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/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN= fails to build after https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/4159 + BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>=1.24:graphics/wayland-protocols \ wlroots>=0.16.0.474<0.17.0:x11-toolkits/wlroots 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+= glesv2 USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT?= swaywm MESON_ARGS= -Dsd-bus-provider=basu CONFLICTS_INSTALL?= ${PORTNAME} ${PORTNAME}fx 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/wlroots-devel/override.mk" .include