diff --git a/x11-wm/wayfire/Makefile b/x11-wm/wayfire/Makefile index b57dc4acc545..f1ad5993b3ee 100644 --- a/x11-wm/wayfire/Makefile +++ b/x11-wm/wayfire/Makefile @@ -1,67 +1,54 @@ PORTNAME= wayfire DISTVERSIONPREFIX= v -DISTVERSION= 0.7.2 -PORTREVISION= 3 +DISTVERSION= 0.7.3 CATEGORIES= x11-wm PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= dd479c06bf84.patch:-p1 # https://github.com/WayfireWM/wayfire/issues/599 -PATCHFILES+= 7b664f055249.patch:-p1 # https://github.com/WayfireWM/wayfire/pull/1230 -PATCHFILES+= 8096b2f6d190.patch:-p1 # wlroots 0.15 -PATCHFILES+= 394fc3a86db4.patch:-p1 # wlroots 0.15 -PATCHFILES+= 839c11ec4d39.patch:-p1 # wlroots 0.15 -PATCHFILES+= be3113dda0c9.patch:-p1 # wlroots 0.15 -PATCHFILES+= 2d212482870a.patch:-p1 # wlroots 0.15 -PATCHFILES+= e6f403af09cc.patch:-p1 # wlroots 0.15 -PATCHFILES+= 7355cf0f1f64.patch:-p1 # wlroots 0.15 -PATCHFILES+= f9446a5d7496.patch:-p1 # wlroots 0.15 -PATCHFILES+= a4e83480ad60.patch:-p1 # wlroots 0.15 -PATCHFILES+= 292b0d28aab5.patch:-p1 # wlroots 0.15 -PATCHFILES+= 6603ba65e1c4.patch:-p1 # wlroots 0.15 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.15.0<0.16.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_GNOME= cairo pango USE_XORG= pixman GH_ACCOUNT= WayfireWM GH_TUPLE= WayfireWM:wf-touch:8974eb0:wftouch/subprojects/wf-touch \ WayfireWM:wf-utils:889fdaf:wfutils/subprojects/wf-utils 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 post-install: ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.ini ${STAGEDIR}${EXAMPLESDIR} .include diff --git a/x11-wm/wayfire/distinfo b/x11-wm/wayfire/distinfo index 4a0a41f5c46a..119ca9dd016f 100644 --- a/x11-wm/wayfire/distinfo +++ b/x11-wm/wayfire/distinfo @@ -1,33 +1,9 @@ -TIMESTAMP = 1624453880 -SHA256 (WayfireWM-wayfire-v0.7.2_GH0.tar.gz) = e45fddcc22b7149d793fea08763c5b3dc0edf7c0be9d094575a32cf847560fd4 -SIZE (WayfireWM-wayfire-v0.7.2_GH0.tar.gz) = 362028 +TIMESTAMP = 1650049372 +SHA256 (WayfireWM-wayfire-v0.7.3_GH0.tar.gz) = 72575b6d598087d6fe737a8066db5405d7cff88a3041447f56b83313ac9a0684 +SIZE (WayfireWM-wayfire-v0.7.3_GH0.tar.gz) = 364366 SHA256 (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 3d66a67b35452741135420caf43ba349d35fc64643b8e223e6cdf74dbcef33aa SIZE (WayfireWM-wf-touch-8974eb0_GH0.tar.gz) = 9881 SHA256 (WayfireWM-wf-utils-889fdaf_GH0.tar.gz) = 8848592f4a04dec60c3e09a996f15d1f86e79f544eda4519f2b3d9dc91997db3 SIZE (WayfireWM-wf-utils-889fdaf_GH0.tar.gz) = 48477 SHA256 (dd479c06bf84.patch) = c58562defa005b8b3188d8a64003f0ee5444fef7449ed0a5f899d70b1901fb6d SIZE (dd479c06bf84.patch) = 2086 -SHA256 (7b664f055249.patch) = 080c3674c9f27cd49fb1c32e0aec0dc126f901368643653e93f6c0e3e390f269 -SIZE (7b664f055249.patch) = 625 -SHA256 (8096b2f6d190.patch) = 4e28fac7d3f3e7240febfe41a69a66b47498406f60314f21168488c7245f54b0 -SIZE (8096b2f6d190.patch) = 1021 -SHA256 (394fc3a86db4.patch) = 749541ea922f24ce2b2db6e435f0e8b579b4cbbd19bc17e2b80659094dfd91e1 -SIZE (394fc3a86db4.patch) = 763 -SHA256 (839c11ec4d39.patch) = d9b7065820448e7acd169c79979d818534913ae71abe5cb203d2699bb7690c78 -SIZE (839c11ec4d39.patch) = 1200 -SHA256 (be3113dda0c9.patch) = 7603ac5f6008a4f275f208683bcc2618e078943053308c5292670b902a628927 -SIZE (be3113dda0c9.patch) = 3224 -SHA256 (2d212482870a.patch) = ecb6c2f2f91ee19a808ef209e0d141c466b02d28c3bc593a6830988014d399e6 -SIZE (2d212482870a.patch) = 1249 -SHA256 (e6f403af09cc.patch) = d7ea1e35a74a8a8368e8c09d1d3ba4611409862e1437ec600655470ec44d9ecd -SIZE (e6f403af09cc.patch) = 1308 -SHA256 (7355cf0f1f64.patch) = dbc57120e2e45e95f97027ad6c52d0d74b388f304bdea3b3c3a13120fdfc103c -SIZE (7355cf0f1f64.patch) = 1327 -SHA256 (f9446a5d7496.patch) = 52959a1c416c3ec8ef0c262cce71267523bf970f71ceba77cc94b99c7423605d -SIZE (f9446a5d7496.patch) = 1230 -SHA256 (a4e83480ad60.patch) = f1e5aae88a83182cf5fc8522ff88399e31d6cd7c91985c3d89bd5cc31d75e150 -SIZE (a4e83480ad60.patch) = 917 -SHA256 (292b0d28aab5.patch) = e97d20b71a13bc152f2dd004dce8e92196013652b502ace11a947e0b69f42b1c -SIZE (292b0d28aab5.patch) = 3585 -SHA256 (6603ba65e1c4.patch) = e4a31e4fd9b959a13c5ab4fd749f74b053821983ae0db75f0447e673acf33140 -SIZE (6603ba65e1c4.patch) = 918 diff --git a/x11-wm/wayfire/files/patch-wlroots-0.15 b/x11-wm/wayfire/files/patch-wlroots-0.15 deleted file mode 100644 index 0aa3a5a6cea2..000000000000 --- a/x11-wm/wayfire/files/patch-wlroots-0.15 +++ /dev/null @@ -1,121 +0,0 @@ -https://github.com/WayfireWM/wayfire/issues/1351 - -In file included from ../src/core/core.cpp:17: -../src/api/wayfire/nonstd/wlroots-full.hpp:85:10: fatal error: 'wlr/backend/noop.h' file not found -#include - ^~~~~~~~~~~~~~~~~~~~ -../src/core/output-layout.cpp:630:25: error: no member named 'front_buffer' in 'wlr_output' - if (wo->handle->front_buffer == NULL) - ~~~~~~~~~~ ^ -../src/core/output-layout.cpp:637:48: error: no member named 'front_buffer' in 'wlr_output' - if (!wlr_buffer_get_dmabuf(wo->handle->front_buffer, &attributes)) - ~~~~~~~~~~ ^ - ---- plugins/single_plugins/preserve-output.cpp.orig 2021-06-23 13:11:20 UTC -+++ plugins/single_plugins/preserve-output.cpp -@@ -297,7 +297,7 @@ class wayfire_preserve_output : public wf::plugin_inte - public: - void init() override - { -- if (wlr_output_is_noop(output->handle)) -+ if (wlr_output_is_headless(output->handle)) - { - // Don't do anything for NO-OP outputs - return; ---- src/api/wayfire/nonstd/wlroots-full.hpp.orig 2021-06-23 13:11:20 UTC -+++ src/api/wayfire/nonstd/wlroots-full.hpp -@@ -81,7 +81,7 @@ extern "C" - #if WLR_HAS_X11_BACKEND - #include - #endif --#include -+#include - #include - #undef static - #include ---- src/core/output-layout.cpp.orig 2021-06-23 13:11:20 UTC -+++ src/core/output-layout.cpp -@@ -439,7 +439,7 @@ struct output_layout_output_t - * focused */ - wlr_output *focused = get_core().get_active_output() ? - get_core().get_active_output()->handle : nullptr; -- if (!focused || wlr_output_is_noop(focused)) -+ if (!focused || wlr_output_is_headless(focused)) - { - get_core().focus_output(wo); - } -@@ -627,14 +627,14 @@ struct output_layout_output_t - } - - wlr_dmabuf_attributes attributes; -- if (wo->handle->front_buffer == NULL) -+ if (wo->handle->back_buffer == NULL) - { - LOGE("Got empty buffer on ", wo->handle->name); - - return; - } - -- if (!wlr_buffer_get_dmabuf(wo->handle->front_buffer, &attributes)) -+ if (!wlr_buffer_get_dmabuf(wo->handle->back_buffer, &attributes)) - { - LOGE("Failed reading mirrored output contents from ", wo->handle->name); - -@@ -653,7 +653,7 @@ struct output_layout_output_t - - void set_enabled(bool enabled) - { -- if (wlr_output_is_noop(handle)) -+ if (wlr_output_is_headless(handle)) - { - return; - } -@@ -740,7 +740,7 @@ struct output_layout_output_t - */ - void emit_configuration_changed(uint32_t changed_fields) - { -- if (!wlr_output_is_noop(handle) && changed_fields) -+ if (!wlr_output_is_headless(handle) && changed_fields) - { - wf::output_configuration_changed_signal data{current_state}; - data.output = output.get(); -@@ -903,7 +903,7 @@ class output_layout_t::impl - on_config_reload = [=] (void*) { reconfigure_from_config(); }; - get_core().connect_signal("reload-config", &on_config_reload); - -- noop_backend = wlr_noop_backend_create(get_core().display); -+ noop_backend = wlr_headless_backend_create(get_core().display); - wlr_backend_start(noop_backend); - - get_core().connect_signal("_backend_started", &on_backend_started); -@@ -989,7 +989,7 @@ class output_layout_t::impl - - if (!noop_output) - { -- auto handle = wlr_noop_add_output(noop_backend); -+ auto handle = wlr_headless_add_output(noop_backend, 800, 600); - noop_output = std::make_unique(handle); - } - ---- src/core/wm.cpp.orig 2021-06-23 13:11:20 UTC -+++ src/core/wm.cpp -@@ -48,7 +48,7 @@ void wayfire_exit::init() - int cnt_other_outputs = 0; - for (auto& wo : wf::get_core().output_layout->get_outputs()) - { -- if ((wo != output) && !wlr_output_is_noop(wo->handle)) -+ if ((wo != output) && !wlr_output_is_headless(wo->handle)) - { - ++cnt_other_outputs; - } ---- src/output/render-manager.cpp 2021-06-23 13:11:20 UTC -+++ src/output/render-manager.cpp -@@ -691,7 +691,7 @@ class wf::render_manager::impl - - on_frame.set_callback([&] (void*) - { -- if (wlr_output_is_noop(output->handle)) -+ if (wlr_output_is_headless(output->handle)) - { - return; - }