mirror of
https://github.com/hyprwm/Hyprland.git
synced 2024-10-30 05:51:44 +00:00
subprojects: remove wlroots.wrap
This commit is contained in:
parent
e65f52bf2d
commit
e6f7724ab0
@ -8,7 +8,7 @@ CRT_REV=$(rg rev flake.nix | awk '{ print substr($3, 2, 40) }')
|
||||
if [ "$SUB_REV" != "$CRT_REV" ]; then
|
||||
echo "Updating wlroots..."
|
||||
# update wlroots to submodule revision
|
||||
sed -Ei "s/\w{40}/$SUB_REV/g" flake.nix subprojects/wlroots.wrap
|
||||
sed -Ei "s/\w{40}/$SUB_REV/g" flake.nix
|
||||
nix flake lock
|
||||
|
||||
echo "wlroots: $CRT_REV -> $SUB_REV"
|
||||
|
@ -1,45 +0,0 @@
|
||||
diff --git a/include/meson.build b/include/meson.build
|
||||
index e669800..687786b 100644
|
||||
--- a/include/meson.build
|
||||
+++ b/include/meson.build
|
||||
@@ -1,4 +1,5 @@
|
||||
-subdir('wlr')
|
||||
+run_command('ln', '-sf', join_paths(meson.project_source_root(), 'include', 'wlr'), join_paths(meson.project_source_root(), 'include', 'wlroots'), check: true)
|
||||
+subdir('wlroots')
|
||||
|
||||
exclude_files = ['meson.build', 'config.h.in', 'version.h.in']
|
||||
if not features.get('drm-backend')
|
||||
@@ -24,8 +25,8 @@ if not features.get('session')
|
||||
exclude_files += 'backend/session.h'
|
||||
endif
|
||||
|
||||
-install_subdir('wlr',
|
||||
- install_dir: get_option('includedir'),
|
||||
+install_subdir('wlroots',
|
||||
+ install_dir: join_paths(get_option('includedir'), 'hyprland'),
|
||||
exclude_files: exclude_files,
|
||||
)
|
||||
|
||||
diff --git a/include/wlr/meson.build b/include/wlr/meson.build
|
||||
index f7ca413..0a86d54 100644
|
||||
--- a/include/wlr/meson.build
|
||||
+++ b/include/wlr/meson.build
|
||||
@@ -22,4 +22,4 @@ ver_h = configure_file(
|
||||
configuration: version_data,
|
||||
)
|
||||
|
||||
-install_headers(conf_h, ver_h, subdir: 'wlr')
|
||||
+install_headers(conf_h, ver_h, subdir: join_paths('hyprland', 'wlroots'))
|
||||
diff --git a/meson.build b/meson.build
|
||||
index 29b103a..0b6e5a4 100644
|
||||
--- a/meson.build
|
||||
+++ b/meson.build
|
||||
@@ -15,7 +15,7 @@ project(
|
||||
version_major = version.split('.')[0]
|
||||
version_minor = version.split('.')[1]
|
||||
assert(version_major == '0')
|
||||
-soversion = version_minor.to_int() - 5
|
||||
+soversion = 13032
|
||||
|
||||
little_endian = target_machine.endian() == 'little'
|
||||
big_endian = target_machine.endian() == 'big'
|
@ -1,7 +0,0 @@
|
||||
[wrap-git]
|
||||
directory = wlroots
|
||||
url = https://gitlab.freedesktop.org/wlroots/wlroots.git
|
||||
revision = 00b869c1a96f300a8f25da95d624524895e0ddf2
|
||||
depth = 1
|
||||
|
||||
diff_files = wlroots-meson-build.patch
|
Loading…
Reference in New Issue
Block a user