From 8126bc4f72d2f725e9d68be70854abab5cce2178 Mon Sep 17 00:00:00 2001 From: jeon Date: Fri, 19 Jun 2020 11:02:33 +0900 Subject: [PATCH] add dependencies for tizen extension protocols Change-Id: I40caf2ecf09cec611a3fcd1d6ae8510f16b5151d --- packaging/libds.spec | 7 +++++++ src/meson.build | 33 ++++++++++++++++++++++++++++++++- 2 files changed, 39 insertions(+), 1 deletion(-) diff --git a/packaging/libds.spec b/packaging/libds.spec index 299b6a8..0485e8a 100644 --- a/packaging/libds.spec +++ b/packaging/libds.spec @@ -12,6 +12,13 @@ BuildRequires: pkgconfig(glib-2.0) BuildRequires: pkgconfig(gmock) BuildRequires: pkgconfig(dlog) BuildRequires: pkgconfig(libtdm) +BuildRequires: pkgconfig(wayland-server) +BuildRequires: pkgconfig(tizen-extension-server) +BuildRequires: pkgconfig(text-server) +BuildRequires: pkgconfig(tizen-launch-server) +BuildRequires: pkgconfig(tizen-surface-server) +BuildRequires: pkgconfig(xdg-shell-unstable-v6-server) +BuildRequires: pkgconfig(xdg-shell-server) %description diff --git a/src/meson.build b/src/meson.build index c784f27..17f6044 100644 --- a/src/meson.build +++ b/src/meson.build @@ -40,6 +40,25 @@ libds_srcs = [ 'DSSignal/DSSignal.h', ] +libds_wayland_srcs = [ + 'DSWaylandServer/dswayland-server-wayland.cpp', + 'DSWaylandServer/dswayland-server-wayland.h', + 'DSWaylandServer/dswayland-server-tizen-extension.cpp', + 'DSWaylandServer/dswayland-server-tizen-extension.h', + 'DSWaylandServer/dswayland-server-xdg-shell-unstable-v6.cpp', + 'DSWaylandServer/dswayland-server-xdg-shell-unstable-v6.h', + 'DSWaylandServer/dswayland-server-xdg-shell.cpp', + 'DSWaylandServer/dswayland-server-xdg-shell.h', + 'DSWaylandServer/dswayland-server-tizen-surface.cpp', + 'DSWaylandServer/dswayland-server-tizen-surface.h', + 'DSWaylandServer/dswayland-server-text.cpp', + 'DSWaylandServer/dswayland-server-text.h', + 'DSWaylandServer/dswayland-server-tizen-launch.cpp', + 'DSWaylandServer/dswayland-server-tizen-launch.h', + ] + +libds_srcs += libds_wayland_srcs + install_headers( 'DSObject/DSObject.h', 'DSSignal/DSSignal.h', @@ -49,6 +68,17 @@ install_headers( pkgconfig = import('pkgconfig') dlog_dep = dependency('dlog') libtdm_dep = dependency('libtdm') +wayland_dep = dependency('wayland-server') + +tizen_ext_dep = dependency('tizen-extension-server') +xdg_shell_unstable_v6_dep = dependency('xdg-shell-unstable-v6-server') +xdg_shell_dep = dependency('xdg-shell-server') +tizen_surface_dep = dependency('tizen-surface-server') +text_dep = dependency('text-server') +tizen_launch_dep = dependency('tizen-launch-server') + +tizen_ext_deps = [tizen_ext_dep, text_dep, tizen_launch_dep, tizen_surface_dep] +tizen_ext_deps = [tizen_ext_deps, xdg_shell_unstable_v6_dep, xdg_shell_dep] libds_deps = [] libds_include_dirs = include_directories( @@ -70,12 +100,13 @@ libds_include_dirs = include_directories( './DSRender', './DSSeat', './DSSignal', + './DSWaylandServer', ) libds_lib = shared_library( 'libds', libds_srcs, - dependencies : [dlog_dep, libtdm_dep], + dependencies : [dlog_dep, libtdm_dep, wayland_dep, tizen_ext_deps], include_directories : [libds_include_dirs], version : meson.project_version(), install : true -- 2.7.4