make libds-tizen-allocator-tbm

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

Change-Id: I7dd36d43879e2708f4ead2545849954355f721d2

diff --git a/packaging/libds-tizen.spec b/packaging/libds-tizen.spec
index 99b47ae..13c2be3 100644 (file)
--- a/packaging/libds-tizen.spec
+++ b/packaging/libds-tizen.spec
@@ -39,6 +39,21 @@ Requires:   %{name} = %{version}-%{release}
 %description devel
 Development package of Wayland Compositor Library for Tizen
 
+## libds-tizen-allocator-tbm
+%package allocator-tbm
+Summary: Allocator Library with TBM
+Group:   Development/Libraries
+
+%description allocator-tbm
+Allocator Library with TBM
+
+%package allocator-tbm-devel
+Summary: TBM Allocator Development package
+Group:   Development/Libraries
+
+%description allocator-tbm-devel
+TBM Allocator Development package
+
 ## libds-tizen-backend-tdm
 %package backend-tdm
 Summary: Display Backend Library with TDM
@@ -121,6 +136,20 @@ ninja -C builddir install
 %{_bindir}/tinyds-tdm-libinput
 %{_bindir}/input-generator
 
+%files allocator-tbm
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%license LICENSE
+%{_libdir}/libds-tizen-allocator-tbm.so.*
+
+%files allocator-tbm-devel
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%license LICENSE
+%{_includedir}/libds-tizen/allocator/tbm.h
+%{_libdir}/pkgconfig/libds-tizen-allocator-tbm.pc
+%{_libdir}/libds-tizen-allocator-tbm.so
+
 %files backend-tdm
 %manifest %{name}.manifest
 %defattr(-,root,root,-)

diff --git a/src/allocator/meson.build b/src/allocator/meson.build
index fe869bd..ddc6385 100644 (file)
--- a/src/allocator/meson.build
+++ b/src/allocator/meson.build
@@ -1,2 +1 @@
-libds_tizen_files += files('tbm.c')
-libds_tizen_deps += dependency('libtbm', required: true)
+subdir('tbm')

diff --git a/src/allocator/tbm/meson.build b/src/allocator/tbm/meson.build
new file mode 100644 (file)
index 0000000..b2ee630
--- /dev/null
+++ b/src/allocator/tbm/meson.build
@@ -0,0 +1,29 @@
+libds_tizen_allocator_tbm_files = files(
+  'tbm.c',
+)
+
+libds_tizen_allocator_tbm_deps = [
+  dep_libds_tizen,
+  dependency('libtbm', required: true)
+]
+
+lib_libds_tizen_allocator_tbm = shared_library('ds-tizen-allocator-tbm', libds_tizen_allocator_tbm_files,
+  dependencies: libds_tizen_allocator_tbm_deps,
+  include_directories: [ include_directories('/usr/include'), common_inc, include_directories('.'), include_directories('..')],
+  version: meson.project_version(),
+  install: true
+)
+
+dep_libds_tizen_allocator_tbm = declare_dependency(
+  link_with: lib_libds_tizen_allocator_tbm,
+  dependencies: libds_tizen_allocator_tbm_deps,
+  include_directories: [ common_inc, include_directories('.') ],
+)
+
+pkgconfig = import('pkgconfig')
+pkgconfig.generate(lib_libds_tizen_allocator_tbm,
+  version: meson.project_version(),
+  filebase: 'libds-tizen-allocator-tbm',
+  name: 'libds-tizen-allocator-tbm',
+  description: 'tbm allocator of libds-tizen for tizen platform',
+)
\ No newline at end of file

diff --git a/src/allocator/tbm.c b/src/allocator/tbm/tbm.c
similarity index 99%
rename from src/allocator/tbm.c
rename to src/allocator/tbm/tbm.c
index 0d00793..89591c4 100644 (file)
--- a/src/allocator/tbm.c
+++ b/src/allocator/tbm/tbm.c
@@ -1,7 +1,6 @@
 #include <assert.h>
 #include <stdlib.h>
 
-#include <drm_fourcc.h>
 #include <wayland-server.h>
 #include <tbm_bufmgr.h>
 #include <tbm_surface.h>

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

diff --git a/src/backend/tdm/output.c b/src/backend/tdm/output.c
index c9ad137..1baefd2 100644 (file)
--- a/src/backend/tdm/output.c
+++ b/src/backend/tdm/output.c
@@ -1,11 +1,10 @@
 #include <assert.h>
 #include <stdlib.h>
-
 #include <tbm_surface.h>
 
 #include <libds/log.h>
-#include "libds-tizen/allocator/tbm.h"
 
+#include "libds-tizen/allocator/tbm.h"
 #include "tdm_internal.h"
 #include "tdm_output_hwc.h"
 #include "tdm_buffer_queue.h"

diff --git a/src/meson.build b/src/meson.build
index 7b61b9a..49dcc09 100644 (file)
--- a/src/meson.build
+++ b/src/meson.build
@@ -33,7 +33,6 @@ libds_tizen_deps = [
   dependency('tizen-dpms-server', required: true),
 ]
 
-subdir('allocator')
 subdir('util')
 
 lib_libds_tizen = shared_library('ds-tizen', libds_tizen_files,
@@ -57,6 +56,7 @@ pkgconfig.generate(lib_libds_tizen,
   description: 'extension of libds for tizen platform',
 )
 
+subdir('allocator')
 subdir('backend')
 subdir('keyrouter')
 subdir('input-devicemgr')