diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile index 68465fbcde71..0c7888768f0d 100644 --- a/x11-wm/wayfire/Makefile +++ b/x11-wm/wayfire/Makefile @@ -1,58 +1,58 @@ PORTNAME= wayfire DISTVERSIONPREFIX= v DISTVERSION= 0.7.1 CATEGORIES= x11-wm MAINTAINER= jbeich@FreeBSD.org COMMENT= 3D Wayland compositor LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= evdev-proto>0:devel/evdev-proto \ wf-config>=0.7.0<0.8.0:devel/wf-config \ ${LOCALBASE}/include/xf86drmMode.h:graphics/libdrm \ wayland-protocols>=1.12:graphics/wayland-protocols \ glm>=0.9.8:math/glm \ wlroots>=0.13.0<0.14.0:x11-toolkits/wlroots LIB_DEPENDS= libinotify.so:devel/libinotify \ libwf-config.so:devel/wf-config \ libpng.so:graphics/png \ libwayland-server.so:graphics/wayland \ libwlroots.so:x11-toolkits/wlroots \ libinput.so:x11/libinput \ libxkbcommon.so:x11/libxkbcommon USES= compiler:c++17-lang gl gnome jpeg meson pkgconfig xorg USE_GITHUB= yes USE_GL= egl glesv2 USE_GNOME= cairo USE_XORG= pixman GH_ACCOUNT= WayfireWM -GH_TUPLE= WayfireWM:wf-touch:b1075c5:wftouch/subprojects/wf-touch \ +GH_TUPLE= WayfireWM:wf-touch:8974eb0:wftouch/subprojects/wf-touch \ WayfireWM:wf-utils:f45641b:wfutils/subprojects/wf-utils OPTIONS_DEFINE= SUID X11 OPTIONS_DEFAULT=SUID X11 SUID_DESC= setuid bit on "${PORTNAME}" binary (to claim DRM without seatd/console-kit-daemon) SUID_PLIST_SUB= MAYBE_SUID="@(,,4755) " SUID_PLIST_SUB_OFF= MAYBE_SUID="" 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 post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${EXAMPLESDIR} ${MKDIR} ${STAGEDIR}${PREFIX}/share/wayland-sessions ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.desktop \ ${STAGEDIR}${PREFIX}/share/wayland-sessions .include diff --git a/x11-wm/wayfire/distinfo b/x11-wm/wayfire/distinfo index 7397b3e61371..412d1922600b 100644 --- a/x11-wm/wayfire/distinfo +++ b/x11-wm/wayfire/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1618996850 -SHA256 (WayfireWM-wayfire-v0.7.1_GH0.tar.gz) = 96cb7820cddbae962ca456fd1989cdaa00cd880b109bf8e9d667b9264a20c257 -SIZE (WayfireWM-wayfire-v0.7.1_GH0.tar.gz) = 363272 -SHA256 (WayfireWM-wf-touch-b1075c5_GH0.tar.gz) = 107fd73280e90c1330adc051b4dada1549a47e221e60d601d23e15b995f8bdc9 -SIZE (WayfireWM-wf-touch-b1075c5_GH0.tar.gz) = 53883 +TIMESTAMP = 1620112621 +SHA256 (WayfireWM-wayfire-v0.7.1_GH0.tar.gz) = af0af9d6623566e2b35d23e9422551a881fea41781478914d16fc9f4e2a14166 +SIZE (WayfireWM-wayfire-v0.7.1_GH0.tar.gz) = 363286 +SHA256 (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 3d66a67b35452741135420caf43ba349d35fc64643b8e223e6cdf74dbcef33aa +SIZE (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 9881 SHA256 (WayfireWM-wf-utils-f45641b_GH0.tar.gz) = 2f546333d4b1dfa3ed14caee3682dcc4c7e33164cb255991d918f3ace5f51dd7 SIZE (WayfireWM-wf-utils-f45641b_GH0.tar.gz) = 48453 diff --git a/x11-wm/wayfire/files/patch-private-libs b/x11-wm/wayfire/files/patch-private-libs index 2948201cae79..e0ee938f31c0 100644 --- a/x11-wm/wayfire/files/patch-private-libs +++ b/x11-wm/wayfire/files/patch-private-libs @@ -1,75 +1,79 @@ wf-touch and wf-utils are untagged and have no other consumers. Keep it private to wayfire package for now. --- meson.build.orig 2020-11-08 17:19:12 UTC +++ meson.build @@ -41,8 +41,8 @@ if not use_system_wfconfig wfconfig = subproject('wf-config').get_variable('wfconfig') endif -wfutils = subproject('wf-utils').get_variable('wfutils') -wftouch = subproject('wf-touch').get_variable('wftouch') +wfutils = subproject('wf-utils', default_options: ['default_library=static']).get_variable('wfutils') +wftouch = subproject('wf-touch', default_options: ['default_library=static']).get_variable('wftouch') needs_libinotify = ['freebsd', 'dragonfly'].contains(host_machine.system()) libinotify = dependency('libinotify', required: needs_libinotify) --- subprojects/wf-utils/meson.build.orig 2020-05-11 09:28:45 UTC +++ subprojects/wf-utils/meson.build @@ -34,9 +34,10 @@ lib_wfutils = library('wf-utils', sources, dependencies: [], include_directories: wfutils_inc, - install: true, + install: not meson.is_subproject(), version: meson.project_version()) +if not meson.is_subproject() pkgconfig = import('pkgconfig') pkgconfig.generate( libraries: lib_wfutils, @@ -44,6 +45,7 @@ pkgconfig.generate( filebase: meson.project_name(), name: meson.project_name(), description: 'Utilities library for Wayfire') +endif install_headers([], subdir: 'wayfire/utils') @@ -85,12 +87,14 @@ headers_root = [ 'wayfire/variant.hpp', ] +if not meson.is_subproject() install_headers(headers_action, subdir: 'wayfire/action') install_headers(headers_condition, subdir: 'wayfire/condition') install_headers(headers_lexer, subdir: 'wayfire/lexer') install_headers(headers_parser, subdir: 'wayfire/parser') install_headers(headers_rule, subdir: 'wayfire/rule') install_headers(headers_root, subdir: 'wayfire') +endif # ------------------------------------------------------------------------------------------------- # Unit tests ---- subprojects/wf-touch/meson.build.orig 2020-09-20 09:41:37 UTC +--- subprojects/wf-touch/meson.build.orig 2021-03-19 14:56:39 UTC +++ subprojects/wf-touch/meson.build -@@ -5,14 +5,18 @@ project('wf-touch', ['cpp'], +@@ -6,18 +6,22 @@ project('wf-touch', ['cpp'], glm = dependency('glm') wf_touch_inc_dirs = include_directories('.') +if not meson.is_subproject() install_headers([ 'wayfire/touch/touch.hpp'], subdir: 'wayfire/touch') +endif wftouch_lib = static_library('wftouch', ['src/touch.cpp', 'src/actions.cpp', 'src/math.cpp'], - dependencies: glm, install: true) + dependencies: glm, install: not meson.is_subproject()) wftouch = declare_dependency(link_with: wftouch_lib, include_directories: wf_touch_inc_dirs, dependencies: glm) +if not meson.is_subproject() - subdir('test') + doctest = dependency('doctest', required: get_option('tests')) + + if doctest.found() + subdir('test') +endif + endif