Merge branch 'freebsd-step1'

bar/wayland.c

@@ -9,7 +9,9 @@
 #include <pthread.h>
 
 #include <sys/mman.h>
+#ifdef __linux__
 #include <linux/memfd.h>
+#endif
 #include <linux/input-event-codes.h>
 
 #include <pixman.h>

main.c

@@ -374,7 +374,7 @@ main(int argc, char *const *argv)
     }
 
     if (aborted)
-        LOG_INFO("aborted: %s (%d)", strsignal(aborted), aborted);
+        LOG_INFO("aborted: %s (%ld)", strsignal(aborted), (long)aborted);
 
 done:
     /* Signal abort to other threads */

meson.build

@@ -43,7 +43,9 @@ endif
 # Common dependencies
 dl = cc.find_library('dl')
 m = cc.find_library('m')
-threads = dependency('threads')
+threads = [dependency('threads'), cc.find_library('stdthreads', required: false)]
+libepoll = dependency('epoll-shim', required: false)
+libinotify = dependency('libinotify', required: false)
 pixman = dependency('pixman-1')
 yaml = dependency('yaml-0.1')
 
@@ -117,7 +119,7 @@ yambar = executable(
   'tag.c', 'tag.h',
   'yml.c', 'yml.h',
   version,
-  dependencies: [bar, pixman, yaml, threads, dl, tllist, fcft] +
+  dependencies: [bar, libepoll, libinotify,  pixman, yaml, threads, dl, tllist, fcft] +
                 decorations + particles + modules,
   c_args: [plugin_mpd_enabled? '-DPLUGIN_ENABLED_MPD':[]],
   build_rpath: '$ORIGIN/modules:$ORIGIN/decorations:$ORIGIN/particles',

modules/script.c

@@ -4,6 +4,7 @@
 #include <errno.h>
 #include <assert.h>
 #include <unistd.h>
+#include <libgen.h>
 
 #include <poll.h>
 #include <fcntl.h>

modules/xwindow.c

@@ -4,6 +4,7 @@
 #include <assert.h>
 #include <unistd.h>
 #include <threads.h>
+#include <libgen.h>
 
 #include <sys/stat.h>
 #include <fcntl.h>

particle.c

@@ -5,6 +5,7 @@
 #include <unistd.h>
 #include <assert.h>
 #include <errno.h>
+#include <signal.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>