[Pkg] update dependency to nns library

Update pkg dependency to nnstreamer library.

Signed-off-by: Jaeyun Jung <jy1210.jung@samsung.com>

diff --git a/c/meson.build b/c/meson.build
index e21a0f8..81881aa 100644 (file)
--- a/c/meson.build
+++ b/c/meson.build
@@ -8,33 +8,28 @@ endif
 
 # Dependencies
 nns_capi_common_deps = [glib_dep, gmodule_dep, nnstreamer_single_dep]
-nns_capi_deps = [nnstreamer_dep, glib_dep, gmodule_dep, gio_dep, gst_dep, gst_app_dep]
+nns_capi_deps = [nnstreamer_dep, gst_dep, gst_app_dep]
 
 if (get_option('enable-tizen'))
   message('C-API is in Tizen mode')
 
-  tizen_deps = [
-    dependency('dlog')
-  ]
+  nns_capi_common_deps += dependency('dlog')
 
   if get_option('enable-tizen-privilege-check')
-    tizen_deps += dependency('dpm')
+    nns_capi_deps += dependency('dpm')
     if ((tizenVmajor < 7) or (tizenVmajor == 7 and tizenVminor < 5))
-      tizen_deps += dependency('capi-privacy-privilege-manager')
+      nns_capi_deps += dependency('capi-privacy-privilege-manager')
     endif
-    tizen_deps += dependency('mm-camcorder')
 
+    nns_capi_deps += dependency('mm-camcorder')
     if (tizenVmajor >= 5)
-      tizen_deps += dependency('mm-resource-manager')
+      nns_capi_deps += dependency('mm-resource-manager')
     endif
   endif
 
   if get_option('enable-tizen-feature-check')
-    tizen_deps += dependency('capi-system-info')
+    nns_capi_common_deps += dependency('capi-system-info')
   endif
-
-  nns_capi_deps += tizen_deps
-  nns_capi_common_deps += tizen_deps
 endif
 
 subdir('include')
@@ -42,7 +37,7 @@ subdir('src')
 
 ml_inf_conf = configuration_data()
 ml_inf_conf.merge_from(api_conf)
-ml_inf_conf.set('ML_INFERENCE_REQUIRE', 'capi-ml-inference-single')
+ml_inf_conf.set('ML_INFERENCE_REQUIRE', 'nnstreamer capi-ml-inference-single')
 configure_file(input: 'capi-ml-inference.pc.in', output: 'capi-ml-inference.pc',
   install_dir: join_paths(api_install_libdir, 'pkgconfig'),
   configuration: ml_inf_conf
@@ -68,11 +63,7 @@ endif
 
 ml_common_api_conf = configuration_data()
 ml_common_api_conf.merge_from(api_conf)
-if get_option('enable-tizen')
-  ml_common_api_conf.set('ML_COMMON_REQUIRE', 'capi-base-common')
-else
-  ml_common_api_conf.set('ML_COMMON_REQUIRE', '')
-endif
+ml_common_api_conf.set('ML_COMMON_REQUIRE', 'nnstreamer-single')
 configure_file(input: 'capi-ml-common.pc.in', output: 'capi-ml-common.pc',
   install_dir: join_paths(api_install_libdir, 'pkgconfig'),
   configuration: ml_common_api_conf

diff --git a/c/src/meson.build b/c/src/meson.build
index 62746ee..bbd3144 100644 (file)
--- a/c/src/meson.build
+++ b/c/src/meson.build
@@ -1,21 +1,21 @@
 nns_capi_common_srcs = files('ml-api-common.c', 'ml-api-inference-internal.c')
+nns_capi_single_srcs = files('ml-api-inference-single.c')
+nns_capi_pipeline_srcs = files('ml-api-inference-pipeline.c')
+nns_capi_service_srcs = files('ml-api-service-common.c', 'ml-api-service-agent-client.c', 'ml-api-service-query-client.c')
+if support_remote_service
+  nns_capi_service_srcs += files('ml-api-service-remote.c')
+endif
+
 if get_option('enable-tizen')
   if get_option('enable-tizen-feature-check')
     nns_capi_common_srcs += files('ml-api-common-tizen-feature-check.c')
   endif
 
   if get_option('enable-tizen-privilege-check')
-    nns_capi_common_srcs += files('ml-api-inference-tizen-privilege-check.c')
+    nns_capi_pipeline_srcs += files('ml-api-inference-tizen-privilege-check.c')
   endif
 endif
 
-nns_capi_single_srcs = files('ml-api-inference-single.c')
-nns_capi_pipeline_srcs = files('ml-api-inference-pipeline.c')
-nns_capi_service_srcs = files('ml-api-service-common.c','ml-api-service-agent-client.c', 'ml-api-service-query-client.c')
-if support_remote_service
-  nns_capi_service_srcs += files('ml-api-service-remote.c')
-endif
-
 # Build ML-API Common Lib First.
 nns_capi_common_shared_lib = shared_library ('capi-ml-common',
   nns_capi_common_srcs,

diff --git a/debian/control b/debian/control
index 90c85b8..2315727 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -13,13 +13,13 @@ Homepage: https://github.com/nnstreamer/api
 Package: ml-api-common
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: nnstreamer-single, ${shlibs:Depends}, ${misc:Depends}
 Description: Common utility functions for Machine Learning API
 
 Package: ml-api-common-dev
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ml-api-common, ${shlibs:Depends}, ${misc:Depends}
 Description: Machine Learning API common
  Provides headers commonly used across API, such as error definitions.
  This is a development package for ML API.
@@ -27,7 +27,7 @@ Description: Machine Learning API common
 Package: ml-inference-single-api
 Architecture: any
 Multi-Arch: same
-Depends: nnstreamer-single, ml-api-common, ${shlibs:Depends}, ${misc:Depends}
+Depends: ml-api-common, ${shlibs:Depends}, ${misc:Depends}
 Description: Machine Learning Inference Single API
  This package provides native API invoke individual input frame with NNStreamer.
 
@@ -41,7 +41,7 @@ Description: Development package for Machine Learning Inference API
 Package: ml-inference-api
 Architecture: any
 Multi-Arch: same
-Depends: ml-inference-single-api, ${shlibs:Depends}, ${misc:Depends}
+Depends: nnstreamer, ml-inference-single-api, ${shlibs:Depends}, ${misc:Depends}
 Description: Machine Learning Inference API
  This package provides native API set to easily construct a data stream pipeline with neural networks.
 

diff --git a/meson.build b/meson.build
index 0223fad..e904d9a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -28,7 +28,6 @@ else
 endif
 gst_dep = dependency('gstreamer-1.0')
 gst_app_dep = dependency('gstreamer-app-1.0')
-nnstreamer_internal_dep = dependency('nnstreamer-internal')
 nnstreamer_single_dep = dependency('nnstreamer-single')
 nnstreamer_dep = dependency('nnstreamer')
 

diff --git a/packaging/machine-learning-api.spec b/packaging/machine-learning-api.spec
index 516e3b9..4c4ca61 100644 (file)
--- a/packaging/machine-learning-api.spec
+++ b/packaging/machine-learning-api.spec
@@ -68,6 +68,7 @@ Source1001:   capi-machine-learning.manifest
 Source1002:    machine-learning-agent.manifest
 
 ## Define build requirements ##
+Requires:      nnstreamer
 Requires:      capi-machine-learning-common = %{version}-%{release}
 Requires:      capi-machine-learning-inference-single = %{version}-%{release}
 %ifarch aarch64 x86_64 riscv64
@@ -190,7 +191,7 @@ Static library of capi-machine-learning-inference-devel package.
 %package -n capi-machine-learning-common
 Summary:       Common utility functions for Tizen Machine Learning API
 Group:         Machine Learning/ML Framework
-Requires:      nnstreamer
+Requires:      nnstreamer-single
 %description -n capi-machine-learning-common
 Tizen ML(Machine Learning) native API's common parts.