make libds-tizen-tbm-server

change the build script for libds-tizen-tbm-server

Change-Id: I3bfa4f72ea9298d847f72d1246d0d04f575f162c

diff --git a/examples/meson.build b/examples/meson.build
index 7927407..56fcd61 100644 (file)
--- a/examples/meson.build
+++ b/examples/meson.build
@@ -1,5 +1,6 @@
 common_deps = [
   dep_libds_tizen,
+  dependency('pixman-1', required: true),
   dependency('wayland-server', required: true),
 ]
 
@@ -8,6 +9,7 @@ executable('tdm-backend',
   dependencies: [
     common_deps,
     dep_libds_tizen_backend_tdm,
+    dep_libds_tizen_tbm_server,
   ],
   install_dir: libds_tizen_bindir,
   install : true
@@ -25,6 +27,7 @@ executable('tinyds-tdm',
   dependencies: [
     common_deps,
     dep_libds_tizen_backend_tdm,
+    dep_libds_tizen_tbm_server,
     dependency('pixman-1', required: true),
     dependency('threads', required: true),
   ],

diff --git a/examples/tinyds-tdm-dpms.c b/examples/tinyds-tdm-dpms.c
index dc32e8f..ab34297 100644 (file)
--- a/examples/tinyds-tdm-dpms.c
+++ b/examples/tinyds-tdm-dpms.c
@@ -15,7 +15,7 @@
 #include <libds/xdg_shell.h>
 #include <libds-tizen/allocator/tbm.h>
 #include <libds-tizen/backend/tdm.h>
-#include <libds-tizen/tbm_server.h>
+#include <libds-tizen/tbm-server.h>
 #include <libds-tizen/dpms.h>
 
 #define USE_TDM_BUFFER_QUEUE

diff --git a/examples/tinyds-tdm-hwc.c b/examples/tinyds-tdm-hwc.c
index 46925f1..762fe07 100644 (file)
--- a/examples/tinyds-tdm-hwc.c
+++ b/examples/tinyds-tdm-hwc.c
@@ -15,7 +15,7 @@
 #include <libds/xdg_shell.h>
 #include <libds-tizen/allocator/tbm.h>
 #include <libds-tizen/backend/tdm.h>
-#include <libds-tizen/tbm_server.h>
+#include <libds-tizen/tbm-server.h>
 #include <libds-tizen/backend/tdm_output_hwc.h>
 
 #define USE_TDM_BUFFER_QUEUE

diff --git a/examples/tinyds-tdm-libinput.c b/examples/tinyds-tdm-libinput.c
index 3feb932..809f8cf 100644 (file)
--- a/examples/tinyds-tdm-libinput.c
+++ b/examples/tinyds-tdm-libinput.c
@@ -16,7 +16,7 @@
 #include <libds-tizen/allocator/tbm.h>
 #include <libds-tizen/backend/tdm.h>
 #include <libds/backend/libinput.h>
-#include <libds-tizen/tbm_server.h>
+#include <libds-tizen/tbm-server.h>
 
 #include <libds/input_device.h>
 #include <libds/keyboard.h>

diff --git a/examples/tinyds-tdm.c b/examples/tinyds-tdm.c
index 4bc08f1..57b502c 100644 (file)
--- a/examples/tinyds-tdm.c
+++ b/examples/tinyds-tdm.c
@@ -15,7 +15,7 @@
 #include <libds/xdg_shell.h>
 #include <libds-tizen/allocator/tbm.h>
 #include <libds-tizen/backend/tdm.h>
-#include <libds-tizen/tbm_server.h>
+#include <libds-tizen/tbm-server.h>
 
 #define USE_TDM_BUFFER_QUEUE
 

diff --git a/include/libds-tizen/tbm_server.h b/include/libds-tizen/tbm-server.h
similarity index 100%
rename from include/libds-tizen/tbm_server.h
rename to include/libds-tizen/tbm-server.h

diff --git a/packaging/libds-tizen.spec b/packaging/libds-tizen.spec
index 4072644..cf44015 100644 (file)
--- a/packaging/libds-tizen.spec
+++ b/packaging/libds-tizen.spec
@@ -69,6 +69,21 @@ Group:   Development/Libraries
 %description backend-tdm-devel
 TDM Display Backend Development package
 
+## libds-tizen-tbm-server
+%package tbm-server
+Summary: Library for wayland-tbm-server
+Group:   Development/Libraries
+
+%description tbm-server
+Library for tizen input devicemgr
+
+%package tbm-server-devel
+Summary: Development package for wayland-tbm-server
+Group:   Development/Libraries
+
+%description tbm-server-devel
+Development package for tizen wayland-tbm-server
+
 ## libds-tizen-keyrouter
 %package keyrouter
 Summary: Wayland Compositor Library for keyrouter
@@ -180,6 +195,20 @@ ninja -C builddir install
 %{_libdir}/pkgconfig/libds-tizen-backend-tdm.pc
 %{_libdir}/libds-tizen-backend-tdm.so
 
+%files tbm-server
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%license LICENSE
+%{_libdir}/libds-tizen-tbm-server.so.*
+
+%files tbm-server-devel
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%license LICENSE
+%{_includedir}/libds-tizen/tbm-server.h
+%{_libdir}/pkgconfig/libds-tizen-tbm-server.pc
+%{_libdir}/libds-tizen-tbm-server.so
+
 %files keyrouter
 %manifest %{name}.manifest
 %defattr(-,root,root,-)

diff --git a/src/backend/tdm/meson.build b/src/backend/tdm/meson.build
index 7d4102d..bca5bca 100644 (file)
--- a/src/backend/tdm/meson.build
+++ b/src/backend/tdm/meson.build
@@ -8,6 +8,7 @@ libds_tizen_backend_tdm_files = files(
 libds_tizen_backend_tdm_deps = [
   dep_libds_tizen,
   dep_libds_tizen_allocator_tbm,
+  dep_libds_tizen_tbm_server,
   dependency('libtdm', required: true),
   dependency('libtbm', required: true)
 ]

diff --git a/src/backend/tdm/tdm_output_hwc.c b/src/backend/tdm/tdm_output_hwc.c
index 48aef1d..e66b5fa 100644 (file)
--- a/src/backend/tdm/tdm_output_hwc.c
+++ b/src/backend/tdm/tdm_output_hwc.c
@@ -4,7 +4,7 @@
 #include <string.h>
 
 #include <libds/log.h>
-#include <libds-tizen/tbm_server.h>
+#include <libds-tizen/tbm-server.h>
 
 
 #include "tdm_internal.h"

diff --git a/src/meson.build b/src/meson.build
index 538b837..7f7447e 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,14 +1,10 @@
 libds_tizen_files = [
-  'pixel_format.c',
-  'tbm_server.c',
 ]
 
 math = meson.get_compiler('c').find_library('m')
 wayland_server = dependency('wayland-server', required: true)
-pixman = dependency('pixman-1', required: true)
-libdrm = dependency('libdrm', required: true)
-xkbcommon = dependency('xkbcommon', required: true)
 rt = meson.get_compiler('c').find_library('rt')
+xkbcommon = dependency('xkbcommon', required: true)
 
 if wayland_server.version().version_compare('>= 1.19')
   cdata.set('HAVE_WL_SEAT_ERROR_MISSING_CAPABILITY', '1')
@@ -17,8 +13,6 @@ endif
 base_deps = [
   math,
   wayland_server,
-  pixman,
-  libdrm,
   xkbcommon,
   rt,
 ]
@@ -26,9 +20,6 @@ base_deps = [
 libds_tizen_deps = [
   base_deps,
   dependency('libds', required: true),
-  dependency('libdrm', required: true),
-  dependency('libtbm', required: true),
-  dependency('wayland-tbm-server', required: true),
 ]
 
 subdir('util')
@@ -55,6 +46,7 @@ pkgconfig.generate(lib_libds_tizen,
 )
 
 subdir('allocator')
+subdir('tbm-server')
 subdir('backend')
 subdir('keyrouter')
 subdir('input-devicemgr')

diff --git a/src/tbm-server/meson.build b/src/tbm-server/meson.build
new file mode 100644 (file)
index 0000000..c83ff6c
--- /dev/null
+++ b/src/tbm-server/meson.build
@@ -0,0 +1,32 @@
+libds_tizen_tbm_server_files = [
+  'pixel_format.c',
+  'tbm-server.c',
+]
+
+libds_tizen_tbm_server_deps = [
+  dep_libds_tizen,
+  dependency('libdrm', required: true),
+  dependency('libtbm', required: true),
+  dependency('wayland-tbm-server', required: true),
+]
+
+lib_libds_tizen_tbm_server = shared_library('ds-tizen-tbm-server', libds_tizen_tbm_server_files,
+  dependencies: libds_tizen_tbm_server_deps,
+  include_directories: [ common_inc, include_directories('.'), include_directories('..') ],
+  version: meson.project_version(),
+  install: true
+)
+
+dep_libds_tizen_tbm_server = declare_dependency(
+  link_with: lib_libds_tizen_tbm_server,
+  dependencies: libds_tizen_tbm_server_deps,
+  include_directories: [ common_inc, include_directories('.') ],
+)
+
+pkgconfig = import('pkgconfig')
+pkgconfig.generate(lib_libds_tizen_tbm_server,
+  version: meson.project_version(),
+  filebase: 'libds-tizen-tbm-server',
+  name: 'libds-tizen-tbm-server',
+  description: 'wayland-tbm extension of libds-tizen for tizen platform',
+)

diff --git a/src/pixel_format.c b/src/tbm-server/pixel_format.c
similarity index 100%
rename from src/pixel_format.c
rename to src/tbm-server/pixel_format.c

diff --git a/src/pixel_format.h b/src/tbm-server/pixel_format.h
similarity index 100%
rename from src/pixel_format.h
rename to src/tbm-server/pixel_format.h

diff --git a/src/tbm_server.c b/src/tbm-server/tbm-server.c
similarity index 99%
rename from src/tbm_server.c
rename to src/tbm-server/tbm-server.c
index 0fd25cd..9dde248 100644 (file)
--- a/src/tbm_server.c
+++ b/src/tbm-server/tbm-server.c
@@ -6,7 +6,7 @@
 
 #include <libds/log.h>
 #include "pixel_format.h"
-#include "tbm_server.h"
+#include "tbm-server.h"
 
 static const struct ds_buffer_resource_interface tbm_buffer_resource_iface;
 static const struct ds_buffer_interface tbm_client_buffer_iface;

diff --git a/src/tbm_server.h b/src/tbm-server/tbm-server.h
similarity index 100%
rename from src/tbm_server.h
rename to src/tbm-server/tbm-server.h