* remove libsystemd dependency
as per Lennart Poettering's advice:
https://github.com/systemd/systemd/issues/32028#issuecomment-2031366922
* fix naming for systemd helper functions
* rename vars according to code style
* Nix: update meson patch
---------
Co-authored-by: Mihai Fufezan <mihai@fufexan.net>
* deps: add epoll-shim for some BSDs after 863c7b6072
ld: 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/af93fea71038https://github.com/netbsd/src/commit/75f1bc6655cf
* deps: drop unused xcb-image after 45945a3e7d
$ 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
* remove unnecessary include
* cmake: use pkg_get_variable
We can find wayland-scanner executable and wayland-protocols dir by
taking advantage of this function, so no need to use find_program or
manually call pkgconf executable.
* cmake: remove explicit rdynamic option
CMAKE_ENABLE_EXPORTS=ON already implies rdynamic so it's redundant to
set the latter explicitly.
Also, CMAKE_ENABLE_EXPORTS is superseded by
CMAKE_EXECUTABLE_ENABLE_EXPORTS in cmake 3.27.
* cmake: make xcb-errors dep optional
xcb-errors is being used in wlroots, where it's optional. So make it
optional in hyprland as well
While not explicitly mentioned by the cmake documentation, cmake
upstream seems to think of None as a vaild CMAKE_BUILD_TYPE. [1]
Handle it properly by mapping it to meson's empty.
[1]: ce1cadd35a
* Fix error building without CMAKE_BUILD_TYPE being set
This resolves the error building without a CMAKE_BUILD_TYPE.
CMake Error at CMakeLists.txt:36 (string):
string no output variable specified
* CMake: convert CMake's build type to meson build type
Fix error when the CMAKE_BUILD_TYPE variable isn't set & properly convert the build type to mesons build type.
* cmake: unbreak on non-GNU after 474ada9267
CMake Error at CMakeLists.txt:121 (target_link_libraries):
The keyword signature for target_link_libraries has already been used with
the target "Hyprland". All uses of target_link_libraries with a target
must be either all-keyword or all-plain.
The uses of the keyword signature are here:
* CMakeLists.txt:107 (target_link_libraries)
Fixes https://github.com/hyprwm/Hyprland/issues/1780
* cmake: always link with dependencies via imported targets
On BSD systems base compiler by default only looks for headers and
libraries from base system. For dependencies from packages extra flags
are necessary.
ld: error: unable to find library -lxcb
ld: error: unable to find library -lpixman-1
ld: error: unable to find library -lOpenGL
ld: error: unable to find library -lGLESv2
* make: use same make in recursive calls
On BSDs `make` is BSD make while `gmake` is GNU make
* make: work around GNU vs. BSD sed -i incompatibility
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=254091
* make: replace GNU make extension with POSIX sh
`$(shell ...)` in GNU make is similar to `${:!..!}` in BSD make
* make: fall back when nproc isn't available
Only FreeBSD added nproc for compatibility with Linux.
* make: unbreak hyprctl on Clang-based systems
/bin/sh: g++: not found
error: invalid value 'c++23' in '-std=c++23'
* make: create lib/ before copying libwlroots.so there
$ make install PREFIX=/tmp/test
[...]
cp: directory /tmp/test/lib does not exist
* make: pass cp(1) flags before arguments
cp: -f is not a directory
* make: replace install -Dt with mkdir
install: illegal option -- t
* make: replace cp --parents with cpio -dump
cp: illegal option -- -
* make: limit pkg-config workaround to Linux when run as root
/usr/share/pkgconfig doesn't exist on BSDs or may not be writable.
* Refactor CMake and Make file
- modernize CMake a bit
- "unscreamify" CMake commands
- replace undocumented CMake option -H by -S in Makefile
- remove unnecessary "cd" in Makefile
* Fix include path to wlroots generated header files
* add systemd support
motivation for this is is proper ordering of related/bound/required
services to Hyprland (e.g. swaybg) that would need to have a compositor
ready.
this could possibly be a build-time option of course.
see also:
example/ files for example of services
Signed-off-by: Paymon MARANDI <darwinskernel@gmail.com>
* nix: add withSystemd flag
Signed-off-by: Paymon MARANDI <darwinskernel@gmail.com>
Co-authored-by: Mihai Fufezan <fufexan@protonmail.com>
Co-authored-by: Vaxerski <vaxry@vaxry.net>
