diff --git a/devel/wf-config/Makefile b/devel/wf-config/Makefile index 58c40b3e4a40..4d9cae193076 100644 --- a/devel/wf-config/Makefile +++ b/devel/wf-config/Makefile @@ -1,35 +1,35 @@ PORTNAME= wf-config DISTVERSIONPREFIX= v -DISTVERSION= 0.8.0 +DISTVERSION= 0.9.0 CATEGORIES= devel MAINTAINER= jbeich@FreeBSD.org COMMENT= Library for managing configuration files, written for wayfire WWW= https://wayfire.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wayland-protocols>0:graphics/wayland-protocols \ glm>0:math/glm LIB_DEPENDS= libevdev.so:devel/libevdev RUN_DEPENDS= glm>0:math/glm TEST_DEPENDS= doctest>0:devel/doctest USES= cmake:indirect compiler:c++17-lang gnome meson pkgconfig USE_GITHUB= yes USE_GNOME= libxml2 USE_LDCONFIG= yes GH_ACCOUNT= WayfireWM MESON_ARGS= -Dtests=disabled PLIST_SUB= VERSION=${PORTVERSION} 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"; \ ${TOUCH} ${WRKDIR}/.meson_build_tests; \ fi .include diff --git a/devel/wf-config/distinfo b/devel/wf-config/distinfo index 6b22237d4571..e3f1efb30475 100644 --- a/devel/wf-config/distinfo +++ b/devel/wf-config/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1691507819 -SHA256 (WayfireWM-wf-config-v0.8.0_GH0.tar.gz) = 5b69ab8886e2b0e9c5bffa65c5c676c2848fbcc0e67201886a5f2fdd354e25fb -SIZE (WayfireWM-wf-config-v0.8.0_GH0.tar.gz) = 48539 +TIMESTAMP = 1718781348 +SHA256 (WayfireWM-wf-config-v0.9.0_GH0.tar.gz) = 973a47795d3397d281d89c561903867f691c9fe8c3d141ba887afd12902c790d +SIZE (WayfireWM-wf-config-v0.9.0_GH0.tar.gz) = 50246 diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile index 340ca4461e51..e5ba98baa6ab 100644 --- a/x11-wm/wayfire/Makefile +++ b/x11-wm/wayfire/Makefile @@ -1,72 +1,74 @@ PORTNAME= wayfire DISTVERSIONPREFIX= v DISTVERSION= 0.8.1 PORTREVISION= 2 CATEGORIES= x11-wm wayland MAINTAINER= jbeich@FreeBSD.org COMMENT= 3D Wayland compositor WWW= https://wayfire.org/ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE +BROKEN= fails to build with wf-config 0.9.0 + BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ nlohmann-json>0:devel/nlohmann-json \ wf-config>=0.8.0<0.9.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 \ libwf-config.so:devel/wf-config \ libpng.so:graphics/png \ libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots017 \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon TEST_DEPENDS= doctest>0:devel/doctest USES= cmake:indirect compiler:c++17-lang gl gnome jpeg meson pkgconfig xorg USE_GITHUB= yes USE_GL= egl glesv2 USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= WayfireWM GH_TUPLE= WayfireWM:wf-touch:8974eb0:wftouch/subprojects/wf-touch \ WayfireWM:wf-utils:15f8e16:wfutils/subprojects/wf-utils MESON_ARGS= -Dtests=disabled \ -Dwf-touch:tests=disabled \ -Dwf-utils:default_library=static \ ${NULL} OPTIONS_DEFINE= X11 OPTIONS_DEFAULT=X11 X11_USE= XORG=xcb X11_MESON_ENABLED= xwayland post-patch: # 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 .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} 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"; \ ${TOUCH} ${WRKDIR}/.meson_build_tests; \ fi .include