From 23cd1b8c66da3e85692891e985567f6f45f6e501 Mon Sep 17 00:00:00 2001 From: vaxerski Date: Sun, 13 Nov 2022 11:04:28 +0000 Subject: [PATCH] update wlroots dep --- CMakeLists.txt | 2 +- Makefile | 8 ++++---- subprojects/wlroots | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8402e3ba..28ca03aa 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,7 @@ message(STATUS "Setting link libraries") target_link_libraries(Hyprland PkgConfig::deps) target_link_libraries(Hyprland - ${CMAKE_SOURCE_DIR}/subprojects/wlroots/build/libwlroots.so.11032 # wlroots is provided by us + ${CMAKE_SOURCE_DIR}/subprojects/wlroots/build/libwlroots.so.12032 # wlroots is provided by us pixman-1 OpenGL GLESv2 diff --git a/Makefile b/Makefile index 08c28674..0240ad95 100644 --- a/Makefile +++ b/Makefile @@ -131,7 +131,7 @@ all: install: make clear make fixwlr - cd ./subprojects/wlroots && meson build/ --buildtype=release && ninja -C build/ && cp ./build/libwlroots.so.11032 /usr/lib/ && cd ../.. + cd ./subprojects/wlroots && meson build/ --buildtype=release && ninja -C build/ && cp ./build/libwlroots.so.12032 /usr/lib/ && cd ../.. make protocols make release cd hyprctl && make all && cd .. @@ -151,7 +151,7 @@ install: cleaninstall: make clear make fixwlr - cd ./subprojects/wlroots && meson build/ --buildtype=release && ninja -C build/ && cp ./build/libwlroots.so.11032 /usr/lib/ && cd ../.. + cd ./subprojects/wlroots && meson build/ --buildtype=release && ninja -C build/ && cp ./build/libwlroots.so.12032 /usr/lib/ && cd ../.. make protocols make release cd hyprctl && make all && cd .. @@ -171,7 +171,7 @@ uninstall: rm -f ${PREFIX}/share/wayland-sessions/hyprland.desktop rm -f ${PREFIX}/bin/Hyprland rm -f ${PREFIX}/bin/hyprctl - rm -f /usr/lib/libwlroots.so.11032 + rm -f /usr/lib/libwlroots.so.12032 rm -rf ${PREFIX}/share/hyprland rm -f ${PREFIX}/share/man/man1/Hyprland.1 rm -f ${PREFIX}/share/man/man1/hyprctl.1 @@ -179,7 +179,7 @@ uninstall: protocols: xdg-shell-protocol.o wlr-layer-shell-unstable-v1-protocol.o wlr-screencopy-unstable-v1-protocol.o idle-protocol.o ext-workspace-unstable-v1-protocol.o pointer-constraints-unstable-v1-protocol.o tablet-unstable-v2-protocol.o wlr-output-power-management-unstable-v1-protocol.o linux-dmabuf-unstable-v1-protocol.o fixwlr: - sed -i -E 's/(soversion = 11)([^032]|$$)/soversion = 11032/g' subprojects/wlroots/meson.build + sed -i -E 's/(soversion = 12)([^032]|$$)/soversion = 12032/g' subprojects/wlroots/meson.build rm -rf ./subprojects/wlroots/build diff --git a/subprojects/wlroots b/subprojects/wlroots index c2d2773d..627a5c51 160000 --- a/subprojects/wlroots +++ b/subprojects/wlroots @@ -1 +1 @@ -Subproject commit c2d2773df57750081b16d56da13b5015d752cbd7 +Subproject commit 627a5c511278e67c3c308cdc6a639cbb490f48c3