meson wrap

.build.yml

@@ -15,13 +15,7 @@ packages:
   - libxkbcommon
 sources:
   - https://git.sr.ht/~sircmpwn/sway
-  - https://git.sr.ht/~sircmpwn/wlroots
 tasks:
-  - wlroots: |
-      cd wlroots
-      meson --prefix=/usr build
-      ninja -C build
-      sudo ninja -C build install
   - setup: |
       cd sway
       meson build

.gitignore

@@ -8,3 +8,4 @@ build/
 .lvimrc
 config-debug
 wayland-*-protocol.*
+subprojects/wlroots/

.travis.yml

@@ -26,8 +26,6 @@ arch:
     - libinput
     - libxkbcommon
   script:
-    - git clone https://github.com/swaywm/wlroots
-    - 'cd wlroots && meson --prefix=/usr build && ninja -C build && sudo ninja -C build install'
     - meson build --buildtype=$BUILD_TYPE
     - ninja -C build
 

common/meson.build

@@ -1,3 +1,7 @@
+sway_common_deps = [
+	wlroots
+]
+
 lib_sway_common = static_library('sway-common',
 	files(
 		'log.c',
@@ -7,5 +11,6 @@ lib_sway_common = static_library('sway-common',
 		'readline.c',
 		'ipc-client.c'
 	),
-	include_directories: sway_inc
+	include_directories: sway_inc,
+	dependencies: [sway_common_deps]
 )

meson.build

@@ -20,7 +20,7 @@ prefix = get_option('prefix')
 
 jsonc          = dependency('json-c', version: '>=0.12.1')
 pcre           = dependency('libpcre')
-wlroots        = dependency('wlroots')
+wlroots        = dependency('wlroots', fallback: ['wlroots', 'wlroots'])
 wayland_server = dependency('wayland-server')
 wayland_client = dependency('wayland-client')
 wayland_egl    = dependency('wayland-egl')

subprojects/wlroots.wrap

@@ -0,0 +1,4 @@
+[wrap-git]
+directory=wlroots
+url=https://github.com/swaywm/wlroots.git
+revision=head