diff options
Diffstat (limited to 'x11-wm/wayfire/Makefile')
| -rw-r--r-- | x11-wm/wayfire/Makefile | 30 |
1 files changed, 13 insertions, 17 deletions
diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile index c8af247557e0..0742aca84f0b 100644 --- a/x11-wm/wayfire/Makefile +++ b/x11-wm/wayfire/Makefile @@ -1,10 +1,9 @@ PORTNAME= wayfire DISTVERSIONPREFIX= v -DISTVERSION= 0.9.0 -PORTREVISION= 2 +DISTVERSION= 0.10.0 CATEGORIES= x11-wm wayland -MAINTAINER= jbeich@FreeBSD.org +MAINTAINER= ports@FreeBSD.org COMMENT= 3D Wayland compositor WWW= https://wayfire.org/ @@ -12,20 +11,20 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ - nlohmann-json>0:devel/nlohmann-json \ - wf-config>=0.9.0<0.10.0:devel/wf-config \ + wf-config>=0.10.0<0.11.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 \ + libudev.so:devel/libudev-devd \ libwf-config.so:devel/wf-config \ + libyyjson.so:devel/yyjson \ libpng.so:graphics/png \ libwayland-server.so:graphics/wayland \ - libwlroots-0.17.so:x11-toolkits/wlroots017 \ + libwlroots-0.19.so:x11-toolkits/wlroots019 \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon -RUN_DEPENDS= nlohmann-json>0:devel/nlohmann-json TEST_DEPENDS= doctest>0:devel/doctest USES= cmake:indirect compiler:c++17-lang gl gnome jpeg meson pkgconfig xorg @@ -34,13 +33,15 @@ USE_GL= egl glesv2 USE_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= WayfireWM -GH_TUPLE= WayfireWM:wf-touch:b8b844f:wftouch/subprojects/wf-touch \ - WayfireWM:wf-utils:08553c4:wfutils/subprojects/wf-utils +GH_TUPLE= WayfireWM:wf-touch:093d894:wftouch/subprojects/wf-touch \ + WayfireWM:wf-utils:3ef27d1:wfutils/subprojects/wf-utils MESON_ARGS= -Dtests=disabled \ -Dwf-touch:tests=disabled \ - -Dwf-utils:default_library=static \ ${NULL} +# XXX https://github.com/WayfireWM/wayfire/issues/2800 +USES+= localbase + .if !exists(/usr/include/omp.h) # LLVM openmp in base doesn't support powerpc, armv6, armv7 yet MESON_ARGS+= -Denable_openmp=false @@ -58,12 +59,6 @@ post-patch: -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} @@ -71,7 +66,8 @@ post-install: 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"; \ + ${MAKE} -C${.CURDIR} build MESON_ARGS="${MESON_ARGS} --reconfigure \ + ${MESON_ARGS:M*tests*:S/=dis/=en/}"; \ ${TOUCH} ${WRKDIR}/.meson_build_tests; \ fi |