search

danvd / wlroots-eglstreams

A modular Wayland compositor library with EGLStreams support
MIT License
105 stars 11 forks source link

Rebase upon latest upstream #40

Closed hafeoz closed 2 years ago

hafeoz commented 2 years ago

It seems wlroots had made changes to API (again) and the git version of sway refuses to build. I have manually rebased it and as far as I can tell it's working.

Current failed build output ```text + exec meson setup --prefix /usr --libexecdir lib --sbindir bin --buildtype plain --auto-features enabled --wrap-mode nodownload -D b_lto=true -D b_pie=true -Dsd-bus-provider=libsystemd -Dwerror=false sway build The Meson build system Version: 0.61.1 Source dir: /home/user/.cache/paru/clone/sway-git/src/sway Build dir: /home/user/.cache/paru/clone/sway-git/src/build Build type: native build Project name: sway Project version: 1.8-dev C compiler for the host machine: sccache cc (gcc 11.1.0 "cc (GCC) 11.1.0") C linker for the host machine: cc ld.bfd 2.36.1 Host machine cpu family: x86_64 Host machine cpu: x86_64 Neither a subproject directory nor a wlroots.wrap file was found. Subproject wlroots is buildable: NO (disabling) Found pkg-config: /usr/bin/pkg-config (1.8.0) Run-time dependency json-c found: YES 0.15 Run-time dependency libpcre found: YES 8.45 Run-time dependency wayland-server found: YES 1.20.0 Run-time dependency wayland-client found: YES 1.20.0 Run-time dependency wayland-cursor found: YES 1.20.0 Run-time dependency wayland-egl found: YES 18.1.0 Run-time dependency wayland-protocols found: YES 1.24 Run-time dependency wlroots found: YES 0.16.0 Run-time dependency xkbcommon found: YES 1.3.1 Run-time dependency cairo found: YES 1.17.4 Run-time dependency pango found: YES 1.50.3 Run-time dependency pangocairo found: YES 1.50.3 Run-time dependency gdk-pixbuf-2.0 found: YES 2.42.6 Run-time dependency pixman-1 found: YES 0.40.0 Run-time dependency glesv2 found: YES 3.2 Run-time dependency libevdev found: YES 1.12.0 Run-time dependency libinput found: YES 1.19.3 Run-time dependency xcb found: YES 1.14 Run-time dependency libdrm found: YES 2.4.109 Run-time dependency libudev found: YES 250 Run-time dependency bash-completion found: YES 2.11 Run-time dependency fish found: YES 3.3.1 Library m found: YES Library rt found: YES Run-time dependency libsystemd found: YES 250 Found pkg-config: /usr/bin/pkg-config (1.8.0) Build-time dependency scdoc found: YES 1.11.2 Program /usr/bin/scdoc found: YES (/usr/bin/scdoc) Program git found: YES (/usr/bin/git) Compiler for C supports arguments -fmacro-prefix-map=/prefix/to/hide=: YES Configuring config.h using configuration Build-time dependency wayland-scanner found: YES 1.20.0 Program /usr/bin/wayland-scanner found: YES (/usr/bin/wayland-scanner) Configuring config using configuration Build targets in project: 40 sway 1.8-dev xwayland : YES gdk-pixbuf : YES tray : YES man-pages : YES Subprojects wlroots : NO Neither a subproject directory nor a wlroots.wrap file was found. User defined options auto_features : enabled buildtype : plain libexecdir : lib prefix : /usr sbindir : bin werror : false wrap_mode : nodownload b_lto : true b_pie : true sd-bus-provider: libsystemd Found ninja-1.10.2 at /usr/bin/ninja ninja: Entering directory `/home/user/.cache/paru/clone/sway-git/src/build' [68/283] Compiling C object sway/sway.p/server.c.o FAILED: sway/sway.p/server.c.o sccache cc -Isway/sway.p -Isway -I../sway/sway -Iinclude -I../sway/include -Iprotocols -I/usr/include/cairo -I/usr/include/lzo -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/sysprof-4 -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/json-c -I/usr/include/libevdev-1.0 -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -flto=auto -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -DWLR_USE_UNSTABLE -Wno-unused-parameter -Wno-unused-result -Wno-missing-braces -Wundef -Wvla '-DSYSCONFDIR="//etc"' '-DSWAY_VERSION="1.8-dev-b4fd4bca (" __DATE__ ", branch '"'"'master'"'"')"' -fmacro-prefix-map=../sway/= -march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fstack-clash-protection -fcf-protection -g -fvar-tracking-assignments -fdebug-prefix-map=/home/user/.cache/paru/clone/sway-git/src=/usr/src/debug -fPIE -pthread -MD -MQ sway/sway.p/server.c.o -MF sway/sway.p/server.c.o.d -o sway/sway.p/server.c.o -c ../sway/sway/server.c ../sway/sway/server.c:27:10: fatal error: wlr/types/wlr_subcompositor.h: No such file or directory 27 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. [70/283] Compiling C object sway/sway.p/desktop_layer_shell.c.o FAILED: sway/sway.p/desktop_layer_shell.c.o sccache cc -Isway/sway.p -Isway -I../sway/sway -Iinclude -I../sway/include -Iprotocols -I/usr/include/cairo -I/usr/include/lzo -I/usr/include/libpng16 -I/usr/include/freetype2 -I/usr/include/harfbuzz -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/sysprof-4 -I/usr/include/pixman-1 -I/usr/include/libdrm -I/usr/include/json-c -I/usr/include/libevdev-1.0 -I/usr/include/pango-1.0 -I/usr/include/libmount -I/usr/include/blkid -I/usr/include/fribidi -flto=auto -fdiagnostics-color=always -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=c11 -DWLR_USE_UNSTABLE -Wno-unused-parameter -Wno-unused-result -Wno-missing-braces -Wundef -Wvla '-DSYSCONFDIR="//etc"' '-DSWAY_VERSION="1.8-dev-b4fd4bca (" __DATE__ ", branch '"'"'master'"'"')"' -fmacro-prefix-map=../sway/= -march=x86-64 -mtune=generic -O2 -pipe -fno-plt -fexceptions -Wp,-D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -fstack-clash-protection -fcf-protection -g -fvar-tracking-assignments -fdebug-prefix-map=/home/user/.cache/paru/clone/sway-git/src=/usr/src/debug -fPIE -pthread -MD -MQ sway/sway.p/desktop_layer_shell.c.o -MF sway/sway.p/desktop_layer_shell.c.o.d -o sway/sway.p/desktop_layer_shell.c.o -c ../sway/sway/desktop/layer_shell.c ../sway/sway/desktop/layer_shell.c:8:10: fatal error: wlr/types/wlr_subcompositor.h: No such file or directory 8 | #include | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. [85/283] Compiling C object sway/sway.p/input_cursor.c.o ninja: build stopped: subcommand failed. ```
hafeoz commented 2 years ago

this is the repo I used to merge commits

danvd commented 2 years ago

Hi @hafeoz! Thanks for PR. Wouldn't you mind if I push a force rebase as usual? Merging this PR will mean that original wlroots history will be hidden inside new commit, but I'd like to keep all changes in a single blob on the top of the stack to make future rebases more or less simple.

danvd commented 2 years ago

Just rebased and cleaned up some unneeded code. Thanks, @hafeoz!