diff --git a/PKGBUILD b/PKGBUILD index 682836d..c382108 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ makedepends=('meson' 'ninja' 'scdoc') depends=( 'libxcb' 'xcb-util' 'xcb-util-cursor' 'xcb-util-wm' 'wayland' 'wlroots' - 'freetype2' 'fontconfig' 'cairo' + 'freetype2' 'fontconfig' 'pixman' 'libyaml' 'alsa-lib' 'libudev.so' diff --git a/PKGBUILD.wayland-only b/PKGBUILD.wayland-only index 7efdcc3..e8c9579 100644 --- a/PKGBUILD.wayland-only +++ b/PKGBUILD.wayland-only @@ -10,7 +10,7 @@ provides=('f00bar') makedepends=('meson' 'ninja' 'scdoc') depends=( 'wayland' 'wlroots' - 'freetype2' 'fontconfig' 'cairo' + 'freetype2' 'fontconfig' 'pixman' 'libyaml' 'alsa-lib' 'libudev.so' diff --git a/bar/meson.build b/bar/meson.build index c3b766f..ce8e81c 100644 --- a/bar/meson.build +++ b/bar/meson.build @@ -1,8 +1,7 @@ bar_backends = [] if backend_x11 - bar_x11 = declare_dependency( - sources: ['xcb.c', 'xcb.h'], dependencies: [xcb_stuff, cairo, cairo_ft]) + bar_x11 = declare_dependency(sources: ['xcb.c', 'xcb.h'], dependencies: [xcb_stuff]) bar_backends += [bar_x11] endif @@ -37,7 +36,7 @@ if backend_wayland bar_wayland = declare_dependency( sources: ['wayland.c', 'wayland.h'] + wl_proto_src + wl_proto_headers, - dependencies: [wayland_client, wayland_cursor, cairo, cairo_ft]) + dependencies: [wayland_client, wayland_cursor]) bar_backends += [bar_wayland] endif diff --git a/bar/wayland.c b/bar/wayland.c index a8d14c9..a5be23e 100644 --- a/bar/wayland.c +++ b/bar/wayland.c @@ -10,7 +10,6 @@ #include #include -//#include #include #include #include @@ -697,7 +696,7 @@ setup(struct bar *_bar) //wl_surface_commit(backend->surface); //wl_display_roundtrip(backend->display); - /* Prepare a buffer + cairo context for bar to draw to */ + /* Prepare a buffer + pixman image for bar to draw to */ backend->next_buffer = get_buffer(backend); assert(backend->next_buffer != NULL && backend->next_buffer->busy); bar->pix = backend->next_buffer->pix; diff --git a/meson.build b/meson.build index f1014a7..6849c31 100644 --- a/meson.build +++ b/meson.build @@ -39,8 +39,6 @@ threads = dependency('threads') freetype = dependency('freetype2') fontconfig = dependency('fontconfig') pixman = dependency('pixman-1') -cairo = dependency('cairo') -cairo_ft = dependency('cairo-ft') yaml = dependency('yaml-0.1') # X11/XCB dependencies @@ -50,11 +48,9 @@ xcb_event = dependency('xcb-event', required: get_option('backend-x11')) xcb_ewmh = dependency('xcb-ewmh', required: get_option('backend-x11')) xcb_randr = dependency('xcb-randr', required: get_option('backend-x11')) xcb_render = dependency('xcb-render', required: get_option('backend-x11')) -cairo_xcb = dependency('cairo-xcb', required: get_option('backend-x11')) xcb_errors = dependency('xcb-errors', required: false) backend_x11 = xcb_aux.found() and xcb_cursor.found() and xcb_event.found() and \ - xcb_ewmh.found() and xcb_randr.found() and xcb_render.found() and \ - cairo_xcb.found() + xcb_ewmh.found() and xcb_randr.found() and xcb_render.found() # Wayland dependencies wayland_client = dependency('wayland-client', required: get_option('backend-wayland')) @@ -76,7 +72,7 @@ if backend_x11 xcb_stuff_lib = static_library( 'xcb-stuff', 'xcb.c', 'xcb.h', dependencies: [xcb_aux, xcb_cursor, xcb_event, xcb_ewmh, xcb_randr, - xcb_render, cairo_xcb, xcb_errors], + xcb_render, xcb_errors], c_args: xcb_errors.found() ? '-DHAVE_XCB_ERRORS' : [], pic: plugs_as_libs) @@ -106,7 +102,7 @@ f00bar = executable( 'tag.c', 'tag.h', 'tllist.h', 'yml.c', 'yml.h', - dependencies: [bar, freetype, fontconfig, pixman, cairo, cairo_ft, yaml, threads, dl] + + dependencies: [bar, freetype, fontconfig, pixman, yaml, threads, dl] + decorations + particles + modules, build_rpath: '$ORIGIN/modules:$ORIGIN/decorations:$ORIGIN/particles', export_dynamic: true,