pool/weston
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

OBS-URL: https://build.opensuse.org/package/show/X11:Wayland/weston?expand=0&rev=83

Browse Source
This commit is contained in:
Michael Vetter 2019-07-24 07:17:05 +00:00 committed by Git OBS Bridge
parent cee1c8ea03
commit 422979d546
2 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0001-build-add-missing-dep-to-x11-backend.patch
View File

@ -1,35 +0,0 @@
From 651566af2d937a8889ddda0ecc71e93b4091842a Mon Sep 17 00:00:00 2001
From: Pekka Paalanen <pekka.paalanen@collabora.com>
Date: Fri, 29 Mar 2019 13:37:56 +0200
Subject: [PATCH] build: add missing dep to x11 backend
All other backends already link to libweston, x11 backend should too.
This fixes a build failure:
[1/50] Compiling C object 'libweston/2b98b6d@@x11-backend@sha/compositor-x11.c.o'.
FAILED: libweston/2b98b6d@@x11-backend@sha/compositor-x11.c.o
cc -Ilibweston/2b98b6d@@x11-backend@sha -Ilibweston -I../../git/weston/libweston -Ilibweston/.. -I../../git/weston/libweston/.. -Ilibweston/../shared -I../../git/weston/libweston/../shared -Iprotocol -I/home/pq/local/include -I/usr/include/cairo -I/usr/include/glib-2.0 -I/usr/lib/x86_64-linux-gnu/glib-2.0/include -I/usr/include/pixman-1 -I/usr/include/uuid -I/usr/include/freetype2 -I/usr/include/libpng16 -I/usr/include/pango-1.0 -I/usr/include/fribidi -I/usr/include/harfbuzz -I/usr/include/libdrm -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -std=gnu99 -g -Wno-unused-parameter -Wno-shift-negative-value -Wno-missing-field-initializers -fvisibility=hidden -fPIC -MD -MQ 'libweston/2b98b6d@@x11-backend@sha/compositor-x11.c.o' -MF 'libweston/2b98b6d@@x11-backend@sha/compositor-x11.c.o.d' -o 'libweston/2b98b6d@@x11-backend@sha/compositor-x11.c.o' -c ../../git/weston/libweston/compositor-x11.c
../../git/weston/libweston/compositor-x11.c:51:10: fatal error: xkbcommon/xkbcommon.h: No such file or directory
#include <xkbcommon/xkbcommon.h>
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
---
libweston/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/libweston/meson.build b/libweston/meson.build
index 8b887afb..dbbf2b92 100644
--- a/libweston/meson.build
+++ b/libweston/meson.build
@@ -365,6 +365,7 @@ if get_option('backend-x11')
endif
deps_x11 = [
+ dep_libweston,
dep_x11_xcb,
dep_lib_cairo_shared,
dep_pixman,
--
2.21.0

2
weston.spec
View File

@ -12,7 +12,7 @@
# license that conforms to the Open Source Definition (Version 1.9) # license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative. # published by the Open Source Initiative.
# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Please submit bugfixes or comments via http://bugs.opensuse.org/
# #