mirror of
https://github.com/hyprwm/Hyprland
synced 2024-11-13 00:46:00 +01:00
2ea367839b
* deps: add epoll-shim for some BSDs after863c7b6072ld: error: undefined symbol: timerfd_create >>> referenced by EventLoopManager.cpp >>> src/Hyprland.p/managers_eventLoop_EventLoopManager.cpp.o:(CEventLoopManager::CEventLoopManager()) ld: error: undefined symbol: timerfd_settime >>> referenced by EventLoopManager.cpp >>> src/Hyprland.p/managers_eventLoop_EventLoopManager.cpp.o:(CEventLoopManager::nudgeTimers()) See also https://github.com/freebsd/freebsd-src/commit/af93fea71038 https://github.com/netbsd/src/commit/75f1bc6655cf * deps: drop unused xcb-image after45945a3e7d$ pkg install <hyprland dependencies> $ pkg install meson jq `pkg rquery %dn wlroots` hwdata $ gmake all [...] -- Checking for modules 'xcb;xwayland;xcb-util;xcb-render;xcb-image;xcb-xfixes;xcb-icccm;xcb-composite;xcb-res;xcb-ewmh' -- Package 'xcb-image' not found CMake Error at /usr/local/share/cmake/Modules/FindPkgConfig.cmake:619 (message): The following required packages were not found: - xcb-image Call Stack (most recent call first): /usr/local/share/cmake/Modules/FindPkgConfig.cmake:841 (_pkg_check_modules_internal) CMakeLists.txt:177 (pkg_check_modules) See also https://github.com/swaywm/wlroots/commit/ae7c3f3d1c56
62 lines
2 KiB
Diff
62 lines
2 KiB
Diff
diff --git a/meson.build b/meson.build
|
|
index 1d2c7f9f..c5ef4e67 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -33,20 +33,7 @@ if cpp_compiler.check_header('execinfo.h')
|
|
add_project_arguments('-DHAS_EXECINFO', language: 'cpp')
|
|
endif
|
|
|
|
-wlroots = subproject('wlroots-hyprland', default_options: ['examples=false', 'renderers=gles2'])
|
|
-have_xwlr = wlroots.get_variable('features').get('xwayland')
|
|
-xcb_dep = dependency('xcb', required: get_option('xwayland'))
|
|
-
|
|
-cmake = import('cmake')
|
|
-udis = cmake.subproject('udis86')
|
|
-udis86 = udis.dependency('libudis86')
|
|
-
|
|
-if get_option('xwayland').enabled() and not have_xwlr
|
|
- error('Cannot enable Xwayland in Hyprland: wlroots has been built without Xwayland support')
|
|
-endif
|
|
-have_xwayland = xcb_dep.found() and have_xwlr
|
|
-
|
|
-if not have_xwayland
|
|
+if get_option('xwayland').disabled()
|
|
add_project_arguments('-DNO_XWAYLAND', language: 'cpp')
|
|
endif
|
|
|
|
@@ -69,8 +56,6 @@ if get_option('buildtype') == 'debug'
|
|
add_project_arguments('-DHYPRLAND_DEBUG', language: 'cpp')
|
|
endif
|
|
|
|
-version_h = run_command('sh', '-c', 'scripts/generateVersion.sh')
|
|
-
|
|
globber = run_command('find', 'src', '-name', '*.h*', check: true)
|
|
headers = globber.stdout().strip().split('\n')
|
|
foreach file : headers
|
|
diff --git a/src/meson.build b/src/meson.build
|
|
index 45701f5f..3505cefe 100644
|
|
--- a/src/meson.build
|
|
+++ b/src/meson.build
|
|
@@ -9,7 +9,7 @@ executable('Hyprland', src,
|
|
server_protos,
|
|
dependency('wayland-server'),
|
|
dependency('wayland-client'),
|
|
- wlroots.get_variable('wlroots'),
|
|
+ dependency('wlroots'),
|
|
dependency('cairo'),
|
|
dependency('hyprcursor'),
|
|
dependency('hyprlang', version: '>= 0.3.2'),
|
|
@@ -17,11 +17,11 @@ executable('Hyprland', src,
|
|
dependency('egl'),
|
|
dependency('xkbcommon'),
|
|
dependency('libinput'),
|
|
- xcb_dep,
|
|
+ dependency('xcb', required: get_option('xwayland')),
|
|
backtrace_dep,
|
|
epoll_dep,
|
|
systemd_dep,
|
|
- udis86,
|
|
+ dependency('udis86'),
|
|
|
|
dependency('pixman-1'),
|
|
dependency('gl', 'opengl'),
|