external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-23 20:35:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

cairo: drop all remaining references to cairo

Browse source 
We now use pixman (and freetype + fontconfig) exclusively.
This commit is contained in:
Daniel Eklöf 2019-09-22 11:52:37 +02:00
parent 01e71590e0
commit 4ce314e328
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
5 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PKGBUILD
View file

@ -9,7 +9,7 @@ makedepends=('meson' 'ninja' 'scdoc')
depends=( depends=(
'libxcb' 'xcb-util' 'xcb-util-cursor' 'xcb-util-wm' 'libxcb' 'xcb-util' 'xcb-util-cursor' 'xcb-util-wm'
'wayland' 'wlroots' 'wayland' 'wlroots'
'freetype2' 'fontconfig' 'cairo' 'freetype2' 'fontconfig' 'pixman'
'libyaml' 'libyaml'
'alsa-lib' 'alsa-lib'
'libudev.so' 'libudev.so'

2
PKGBUILD.wayland-only
View file

@ -10,7 +10,7 @@ provides=('f00bar')
makedepends=('meson' 'ninja' 'scdoc') makedepends=('meson' 'ninja' 'scdoc')
depends=( depends=(
'wayland' 'wlroots' 'wayland' 'wlroots'
'freetype2' 'fontconfig' 'cairo' 'freetype2' 'fontconfig' 'pixman'
'libyaml' 'libyaml'
'alsa-lib' 'alsa-lib'
'libudev.so' 'libudev.so'

5
bar/meson.build
View file

@ -1,8 +1,7 @@
bar_backends = [] bar_backends = []
if backend_x11 if backend_x11
bar_x11 = declare_dependency( bar_x11 = declare_dependency(sources: ['xcb.c', 'xcb.h'], dependencies: [xcb_stuff])
sources: ['xcb.c', 'xcb.h'], dependencies: [xcb_stuff, cairo, cairo_ft])
bar_backends += [bar_x11] bar_backends += [bar_x11]
endif endif
@ -37,7 +36,7 @@ if backend_wayland
bar_wayland = declare_dependency( bar_wayland = declare_dependency(
sources: ['wayland.c', 'wayland.h'] + wl_proto_src + wl_proto_headers, 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] bar_backends += [bar_wayland]
endif endif

3
bar/wayland.c
View file

@ -10,7 +10,6 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <linux/memfd.h> #include <linux/memfd.h>
//#include <cairo.h>
#include <pixman.h> #include <pixman.h>
#include <wayland-client.h> #include <wayland-client.h>
#include <wayland-cursor.h> #include <wayland-cursor.h>
@ -697,7 +696,7 @@ setup(struct bar *_bar)
//wl_surface_commit(backend->surface); //wl_surface_commit(backend->surface);
//wl_display_roundtrip(backend->display); //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); backend->next_buffer = get_buffer(backend);
assert(backend->next_buffer != NULL && backend->next_buffer->busy); assert(backend->next_buffer != NULL && backend->next_buffer->busy);
bar->pix = backend->next_buffer->pix; bar->pix = backend->next_buffer->pix;

10
meson.build
View file

@ -39,8 +39,6 @@ threads = dependency('threads')
freetype = dependency('freetype2') freetype = dependency('freetype2')
fontconfig = dependency('fontconfig') fontconfig = dependency('fontconfig')
pixman = dependency('pixman-1') pixman = dependency('pixman-1')
cairo = dependency('cairo')
cairo_ft = dependency('cairo-ft')
yaml = dependency('yaml-0.1') yaml = dependency('yaml-0.1')
# X11/XCB dependencies # 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_ewmh = dependency('xcb-ewmh', required: get_option('backend-x11'))
xcb_randr = dependency('xcb-randr', 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')) 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) xcb_errors = dependency('xcb-errors', required: false)
backend_x11 = xcb_aux.found() and xcb_cursor.found() and xcb_event.found() and \ 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 \ xcb_ewmh.found() and xcb_randr.found() and xcb_render.found()
cairo_xcb.found()
# Wayland dependencies # Wayland dependencies
wayland_client = dependency('wayland-client', required: get_option('backend-wayland')) wayland_client = dependency('wayland-client', required: get_option('backend-wayland'))
@ -76,7 +72,7 @@ if backend_x11
xcb_stuff_lib = static_library( xcb_stuff_lib = static_library(
'xcb-stuff', 'xcb.c', 'xcb.h', 'xcb-stuff', 'xcb.c', 'xcb.h',
dependencies: [xcb_aux, xcb_cursor, xcb_event, xcb_ewmh, xcb_randr, 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' : [], c_args: xcb_errors.found() ? '-DHAVE_XCB_ERRORS' : [],
pic: plugs_as_libs) pic: plugs_as_libs)
@ -106,7 +102,7 @@ f00bar = executable(
'tag.c', 'tag.h', 'tag.c', 'tag.h',
'tllist.h', 'tllist.h',
'yml.c', 'yml.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, decorations + particles + modules,
build_rpath: '$ORIGIN/modules:$ORIGIN/decorations:$ORIGIN/particles', build_rpath: '$ORIGIN/modules:$ORIGIN/decorations:$ORIGIN/particles',
export_dynamic: true, export_dynamic: true,